SPECS/sanlock.spec

@@ -3,6 +3,7 @@ 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
@@ -27,6 +28,8 @@ 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.
 
@@ -38,12 +41,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
+CFLAGS=$RPM_OPT_FLAGS make -C python PY_VERSION=3.6
+CFLAGS=$RPM_OPT_FLAGS make -C reset
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,12 +59,16 @@ make -C wdmd \
 make -C python \
         install LIBDIR=%{_libdir} \
         DESTDIR=$RPM_BUILD_ROOT \
-        PY_VERSION=3
+        PY_VERSION=3.6
+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
@@ -73,14 +80,15 @@ 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/%{_localstatedir}/run/sanlock
+install -Dd -m 0775 $RPM_BUILD_ROOT/%{_rundir}/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 /var/run/sanlock sanlock
+    -g 179 -d /run/sanlock sanlock
 /usr/sbin/usermod -a -G disk sanlock
 
 %post
@@ -90,7 +98,7 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \
 %systemd_preun wdmd.service sanlock.service
 
 %postun
-%systemd_postun wdmd.service sanlock.service
+%systemd_postun
 
 %files
 /usr/lib/systemd/systemd-wdmd
@@ -100,7 +108,7 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \
 %{_sbindir}/wdmd
 %dir %{_sysconfdir}/wdmd.d
 %dir %{_sysconfdir}/sanlock
-%dir %attr(-,sanlock,sanlock) %{_localstatedir}/run/sanlock
+%dir %attr(-,sanlock,sanlock) %{_rundir}/sanlock
 %{_mandir}/man8/wdmd*
 %{_mandir}/man8/sanlock*
 %config(noreplace) %{_sysconfdir}/logrotate.d/sanlock
@@ -112,6 +120,7 @@ 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,
@@ -126,22 +135,23 @@ access to the shared disks.
 %{_libdir}/libsanlock_client.so.*
 %{_libdir}/libwdmd.so.*
 
-%package        -n python3-sanlock
-%{?python_provide:%python_provide python3-sanlock}
+%package        -n %{python_package}
 Summary:        Python bindings for the sanlock library
+Group:          Development/Libraries
 Requires:       %{name}-lib = %{version}-%{release}
 
-%description    -n python3-sanlock
-The %{name}-python package contains a module that permits applications
+%description    -n %{python_package}
+The %{python_package} package contains a module that permits applications
 written in the Python programming language to use the interface
 supplied by the sanlock library.
 
-%files          -n python3-sanlock
+%files          -n %{python_package}
 %{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
@@ -161,95 +171,62 @@ developing applications that use %{name}.
 %{_libdir}/pkgconfig/libsanlock.pc
 %{_libdir}/pkgconfig/libsanlock_client.pc
 
-%changelog
-* Fri Apr 01 2022 David Teigland <teigland@redhat.com> - 3.8.4-4
-- fixes for thread/memory leak
-
-* Mon Aug 23 2021 David Teigland <teigland@redhat.com> - 3.8.4-1
-- Update rhel9 beta version to match latest rhel8
+%package -n     sanlk-reset
+Summary:        Host reset daemon and client using sanlock
+Group:          System Environment/Base
+Requires:       sanlock = %{version}-%{release}
+Requires:       sanlock-lib = %{version}-%{release}
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.8.1-11
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+%description -n sanlk-reset
+The sanlk-reset package contains the reset daemon and client.
+A cooperating host running the daemon can be reset by a host
+running the client, so long as both maintain access to a
+common sanlock lockspace.
 
-* Mon Jun 28 2021 David Teigland <teigland@redhat.com> - 3.8.1-10
-- fuck this process
+%files -n       sanlk-reset
+%{_sbindir}/sanlk-reset
+%{_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
 
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-
-* Sat Aug 08 2020 Nir Soffer <nsoffer@redhat.com> - 3.8.1-7
-- Enable LTO
+%changelog
+* Wed Jul 06 2022 David Teigland <teigland@redhat.com> - 3.8.4-4
+- rebuild with larger release number
 
-* Sun Aug 02 2020 Nir Soffer <nsoffer@redhat.com> - 3.8.1-6
-- Removing extra linkeer args, hopefully fix python build
+* Fri Mar 18 2022 David Teigland <teigland@redhat.com> - 3.8.4-2
+- Resolves: rhbz#2058438
 
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-5
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Tue Jun 01 2021 David Teigland <teigland@redhat.com> 3.8.4-1
+- Update to sanlock-3.8.4
 
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Thu May 20 2021 David Teigland <teigland@redhat.com> 3.8.3-2
+- Fix connection close and add python inquire api
 
-* Tue Jul 07 2020 Jeff Law <law@redhat.com> - 3.8.1-3
-- Disable LTO
+* Tue Jan 19 2021 David Teigland <teigland@redhat.com> 3.8.3-1
+- Update to sanlock-3.8.3
 
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.8.1-2
-- Rebuilt for Python 3.9
+* Mon Aug 10 2020 David Teigland <teigland@redhat.com> 3.8.2-1
+- Update to sanlock-3.8.2
 
-* Sat May 2 2020 Nir Soffer <nsoffer@redhat.com> - 3.8.1-1
+* Thu Jul 09 2020 David Teigland <teigland@redhat.com> 3.8.1-1
 - Update to sanlock-3.8.1
 
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-4
-- 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-2
+- kick the gating tests to run
 
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Wed Jun 12 2019 Nir Soffer <nsoffer@redhat.com> 3.8.0-1
+- Cleanup spec and convert to python3
 
-* Thu Apr 12 2018 Iryna Shcherbina <shcherbina.iryna@gmail.com> - 3.6.0-5
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+* Thu Dec 06 2018 David Teigland <teigland@redhat.com> - 3.6.0-5
+- Fix selinux lockfile error
 
-* Wed Mar 14 2018 David Teigland <teigland@redhat.com> - 3.6.0-4
-- change makefile flags
+* Thu Oct 04 2018 David Teigland <teigland@redhat.com> - 3.6.0-4
+- makefile gcc flags
 
-* Wed Mar 14 2018 David Teigland <teigland@redhat.com> - 3.6.0-3
-- rebuild with set_build_flags
+* Tue Jun 12 2018 Charalampos Stratakis <cstratak@redhat.com> - 3.6.0-3
+- Conditionalize the python2 subpackage
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild