SPECS/sanlock.spec

@@ -3,7 +3,6 @@ Version:        3.8.4
 Release:        4%{?dist}
 Summary:        A shared storage lock manager
 
-Group:          System Environment/Base
 License:        GPLv2 and GPLv2+ and LGPLv2+
 URL:            https://pagure.io/sanlock/
 BuildRequires:  gcc
@@ -28,8 +27,6 @@ Patch1: 0002-sanlock-fix-pthread_create-error-check.patch
 Patch2: 0003-Revert-sanlock-Shrink-thread-pool-when-there-is-no-w.patch
 Patch3: 0004-sanlock-fix-pthread_create-error-paths.patch
 
-%global python_package python3-%{name}
-
 %description
 The sanlock daemon manages leases for applications on hosts using shared storage.
 
@@ -41,12 +38,12 @@ The sanlock daemon manages leases for applications on hosts using shared storage
 %patch3 -p1 -b .backup3
 
 %build
+%set_build_flags
 # upstream does not require configure
 # upstream does not support _smp_mflags
 CFLAGS=$RPM_OPT_FLAGS make -C wdmd
 CFLAGS=$RPM_OPT_FLAGS make -C src
-CFLAGS=$RPM_OPT_FLAGS make -C python PY_VERSION=3.6
+CFLAGS=$RPM_OPT_FLAGS make -C python PY_VERSION=3
-CFLAGS=$RPM_OPT_FLAGS make -C reset
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -59,16 +56,12 @@ make -C wdmd \
 make -C python \
         install LIBDIR=%{_libdir} \
         DESTDIR=$RPM_BUILD_ROOT \
-        PY_VERSION=3.6
+        PY_VERSION=3
-make -C reset \
-        install LIBDIR=%{_libdir} \
-        DESTDIR=$RPM_BUILD_ROOT
 
 
 install -D -m 0644 init.d/sanlock.service.native $RPM_BUILD_ROOT/%{_unitdir}/sanlock.service
 install -D -m 0755 init.d/wdmd $RPM_BUILD_ROOT/usr/lib/systemd/systemd-wdmd
 install -D -m 0644 init.d/wdmd.service.native $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service
-install -D -m 0644 init.d/sanlk-resetd.service $RPM_BUILD_ROOT/%{_unitdir}/sanlk-resetd.service
 
 install -D -m 0644 src/logrotate.sanlock \
     $RPM_BUILD_ROOT/etc/logrotate.d/sanlock
@@ -80,15 +73,14 @@ install -D -m 0644 init.d/wdmd.sysconfig \
     $RPM_BUILD_ROOT/etc/sysconfig/wdmd
 
 install -Dd -m 0755 $RPM_BUILD_ROOT/etc/wdmd.d
-install -Dd -m 0775 $RPM_BUILD_ROOT/%{_rundir}/sanlock
+install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/sanlock
-install -Dd -m 0775 $RPM_BUILD_ROOT/%{_rundir}/sanlk-resetd
 
 %pre
 getent group sanlock > /dev/null || /usr/sbin/groupadd \
     -g 179 sanlock
 getent passwd sanlock > /dev/null || /usr/sbin/useradd \
     -u 179 -c "sanlock" -s /sbin/nologin -r \
-    -g 179 -d /run/sanlock sanlock
+    -g 179 -d /var/run/sanlock sanlock
 /usr/sbin/usermod -a -G disk sanlock
 
 %post
@@ -98,7 +90,7 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \
 %systemd_preun wdmd.service sanlock.service
 
 %postun
-%systemd_postun
+%systemd_postun wdmd.service sanlock.service
 
 %files
 /usr/lib/systemd/systemd-wdmd
@@ -108,7 +100,7 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \
 %{_sbindir}/wdmd
 %dir %{_sysconfdir}/wdmd.d
 %dir %{_sysconfdir}/sanlock
-%dir %attr(-,sanlock,sanlock) %{_rundir}/sanlock
+%dir %attr(-,sanlock,sanlock) %{_localstatedir}/run/sanlock
 %{_mandir}/man8/wdmd*
 %{_mandir}/man8/sanlock*
 %config(noreplace) %{_sysconfdir}/logrotate.d/sanlock
@@ -120,7 +112,6 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \
 
 %package        lib
 Summary:        A shared storage lock manager library
-Group:          System Environment/Libraries
 
 %description    lib
 The %{name}-lib package contains the runtime libraries for sanlock,
@@ -135,23 +126,22 @@ access to the shared disks.
 %{_libdir}/libsanlock_client.so.*
 %{_libdir}/libwdmd.so.*
 
-%package        -n %{python_package}
+%package        -n python3-sanlock
+%{?python_provide:%python_provide python3-sanlock}
 Summary:        Python bindings for the sanlock library
-Group:          Development/Libraries
 Requires:       %{name}-lib = %{version}-%{release}
 
-%description    -n %{python_package}
+%description    -n python3-sanlock
-The %{python_package} package contains a module that permits applications
+The %{name}-python package contains a module that permits applications
 written in the Python programming language to use the interface
 supplied by the sanlock library.
 
-%files          -n %{python_package}
+%files          -n python3-sanlock
 %{python3_sitearch}/sanlock_python-*.egg-info
 %{python3_sitearch}/sanlock*.so
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name}-lib = %{version}-%{release}
 
 %description    devel
@@ -171,65 +161,95 @@ developing applications that use %{name}.
 %{_libdir}/pkgconfig/libsanlock.pc
 %{_libdir}/pkgconfig/libsanlock_client.pc
 
-%package -n     sanlk-reset
+%changelog
-Summary:        Host reset daemon and client using sanlock
+* Fri Apr 01 2022 David Teigland <teigland@redhat.com> - 3.8.4-4
-Group:          System Environment/Base
+- fixes for thread/memory leak
-Requires:       sanlock = %{version}-%{release}
+
-Requires:       sanlock-lib = %{version}-%{release}
+* Mon Aug 23 2021 David Teigland <teigland@redhat.com> - 3.8.4-1
+- Update rhel9 beta version to match latest rhel8
 
-%description -n sanlk-reset
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.8.1-11
-The sanlk-reset package contains the reset daemon and client.
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-A cooperating host running the daemon can be reset by a host
+  Related: rhbz#1991688
-running the client, so long as both maintain access to a
-common sanlock lockspace.
 
-%files -n       sanlk-reset
+* Mon Jun 28 2021 David Teigland <teigland@redhat.com> - 3.8.1-10
-%{_sbindir}/sanlk-reset
+- fuck this process
-%{_sbindir}/sanlk-resetd
-%{_unitdir}/sanlk-resetd.service
-%dir %attr(-,root,root) %{_rundir}/sanlk-resetd
-%{_mandir}/man8/sanlk-reset*
 
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.8.1-9
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-%changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-8
-* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 3.8.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-- Rebuilt for MSVSphere 8.8
 
-* Wed Jul 06 2022 David Teigland <teigland@redhat.com> - 3.8.4-4
-- rebuild with larger release number
 
-* Fri Mar 18 2022 David Teigland <teigland@redhat.com> - 3.8.4-2
+* Sat Aug 08 2020 Nir Soffer <nsoffer@redhat.com> - 3.8.1-7
-- Resolves: rhbz#2058438
+- Enable LTO
 
-* Tue Jun 01 2021 David Teigland <teigland@redhat.com> 3.8.4-1
+* Sun Aug 02 2020 Nir Soffer <nsoffer@redhat.com> - 3.8.1-6
-- Update to sanlock-3.8.4
+- Removing extra linkeer args, hopefully fix python build
 
-* Thu May 20 2021 David Teigland <teigland@redhat.com> 3.8.3-2
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-5
-- Fix connection close and add python inquire api
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Tue Jan 19 2021 David Teigland <teigland@redhat.com> 3.8.3-1
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-4
-- Update to sanlock-3.8.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Mon Aug 10 2020 David Teigland <teigland@redhat.com> 3.8.2-1
+* Tue Jul 07 2020 Jeff Law <law@redhat.com> - 3.8.1-3
-- Update to sanlock-3.8.2
+- Disable LTO
 
-* Thu Jul 09 2020 David Teigland <teigland@redhat.com> 3.8.1-1
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.8.1-2
+- Rebuilt for Python 3.9
+
+* Sat May 2 2020 Nir Soffer <nsoffer@redhat.com> - 3.8.1-1
 - Update to sanlock-3.8.1
 
-* Wed Jun 12 2019 Nir Soffer <nsoffer@redhat.com> 3.8.0-2
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-4
-- kick the gating tests to run
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.8.0-3
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jun 12 2019 Nir Soffer <nsoffer@redhat.com> - 3.8.0-1
+- Update to sanlock-3.8.0
+- Convert spec to python 3
+
+* Tue May 21 2019 Nir Soffer <nsoffer@redhat.com> - 3.7.3-1
+- Update to sanlock-3.7.3
+- Add missing BuildRequires and Requires
+
+* Fri Apr 12 2019 Nir Soffer <nsoffer@redhat.com> - 3.7.1-2
+- Cleanup up align and sector constants
+
+* Mon Apr 8 2019 Nir Soffer <nsoffer@redhat.com> - 3.7.1-1
+- Update to sanlock 3.7.1
+- Fix read_resource_owners (414abfe)
+
+* Wed Mar 20 2019 Nir Soffer <nsoffer@redhat.com> - 3.7.0-1
+- remove unneeded with_systemd macro
+- update to sanlock 3.7.0
+
+* Sat Feb 2 2019 Nir Soffer <nsoffer@redhat.com> - 3.6.0-8
+- fix build on Fedora rawhide
+
+* Thu Jan 24 2019 David Teigland <teigland@redhat.com> - 3.6.0-7
+- lockfile ownership
 
-* Wed Jun 12 2019 Nir Soffer <nsoffer@redhat.com> 3.8.0-1
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-6
-- Cleanup spec and convert to python3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Thu Dec 06 2018 David Teigland <teigland@redhat.com> - 3.6.0-5
+* Thu Apr 12 2018 Iryna Shcherbina <shcherbina.iryna@gmail.com> - 3.6.0-5
-- Fix selinux lockfile error
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
 
-* Thu Oct 04 2018 David Teigland <teigland@redhat.com> - 3.6.0-4
+* Wed Mar 14 2018 David Teigland <teigland@redhat.com> - 3.6.0-4
-- makefile gcc flags
+- change makefile flags
 
-* Tue Jun 12 2018 Charalampos Stratakis <cstratak@redhat.com> - 3.6.0-3
+* Wed Mar 14 2018 David Teigland <teigland@redhat.com> - 3.6.0-3
-- Conditionalize the python2 subpackage
+- rebuild with set_build_flags
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild