Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2016-07-03 12:28:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "booth" Changes: -------- --- /work/SRC/openSUSE:Factory/booth/booth.changes 2016-04-28 16:57:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2016-07-03 12:28:43.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 30 13:57:46 UTC 2016 - [email protected] + +- Reduce conditionals to only keep the default values +- Run systemd macros in proper phases +- Convert to pkgconfig dependencies + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ booth.spec ++++++ --- /var/tmp/diff_new_pack.OdlVpH/_old 2016-07-03 12:28:44.000000000 +0200 +++ /var/tmp/diff_new_pack.OdlVpH/_new 2016-07-03 12:28:44.000000000 +0200 @@ -16,60 +16,27 @@ # -%if 0%{?suse_version} -%global booth_docdir %{_defaultdocdir}/%{name} -%else -# newer fedora distros have _pkgdocdir, rely on that when -# available -%{!?_pkgdocdir: %global _pkgdocdir %%{_docdir}/%{name}-%{version}} -# Directory where we install documentation -%global booth_docdir %{_pkgdocdir} -%endif - %global test_path %{_datadir}/booth/tests - -%if 0%{?suse_version} -%define _libexecdir %{_libdir} -%endif -%define with_extra_warnings 0 -%define with_debugging 0 -%define without_fatal_warnings 1 -%if 0%{?fedora} || 0%{?centos} || 0%{?rhel} -%define pkg_group System Environment/Daemons -%else -%define pkg_group Productivity/Clustering/HA -%endif - Name: booth -Url: https://github.com/ClusterLabs/booth -Summary: Ticket Manager for Multi-site Clusters -License: GPL-2.0+ -Group: %{pkg_group} Version: 1.0 Release: 0 +Summary: Ticket Manager for Multi-site Clusters +License: GPL-2.0+ +Group: Productivity/Clustering/HA +Url: https://github.com/ClusterLabs/booth Source: booth.tar.bz2 -Source1: %name-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source1: %{name}-rpmlintrc BuildRequires: asciidoc BuildRequires: autoconf BuildRequires: automake -BuildRequires: glib2-devel BuildRequires: libgcrypt-devel -%if 0%{?fedora} || 0%{?centos} || 0%{?rhel} -BuildRequires: cluster-glue-libs-devel -BuildRequires: pacemaker-libs-devel -%else BuildRequires: libglue-devel -BuildRequires: libpacemaker-devel -%endif -BuildRequires: libxml2-devel BuildRequires: pkgconfig -%if 0%{?fedora} || 0%{?centos} || 0%{?rhel} -Requires: cluster-glue-libs >= 1.0.6 -Requires: pacemaker >= 1.1.8 -%else +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(pacemaker) Requires: pacemaker-ticket-support >= 2.0 -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Booth manages tickets which authorize cluster sites located in @@ -77,41 +44,38 @@ facilitates support of geographically distributed clustering in Pacemaker. +%package test +Summary: Test scripts for Booth +Group: Productivity/Clustering/HA +Requires: booth +Requires: python + +%description test +This package contains automated tests for Booth, +the Cluster Ticket Manager for Pacemaker. + %prep %setup -q -n %{name} %build -./autogen.sh +autoreconf -fvi %configure \ - --with-initddir=%{_initrddir} \ - --docdir=%{booth_docdir} - -make - -#except check -#%check -#make check + --with-initddir=%{_initddir} \ + --docdir=%{_docdir}/%{name} +make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install docdir=%{booth_docdir} +%make_install -mkdir -p %{buildroot}/%{_mandir}/man8/ -gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz -ln %{buildroot}/%{_mandir}/man8/booth.8.gz %{buildroot}/%{_mandir}/man8/boothd.8.gz +ln -s boothd.8 %{buildroot}/%{_mandir}/man8/booth.8 -%if %{defined _unitdir} # systemd mkdir -p %{buildroot}/%{_unitdir} cp -a conf/[email protected] %{buildroot}/%{_unitdir}/[email protected] cp -a conf/booth-arbitrator.service %{buildroot}/%{_unitdir}/booth-arbitrator.service -ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbooth-arbitrator -%else -# sysV init -ln -s ../../%{_initddir}/booth-arbitrator %{buildroot}%{_sbindir}/rcbooth-arbitrator -%endif +ln -s service %{buildroot}%{_sbindir}/rcbooth-arbitrator #install test-parts - mkdir -p %{buildroot}/%{test_path} cp -a unit-tests/ script/unit-test.py test conf %{buildroot}/%{test_path}/ chmod +x %{buildroot}/%{test_path}/test/booth_path @@ -121,16 +85,17 @@ ln -s %{_sbindir}/boothd %{buildroot}/%{test_path}/src/ rm -f %{buildroot}/%{test_path}/test/*.pyc -%check -%if 0%{?run_build_tests} -echo "%%run_build_tests set to %run_build_tests; including tests" -make check -%else -echo "%%run_build_tests set to %run_build_tests; skipping tests" -%endif +%pre +%service_add_pre booth-arbitrator.service + +%post +%service_add_post booth-arbitrator.service -%clean -rm -rf %{buildroot} +%preun +%service_del_preun booth-arbitrator.service + +%postun +%service_del_postun booth-arbitrator.service %files %defattr(-,root,root,-) @@ -138,55 +103,37 @@ %{_sbindir}/boothd %{_sbindir}/booth-keygen %{_sbindir}/geostore -%{_mandir}/man8/booth.8.gz -%{_mandir}/man8/boothd.8.gz -%{_mandir}/man8/booth-keygen.8.gz -%{_mandir}/man8/geostore.8.gz -%dir /usr/lib/ocf -%dir /usr/lib/ocf/resource.d -%dir /usr/lib/ocf/resource.d/pacemaker -%dir /usr/lib/ocf/resource.d/booth -%dir /usr/lib/ocf/lib -%dir /usr/lib/ocf/lib/booth +%{_mandir}/man8/booth.8%{ext_man} +%{_mandir}/man8/boothd.8%{ext_man} +%{_mandir}/man8/booth-keygen.8%{ext_man} +%{_mandir}/man8/geostore.8%{ext_man} +%dir %{_prefix}/lib/ocf +%dir %{_prefix}/lib/ocf/resource.d +%dir %{_prefix}/lib/ocf/resource.d/pacemaker +%dir %{_prefix}/lib/ocf/resource.d/booth +%dir %{_prefix}/lib/ocf/lib +%dir %{_prefix}/lib/ocf/lib/booth %dir %{_sysconfdir}/booth %{_sbindir}/rcbooth-arbitrator -/usr/lib/ocf/resource.d/pacemaker/booth-site -/usr/lib/ocf/lib/booth/geo_attr.sh -/usr/lib/ocf/resource.d/booth/geostore +%{_prefix}/lib/ocf/resource.d/pacemaker/booth-site +%{_prefix}/lib/ocf/lib/booth/geo_attr.sh +%{_prefix}/lib/ocf/resource.d/booth/geostore %config %{_sysconfdir}/booth/booth.conf.example - -%if %{defined _unitdir} %{_unitdir}/[email protected] %{_unitdir}/booth-arbitrator.service %exclude %{_initddir}/booth-arbitrator -%else -%{_initddir}/booth-arbitrator -%endif - %dir %{_datadir}/booth %{_datadir}/booth/service-runnable - %doc AUTHORS README COPYING %doc README.upgrade-from-v0.1 -%package test -Summary: Test scripts for Booth -Group: %{pkg_group} -Requires: booth -Requires: python - -%description test -This package contains automated tests for Booth, -the Cluster Ticket Manager for Pacemaker. - %files test %defattr(-,root,root) - %doc README-testing %{test_path} -%dir /usr/lib/ocf -%dir /usr/lib/ocf/resource.d -%dir /usr/lib/ocf/resource.d/booth -/usr/lib/ocf/resource.d/booth/sharedrsc +%dir %{_prefix}/lib/ocf +%dir %{_prefix}/lib/ocf/resource.d +%dir %{_prefix}/lib/ocf/resource.d/booth +%{_prefix}/lib/ocf/resource.d/booth/sharedrsc %changelog
