Compare commits

...

4 Commits

Author SHA1 Message Date
Daniel Berteaud 654c99c2dd Automatic commit of package [linstor] minor release [1.24.1-2].
Created by command:

/usr/bin/tito tag
2023-08-24 11:38:00 +02:00
Daniel Berteaud dc2a19cd31 Remove git tag from release 2023-08-24 11:37:50 +02:00
Daniel Berteaud 4dbd2d859b Automatic commit of package [linstor] minor release [1.24.1-1.git.4.875b51b].
Created by command:

/usr/bin/tito tag
2023-08-24 11:36:52 +02:00
Daniel Berteaud 44734b0482 Update to 1.24.1 2023-08-24 11:36:34 +02:00
6 changed files with 27 additions and 17 deletions

View File

@ -1 +1 @@
1.23.0-1 ./
1.24.1-2 ./

BIN
gradle-6.8.3-bin.zip (Stored with Git LFS) Normal file

Binary file not shown.

BIN
gradle-6.9.4-bin.zip (Stored with Git LFS)

Binary file not shown.

BIN
linstor-server-1.23.0.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
linstor-server-1.24.1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,12 +1,12 @@
Name: linstor
Version: 1.23.0
Release: 1%{?dist}
Version: 1.24.1
Release: 2%{?dist}
Summary: LINSTOR SDS server compoenents
Packager: Daniel Berteaud <dbd@ehtrace.com>
BuildArch: noarch
%define GRADLE_VERSION 6.9.4
%define GRADLE_VERSION 6.8.3
%define GRADLE_TASKS installdist
%define GRADLE_FLAGS --offline --gradle-user-home /tmp --no-daemon --exclude-task generateJava
%define GRADLE_FLAGS --offline --gradle-user-home /tmp --no-daemon -Pjava11=true --exclude-task generateJava
%define LS_PREFIX /usr/share/linstor-server
%define FIREWALLD_SERVICES /usr/lib/firewalld/services
%define FILE_VERSION %(echo %{version} | sed -e 's/~/\-/')
@ -22,12 +22,12 @@ Source1: https://downloads.gradle-dn.com/distributions/gradle-%{GRADLE_VERSION}-
BuildRequires: systemd
%if 0%{?suse_version} >= 1500
BuildRequires: java-1_8_0-openjdk-headless java-1_8_0-openjdk-devel python
BuildRequires: java-11-openjdk-headless java-11-openjdk-devel python
%else
%if 0%{?rhel} > 8
BuildRequires: java-1.8.0-openjdk-headless java-1.8.0-openjdk-devel python3
BuildRequires: java-11-openjdk-headless java-11-openjdk-devel python3
%else
BuildRequires: java-1.8.0-openjdk-headless java-1.8.0-openjdk-devel python2
BuildRequires: java-11-openjdk-headless java-11-openjdk-devel python2
%endif
%endif
@ -50,11 +50,13 @@ if [ -f "%{_builddir}/%{NAME_VERS}/libs/server-st.jar" ]; then cp "%{_builddir}/
if [ -f "%{_builddir}/%{NAME_VERS}/libs/controller-st.jar" ]; then cp "%{_builddir}/%{NAME_VERS}/libs/controller-st.jar" %{buildroot}/%{LS_PREFIX}/lib; fi
if [ -f "%{_builddir}/%{NAME_VERS}/libs/satellite-st.jar" ]; then cp "%{_builddir}/%{NAME_VERS}/libs/satellite-st.jar" %{buildroot}/%{LS_PREFIX}/lib; fi
rm %{buildroot}/%{LS_PREFIX}/lib/%{NAME_VERS}.jar
cp -r %{_builddir}/%{NAME_VERS}/server/build/install/server/lib/conf %{buildroot}/%{LS_PREFIX}/lib
mkdir -p %{buildroot}/%{LS_PREFIX}/lib/conf
cp %{_builddir}/%{NAME_VERS}/server/logback.xml %{buildroot}/%{LS_PREFIX}/lib/conf
mkdir -p %{buildroot}/%{LS_PREFIX}/bin
cp -r %{_builddir}/%{NAME_VERS}/build/install/linstor-server/bin/Controller %{buildroot}/%{LS_PREFIX}/bin
cp -r %{_builddir}/%{NAME_VERS}/build/install/linstor-server/bin/Satellite %{buildroot}/%{LS_PREFIX}/bin
cp -r %{_builddir}/%{NAME_VERS}/build/install/linstor-server/bin/linstor-config %{buildroot}/%{LS_PREFIX}/bin
cp -r %{_builddir}/%{NAME_VERS}/build/install/linstor-server/bin/linstor-database %{buildroot}/%{LS_PREFIX}/bin
cp -r %{_builddir}/%{NAME_VERS}/scripts/postinstall.sh %{buildroot}/%{LS_PREFIX}/bin/controller.postinst.sh
mkdir -p %{buildroot}/%{_unitdir}
cp -r %{_builddir}/%{NAME_VERS}/scripts/linstor-controller.service %{buildroot}/%{_unitdir}
@ -72,7 +74,8 @@ cp %{_builddir}/%{NAME_VERS}/docs/linstor.toml-example %{buildroot}/%{_sysconfdi
### common
%package common
Summary: Common files shared between controller and satellite
Requires: jre-headless
Requires: jre-11-headless
Requires: tzdata-java
%description common
Linstor shared components between linstor-controller and linstor-satellite
@ -90,7 +93,7 @@ Linstor shared components between linstor-controller and linstor-satellite
%package controller
Summary: Linstor controller specific files
Requires: linstor-common = %{version}
Requires(post): jre-headless
Requires(post): jre-11-headless
%description controller
Linstor controller manages linstor satellites and persistant data storage.
@ -103,6 +106,7 @@ Linstor controller manages linstor satellites and persistant data storage.
%dir %{LS_PREFIX}/bin
%{LS_PREFIX}/bin/Controller
%{LS_PREFIX}/bin/linstor-config
%{LS_PREFIX}/bin/linstor-database
%{LS_PREFIX}/bin/controller.postinst.sh
%{_unitdir}/linstor-controller.service
%{FIREWALLD_SERVICES}/linstor-controller.xml
@ -146,6 +150,12 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || :
%systemd_preun linstor-satellite.service
%changelog
* Thu Aug 24 2023 Daniel Berteaud <dbd@ehtrace.com> 1.24.1-2
- Remove git tag from release (dbd@ehtrace.com)
* Thu Aug 24 2023 Daniel Berteaud <dbd@ehtrace.com> 1.24.1-1.git.4.875b51b
- Update to 1.24.1 (dbd@ehtrace.com)
* Tue May 23 2023 Daniel Berteaud <dbd@ehtrace.com> 1.23.0-1
- Update to 1.23.0 (dbd@ehtrace.com)