Hello community,

here is the log from the commit of package sbd for openSUSE:Factory checked in 
at 2016-07-01 10:01:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sbd (Old)
 and      /work/SRC/openSUSE:Factory/.sbd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "sbd"

Changes:
--------
--- /work/SRC/openSUSE:Factory/sbd/sbd.changes  2016-06-23 13:35:54.000000000 
+0200
+++ /work/SRC/openSUSE:Factory/.sbd.new/sbd.changes     2016-07-01 
10:01:09.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Jun 30 09:25:47 UTC 2016 - tchva...@suse.com
+
+- Cleanup a bit with spec-cleaner
+- Use pgkconfig dependencies (and only those that are really needed)
+- Remove systemd conditions as the only distro versions we build
+  against have systemd
+- Disable the werror cflags addition, we always build without it
+  distro wide
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sbd.spec ++++++
--- /var/tmp/diff_new_pack.99awC9/_old  2016-07-01 10:01:10.000000000 +0200
+++ /var/tmp/diff_new_pack.99awC9/_new  2016-07-01 10:01:10.000000000 +0200
@@ -18,71 +18,59 @@
 
 
 Name:           sbd
+Version:        1.2.1.git.1463482437.d6bd23a
+Release:        0
 Summary:        Storage-based death
 License:        GPL-2.0+
 Group:          Productivity/Clustering/HA
-Version:        1.2.1.git.1463482437.d6bd23a
-Release:        0
 Url:            https://github.com/l-mb/sbd
 Source:         %{name}-%{version}.tar.xz
 Patch1:         add-explicit-libs.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  e2fsprogs-devel
-BuildRequires:  glib2-devel
 BuildRequires:  libaio-devel
-BuildRequires:  libcorosync-devel
 BuildRequires:  libglue-devel
-BuildRequires:  libpacemaker-devel
-BuildRequires:  libqb-devel
 BuildRequires:  libtool
-BuildRequires:  libuuid-devel
-BuildRequires:  libxml2-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python-devel
+BuildRequires:  pkgconfig(corosync)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(libqb)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(pacemaker)
+BuildRequires:  pkgconfig(pacemaker-cib)
+BuildRequires:  pkgconfig(uuid)
+Requires(post): %fillup_prereq
 Conflicts:      ClusterTools2 < 2.3.2
-Requires(pre):  %fillup_prereq
-
-%if %{defined systemd_requires}
-%systemd_requires
-%endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
 
 %description
 
 This package contains the storage-based death functionality.
 
 %prep
-# %setup -n sbd-%{version} -q
 %autosetup -p1
 
 %build
-autoreconf -i
-export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror"
+autoreconf -fvi
 %configure
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} install
-install -D -m 0755 src/sbd.sh $RPM_BUILD_ROOT/usr/share/sbd/sbd.sh
-%if %{defined _unitdir}
-install -D -m 0644 src/sbd.service $RPM_BUILD_ROOT/%{_unitdir}/sbd.service
-install -D -m 0644 src/sbd_remote.service 
$RPM_BUILD_ROOT/%{_unitdir}/sbd_remote.service
-%endif
+make DESTDIR=%{buildroot} LIBDIR=%{_libdir} install
+install -D -m 0755 src/sbd.sh %{buildroot}%{_datadir}/sbd/sbd.sh
+install -D -m 0644 src/sbd.service %{buildroot}/%{_unitdir}/sbd.service
+install -D -m 0644 src/sbd_remote.service 
%{buildroot}/%{_unitdir}/sbd_remote.service
+ln -s service %{buildroot}%{_sbindir}/rcsbd
+ln -s service %{buildroot}%{_sbindir}/rcsbd_remote
 mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
 cp -f src/sbd.sysconfig 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.sbd
 
-%clean
-rm -rf %{buildroot}
-
-%if %{defined _unitdir}
 %post
 %service_add_post sbd.service
 %service_add_post sbd_remote.service
-
-if [ ! -e %{_sysconfdir}/sysconfig/sbd ]; then
-    %fillup_only sbd
-fi
+%fillup_only sbd
 
 %pre
 %service_add_pre sbd.service
@@ -95,18 +83,17 @@
 %postun
 %service_del_postun sbd.service
 %service_del_postun sbd_remote.service
-%endif
 
 %files
 %defattr(-,root,root)
 %{_libdir}/stonith/plugins/external/sbd
 %{_sbindir}/sbd
+%{_sbindir}/rcsbd
+%{_sbindir}/rcsbd_remote
 %{_datadir}/sbd
-%doc %{_mandir}/man8/sbd*
-%if %{defined _unitdir}
+%{_mandir}/man8/sbd*
 %{_unitdir}/sbd.service
 %{_unitdir}/sbd_remote.service
-%endif
 %{_localstatedir}/adm/fillup-templates/sysconfig.sbd
 %doc COPYING
 


Reply via email to