Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-06-26 10:42:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cluster-glue"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2014-06-18 07:47:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-06-26 10:42:48.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jun 25 14:37:40 UTC 2014 - kgronl...@suse.com
+
+- Medium: hb_report: dot is not illegal in file names (bnc#884079,
debian#715391)
+- upstream cs: 0f48479c251b
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cluster-glue.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/.hg_archival.txt
new/cluster-glue/.hg_archival.txt
--- old/cluster-glue/.hg_archival.txt 2014-06-12 12:28:59.000000000 +0200
+++ new/cluster-glue/.hg_archival.txt 2014-06-25 14:47:30.000000000 +0200
@@ -1,5 +1,5 @@
repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e
-node: 45e21bc9795d70b86ecc3825b91ef6424db178d8
+node: 0f48479c251beb5be75110e62c867970d71adc89
branch: default
latesttag: glue-1.0.12-rc1
-latesttagdistance: 19
+latesttagdistance: 22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/cluster-glue-fedora.spec
new/cluster-glue/cluster-glue-fedora.spec
--- old/cluster-glue/cluster-glue-fedora.spec 2014-06-12 12:28:59.000000000
+0200
+++ new/cluster-glue/cluster-glue-fedora.spec 2014-06-25 14:47:30.000000000
+0200
@@ -60,6 +60,11 @@
BuildRequires: e2fsprogs-devel
%endif
+%if %{defined systemd_requires}
+BuildRequires: systemd
+%{?systemd_requires}
+%endif
+
%prep
%setup -q -n cluster-glue
@@ -82,6 +87,9 @@
--with-daemon-user=%{uname} \
--localstatedir=%{_var} \
--libdir=%{_libdir} \
+%if %{defined _unitdir}
+ --with-systemdsystemunitdir=%{_unitdir} \
+%endif
--docdir=%{glue_docdir}
%endif
@@ -112,7 +120,11 @@
%files
%defattr(-,root,root)
%dir %{_datadir}/%{name}
+%if %{defined _unitdir}
+%{_unitdir}/logd.service
+%else
%{_sysconfdir}/init.d/logd
+%endif
%{_datadir}/%{name}/ha_cf_support.sh
%{_datadir}/%{name}/openais_conf_support.sh
%{_datadir}/%{name}/utillib.sh
@@ -176,6 +188,17 @@
-c "cluster user" %{uname}
exit 0
+%if %{defined _unitdir}
+%post
+%systemd_post logd.service
+
+%preun
+%systemd_preun logd.service
+
+%postun
+%systemd_postun_with_restart logd.service
+%endif
+
%post -n cluster-glue-libs -p /sbin/ldconfig
%postun -n cluster-glue-libs -p /sbin/ldconfig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/cluster-glue-suse.spec
new/cluster-glue/cluster-glue-suse.spec
--- old/cluster-glue/cluster-glue-suse.spec 2014-06-12 12:28:59.000000000
+0200
+++ new/cluster-glue/cluster-glue-suse.spec 2014-06-25 14:47:30.000000000
+0200
@@ -42,6 +42,7 @@
BuildRequires: libxslt docbook_4 docbook-xsl-stylesheets
BuildRequires: help2man
BuildRequires: asciidoc
+BuildRequires: libbz2-devel libaio-devel
Obsoletes: heartbeat-common
Provides: heartbeat-common
@@ -56,6 +57,11 @@
BuildRequires: libcurl-devel
%endif
+%if %{defined systemd_requires}
+BuildRequires: systemd
+%{?systemd_requires}
+%endif
+
%description
A collection of common tools derived from the Heartbeat project that are
useful for writing cluster managers such as Pacemaker.
@@ -113,6 +119,9 @@
--with-daemon-group=%{gname} \
--with-daemon-user=%{uname} \
--with-rundir=%{_rundir} \
+%if %{defined _unitdir}
+ --with-systemdsystemunitdir=%{_unitdir} \
+%endif
--docdir=%{glue_docdir}
%endif
@@ -128,11 +137,15 @@
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
+%if %{defined _unitdir}
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rclogd
+%else
test -d $RPM_BUILD_ROOT/sbin || mkdir $RPM_BUILD_ROOT/sbin
(
cd $RPM_BUILD_ROOT/sbin
ln -s /etc/init.d/logd rclogd
)
+%endif
###########################################################
@@ -163,7 +176,20 @@
-d %{_var}/lib/heartbeat/cores/%{uname} -o -u %{uid} \
%{uname} 2>/dev/null || :
fi
+%if %{defined _unitdir}
+ %service_add_pre logd.service
+%endif
+
+%if %{defined _unitdir}
+%post
+%service_add_post logd.service
+
+%preun
+%service_del_preun logd.service
+%postun
+%service_del_postun logd.service
+%else
%preun
%stop_on_removal logd
@@ -172,6 +198,7 @@
%postun
%insserv_cleanup
+%endif
%post -n libglue2
/sbin/ldconfig
@@ -213,7 +240,13 @@
%{_sbindir}/meatclient
%{_sbindir}/stonith
+%if %{defined _unitdir}
+%{_unitdir}/logd.service
+%{_sbindir}/rclogd
+%else
%{_sysconfdir}/init.d/logd
+/sbin/rclogd
+%endif
%doc %{_mandir}/man1/*
%doc %{_mandir}/man8/*
@@ -223,8 +256,6 @@
%doc logd/logd.cf
%doc doc/stonith/README*
-/sbin/rclogd
-
%{_libdir}/heartbeat/lrmd
%{_libdir}/heartbeat/ha_logd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/hb_report/hb_report.in
new/cluster-glue/hb_report/hb_report.in
--- old/cluster-glue/hb_report/hb_report.in 2014-06-12 12:28:59.000000000
+0200
+++ new/cluster-glue/hb_report/hb_report.in 2014-06-25 14:47:30.000000000
+0200
@@ -174,7 +174,7 @@
}
chkname() {
[ "$1" ] || usage short
- echo $1 | grep -qs '[^a-zA-Z0-9@_+=:-]' &&
+ echo $1 | grep -qs '[^a-zA-Z0-9@_+=:.-]' &&
fatal "$1 contains illegal characters"
}
set_dest() {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
