Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2018-02-05 10:49:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old) and /work/SRC/openSUSE:Factory/.cluster-glue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cluster-glue" Mon Feb 5 10:49:15 2018 rev:63 rq:572098 version:1.0.12+v1.git.1511436818.71ae59fa Changes: -------- --- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes 2017-12-23 12:18:47.513615084 +0100 +++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2018-02-05 10:49:16.306807732 +0100 @@ -1,0 +2,26 @@ +Fri Feb 2 16:36:00 UTC 2018 - [email protected] + +- spec: Still use 90 as the consistent gid for the group "haclient" among the cluster + +------------------------------------------------------------------- +Thu Feb 1 23:05:06 UTC 2018 - [email protected] + +- Stop building static archives only to remove them later. + +------------------------------------------------------------------- +Thu Jan 18 14:28:44 UTC 2018 - [email protected] + +- Switch to pkgconfig dependencies +- Drop asciidoc from deps, even tho configure.ac checks for it + the mans are generated by docbook + +------------------------------------------------------------------- +Thu Jan 18 14:11:22 UTC 2018 - [email protected] + +- Format with spec-cleaner +- Remove old distributions as we build only on SLE12+ (sle11/sle10) +- Always disable fatal warnings, it only turns on -Werror which is + pointless for distro builds and just could break with gcc updates +- Use the user creation oneliner like other packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cluster-glue.spec ++++++ --- /var/tmp/diff_new_pack.2KZTFY/_old 2018-02-05 10:49:16.930778521 +0100 +++ /var/tmp/diff_new_pack.2KZTFY/_new 2018-02-05 10:49:16.930778521 +0100 @@ -1,7 +1,7 @@ # # spec file for package cluster-glue # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,31 +16,18 @@ # -%global glue_release 1 - +%define gid 90 %define uid 90 %define gname haclient %define uname hacluster -%if 0%{?sles_version} == 11 -# these three architectures have a problem with glib2 -%ifarch ppc ppc64 ia64 -%define warnings_fatal no -%else -%define warnings_fatal yes -%endif -%else -# Enable warnings for Factory -%define warnings_fatal yes -%endif # Directory where we install documentation %global glue_docdir %{_defaultdocdir}/%{name} - Name: cluster-glue -Summary: Reusable cluster components -License: GPL-2.0 and LGPL-2.1+ -Group: Productivity/Clustering/HA Version: 1.0.12+v1.git.1511436818.71ae59fa Release: 0 +Summary: Reusable cluster components +License: GPL-2.0 AND LGPL-2.1+ +Group: Productivity/Clustering/HA Url: https://github.com/ClusterLabs/cluster-glue.git Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf @@ -52,56 +39,36 @@ # PATCH-FIX-UPSTREAM: fix warnings seen by GCC7 # PATCH-FIX-OPENSUSE: Port scripts to Python 3 Patch5: 0001-Port-scripts-to-Python-3.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: OpenIPMI-devel -BuildRequires: asciidoc BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 BuildRequires: e2fsprogs-devel -BuildRequires: glib2-devel BuildRequires: help2man BuildRequires: libaio-devel -BuildRequires: libbz2-devel BuildRequires: libtool -BuildRequires: libxml2-devel BuildRequires: libxslt BuildRequires: net-snmp-devel BuildRequires: pkgconfig -%if 0%{?suse_version} > 1130 -PreReq: sysvinit(network) sysvinit(syslog) -%endif - -Requires(pre): %fillup_prereq - -%if 0%{?suse_version} > 1230 BuildRequires: systemd-rpm-macros -%{?systemd_requires} -%endif -Conflicts: pacemaker < 1.1.8 -Conflicts: heartbeat-common < 3.0.2 -Obsoletes: heartbeat-common < 3.0.2 +BuildRequires: pkgconfig(OpenIPMI) +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libxml-2.0) Requires: perl-TimeDate Requires: sudo +Requires(pre): shadow # The following is necessary since sbd is dropped from # cluster-glue itself: Recommends: sbd -Requires(pre): /usr/sbin/groupadd /usr/bin/getent /usr/sbin/useradd +Conflicts: heartbeat-common < 3.0.2 +Conflicts: pacemaker < 1.1.8 +Obsoletes: heartbeat-common < 3.0.2 +%{?systemd_requires} %if 0%{?suse_version} >= 1330 -Requires(pre): user(nobody) Requires(pre): group(nobody) -%endif -# SLES10 needs tcpd-devel but doesn't have libcurl -%if 0%{?suse_version} < 1020 -BuildRequires: sgml-skel -BuildRequires: tcpd-devel -%else -BuildRequires: libcurl-devel -%endif - -%if ! %{defined _rundir} -%define _rundir %{_localstatedir}/run +Requires(pre): user(nobody) %endif %description @@ -113,9 +80,9 @@ %package -n libglue2 Summary: Reusable cluster libraries Group: Productivity/Clustering/HA -Obsoletes: libheartbeat2 < 3.0.2 -Conflicts: libheartbeat2 < 3.0.2 Requires: %{name} = %{version}-%{release} +Conflicts: libheartbeat2 < 3.0.2 +Obsoletes: libheartbeat2 < 3.0.2 %description -n libglue2 A collection of libraries that are useful for writing cluster managers @@ -140,74 +107,37 @@ %patch5 -p1 %build -CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" -export CFLAGS -PYTHON="%{_bindir}/python3" -export PYTHON +export CFLAGS="${CFLAGS} %{optflags}" +export PYTHON="%{_bindir}/python3" ./autogen.sh -find . -type f -exec perl -pi -e 'BEGIN{undef $/};s[^#\!/usr/bin/env perl][#\!%{_bindir}/perl]' {} \; -find . -type f -exec perl -pi -e 'BEGIN{undef $/};s[^#\!/usr/bin/python3][#\!%{_bindir}/python3]' {} \; -# SLES <= 10 does not support ./configure --docdir=, -# hence, use this ugly hack -%if 0%{?suse_version} < 1020 -export docdir=%{glue_docdir} +find . -type f -exec perl -pi -e 'BEGIN{undef $/};s[^#\!%{_bindir}/env perl][#\!%{_bindir}/perl]' {} \; %configure \ + --disable-static \ --enable-ipmilan=no \ --enable-libnet=no \ - --enable-fatal-warnings=%{warnings_fatal} \ - --with-package-name=%{name} \ - --with-daemon-group=%{gname} \ - --with-daemon-user=%{uname} -%else -%configure \ - --enable-ipmilan=no \ - --enable-libnet=no \ - --enable-fatal-warnings=%{warnings_fatal} \ + --disable-fatal-warnings \ --with-package-name=%{name} \ --with-daemon-group=%{gname} \ --with-daemon-user=%{uname} \ -%if %{defined _unitdir} --with-systemdsystemunitdir=%{_unitdir} \ -%endif --with-rundir=%{_rundir} \ --docdir=%{glue_docdir} -%endif make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install +%make_install # Dont package static libs or compiled python -find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f -find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f -find $RPM_BUILD_ROOT -name '*.pyc' -type f -print0 | xargs -0 rm -f -find $RPM_BUILD_ROOT -name '*.pyo' -type f -print0 | xargs -0 rm -f -install -D -m 755 %{S:3} %{buildroot}%{_sbindir}/hb_report +find %{buildroot} -type f "(" -name "*.la" -o -name "*.pyc" -o -name "*.pyo" ")" -delete -print +install -D -m 755 %{SOURCE3} %{buildroot}%{_sbindir}/hb_report %if %{defined _unitdir} -ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rclogd +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rclogd %endif %pre -if - getent group %{gname} >/dev/null -then - : OK group haclient already present -else - /usr/sbin/groupadd -o -r -g %{uid} %{gname} 2>/dev/null -fi -if - getent passwd %{uname} >/dev/null -then - : OK hacluster user already present -else - /usr/sbin/useradd -r -g %{gname} -c "heartbeat processes" \ - -d %{_var}/lib/heartbeat/cores/%{uname} -o -u %{uid} \ - %{uname} 2>/dev/null -fi -%if %{defined _unitdir} - %service_add_pre logd.service -%endif +getent group %{gname} >/dev/null || groupadd -r -g %{gid} %{gname} +getent passwd %{uname} >/dev/null || useradd -r -u %{uid} -g %{gname} -d %{_localstatedir}/lib/heartbeat/cores/%{uname} -s /sbin/nologin -c "heartbeat processes" %{uname} +%service_add_pre logd.service -%if %{defined _unitdir} %post %service_add_post logd.service @@ -216,16 +146,11 @@ %postun %service_del_postun logd.service -%endif -%post -n libglue2 -/sbin/ldconfig - -%postun -n libglue2 -/sbin/ldconfig +%post -n libglue2 -p /sbin/ldconfig +%postun -n libglue2 -p /sbin/ldconfig %files -%defattr(-,root,root) %{_defaultdocdir}/%{name}/ %dir %{_libdir}/heartbeat %dir %{_var}/lib/heartbeat @@ -250,13 +175,9 @@ %{_sbindir}/cibsecret %{_sbindir}/meatclient %{_sbindir}/stonith - -%if %{defined _unitdir} %{_unitdir}/logd.service -%endif - -%doc %{_mandir}/man1/* -%doc %{_mandir}/man8/* +%{_mandir}/man1/* +%{_mandir}/man8/* %doc AUTHORS %doc COPYING %doc logd/logd.cf @@ -273,13 +194,11 @@ %{_libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper %files -n libglue2 -%defattr(-,root,root) %{_libdir}/lib*.so.* %doc AUTHORS %doc COPYING.LIB %files -n libglue-devel -%defattr(-,root,root) %dir %{_libdir}/heartbeat %dir %{_libdir}/heartbeat/plugins %dir %{_libdir}/heartbeat/plugins/test
