Hello community,
here is the log from the commit of package siproxd for openSUSE:Factory checked
in at 2014-07-23 22:06:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/siproxd (Old)
and /work/SRC/openSUSE:Factory/.siproxd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "siproxd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/siproxd/siproxd.changes 2013-07-17
10:36:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.siproxd.new/siproxd.changes 2014-07-24
01:21:30.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 21 17:40:41 CEST 2014 - r...@suse.de
+
+- use _rundir macro to fix build against factory
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ siproxd.spec ++++++
--- /var/tmp/diff_new_pack.LhU2pB/_old 2014-07-24 01:21:32.000000000 +0200
+++ /var/tmp/diff_new_pack.LhU2pB/_new 2014-07-24 01:21:32.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package siproxd
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,10 @@
#
-%define piddir /var/run/siproxd/
+%if ! %{defined _rundir}
+%define _rundir %{_localstatedir}/run
+%endif
+%define piddir %_rundir/siproxd/
%define regdir /var/lib/siproxd/
%define siproxduser siproxd
%define siproxdgroup siproxd
@@ -116,7 +119,7 @@
%{__install} -d %buildroot/%{_sysconfdir}/init.d
%{__install} %{S:2} %buildroot/%{_sysconfdir}/init.d/%{name}
-%{__sed} -i "s#@%{name}_PIDDIR@#%{_localstatedir}/run/%{name}#"
%buildroot/%{_sysconfdir}/init.d/%{name}
+%{__sed} -i "s#@%{name}_PIDDIR@#%{_rundir}/%{name}#"
%buildroot/%{_sysconfdir}/init.d/%{name}
%{__install} -d %buildroot/%{_sbindir}
%{__ln_s} /%{_sysconfdir}/init.d/%{name} %buildroot/%{_sbindir}/rc%{name}
@@ -128,7 +131,7 @@
#
# Directory needs to exist for packaging
%if %suse_version > 1120
-%{__mkdir} -p %buildroot%{_localstatedir}/run/%{name}
+%{__mkdir} -p %buildroot%{_rundir}/%{name}
%endif
# cleanup
@@ -143,7 +146,7 @@
%pre
%_sbindir/groupadd -r %{sipproxdgroup} 2> /dev/null || :
-%_sbindir/useradd -r -g %{sipproxdgroup} -s /bin/false -c "Siproxd user" -d
%{_localstatedir}/run/%{name} %{siproxduser} 2> /dev/null || :
+%_sbindir/useradd -r -g %{sipproxdgroup} -s /bin/false -c "Siproxd user" -d
%{_rundir}/%{name} %{siproxduser} 2> /dev/null || :
%postun
/sbin/ldconfig
@@ -172,7 +175,7 @@
%if %suse_version > 1120
#make rpm know about a directory but do not package it
- %attr(0750,%{siproxduser},root) %ghost %{_localstatedir}/run/%{name}
+ %attr(0750,%{siproxduser},root) %ghost %{_rundir}/%{name}
%endif
%files doc
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
