packages: speech-dispatcher/speech-dispatcher.spec, sphinx/sphinx.spec, spl...

baggins baggins at pld-linux.org
Tue Jan 31 12:32:18 CET 2012 

Author: baggins                      Date: Tue Jan 31 11:32:18 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added tmpfiles config for systemd

---- Files affected:
packages/speech-dispatcher:
   speech-dispatcher.spec (1.23 -> 1.24) 
packages/sphinx:
   sphinx.spec (1.43 -> 1.44) 
packages/splashutils:
   splashutils.spec (1.46 -> 1.47) 
packages/stunnel:
   stunnel.spec (1.128 -> 1.129) 
packages/sudo:
   sudo.spec (1.186 -> 1.187) 

---- Diffs:

================================================================
Index: packages/speech-dispatcher/speech-dispatcher.spec
diff -u packages/speech-dispatcher/speech-dispatcher.spec:1.23 packages/speech-dispatcher/speech-dispatcher.spec:1.24
--- packages/speech-dispatcher/speech-dispatcher.spec:1.23	Tue Oct 25 20:26:10 2011
+++ packages/speech-dispatcher/speech-dispatcher.spec	Tue Jan 31 12:32:13 2012
@@ -21,6 +21,7 @@
 # Source0-md5:	ccfc30ac006673d36b4223eb760ed696
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+Source3:	%{name}.tmpfiles
 Patch0:		%{name}-info.patch
 Patch1:		pulse.patch
 URL:		http://www.freebsoft.org/
@@ -140,14 +141,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT/var/{log,run}/speech-dispatcher
+install -d $RPM_BUILD_ROOT/var/{log,run}/speech-dispatcher \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -D %{SOURCE1}	$RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install -D %{SOURCE2}	$RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}/speechd
 %py_postclean
@@ -228,6 +230,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/speech-dispatcher/modules/swift-generic.conf
 %dir %attr(755,%{name},%{name}) /var/run/speech-dispatcher
 %dir %attr(755,%{name},%{name}) /var/log/speech-dispatcher
+/usr/lib/tmpfiles.d/%{name}.conf
 %{_infodir}/spd-say.info*
 %{_infodir}/speech-dispatcher.info*
 %{_infodir}/ssip.info*
@@ -262,6 +265,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2012/01/31 11:32:13  baggins
+- added tmpfiles config for systemd
+
 Revision 1.23  2011/10/25 18:26:10  wiget
 - BR newer rpmbuild(macros) for __with_without and __enable_disable macros
 

================================================================
Index: packages/sphinx/sphinx.spec
diff -u packages/sphinx/sphinx.spec:1.43 packages/sphinx/sphinx.spec:1.44
--- packages/sphinx/sphinx.spec:1.43	Fri Jan 20 14:24:10 2012
+++ packages/sphinx/sphinx.spec	Tue Jan 31 12:32:14 2012
@@ -28,6 +28,7 @@
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.conf.sh
+Source4:	%{name}.tmpfiles
 Patch0:		%{name}-system-libstemmer.patch
 Patch1:		bug-468.patch
 URL:		http://www.sphinxsearch.com/
@@ -196,7 +197,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},/etc/{logrotate.d,rc.d/init.d},/var/{log,run,lib}/%{name},/var/log/archive/%{name}}
+install -d $RPM_BUILD_ROOT{%{_sbindir},/etc/{logrotate.d,rc.d/init.d}}\
+	$RPM_BUILD_ROOT{/var/{log,run,lib}/%{name},/var/log/archive/%{name}} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -214,6 +217,7 @@
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 install -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
+install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 install -d $RPM_BUILD_ROOT%{php_data_dir}
 cp -p api/sphinxapi.php $RPM_BUILD_ROOT%{php_data_dir}
@@ -290,7 +294,7 @@
 %{_mandir}/man1/search.1*
 %{_mandir}/man1/searchd.1*
 %{_mandir}/man1/spelldump.1*
-
+/usr/lib/tmpfiles.d/%{name}.conf
 %dir %attr(771,root,sphinx) /var/run/sphinx
 %dir %attr(770,root,sphinx) /var/log/sphinx
 %dir %attr(770,root,sphinx) /var/log/archive/sphinx
@@ -332,6 +336,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2012/01/31 11:32:14  baggins
+- added tmpfiles config for systemd
+
 Revision 1.43  2012/01/20 13:24:10  baggins
 - rel 3
 - logrotate 3.8.0 requires "su" option for non-root owned dirs

================================================================
Index: packages/splashutils/splashutils.spec
diff -u packages/splashutils/splashutils.spec:1.46 packages/splashutils/splashutils.spec:1.47
--- packages/splashutils/splashutils.spec:1.46	Tue Dec 20 20:42:30 2011
+++ packages/splashutils/splashutils.spec	Tue Jan 31 12:32:15 2012
@@ -18,6 +18,7 @@
 # Source1-md5:	20fc3ed2407edc8cd97623bf7f1c5c7b
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
+Source4:	%{name}.tmpfiles
 Patch0:		%{name}-libs.patch
 Patch1:		%{name}-configpath.patch
 Patch2:		%{name}-relpath.patch
@@ -167,8 +168,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/splash,/etc/rc.d/init.d,/etc/sysconfig} \
-	    $RPM_BUILD_ROOT/var/run/%{name}
-install -d $RPM_BUILD_ROOT/lib/splash/cache
+	$RPM_BUILD_ROOT/var/run/%{name} \
+	$RPM_BUILD_ROOT/lib/splash/cache \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -182,7 +184,9 @@
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/splash
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/splash
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -236,6 +240,7 @@
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/splash
 %dir %{_sysconfdir}/splash
 %dir /var/run/splashutils
+/usr/lib/tmpfiles.d/%{name}.conf
 
 # for initrd
 #%{_libdir}/initrd/fbcondecor_helper
@@ -261,6 +266,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2012/01/31 11:32:15  baggins
+- added tmpfiles config for systemd
+
 Revision 1.46  2011/12/20 19:42:30  arekm
 - release 2
 

================================================================
Index: packages/stunnel/stunnel.spec
diff -u packages/stunnel/stunnel.spec:1.128 packages/stunnel/stunnel.spec:1.129
--- packages/stunnel/stunnel.spec:1.128	Fri Dec  9 17:02:35 2011
+++ packages/stunnel/stunnel.spec	Tue Jan 31 12:32:16 2012
@@ -11,6 +11,7 @@
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.inet
+Source4:	%{name}.tmpfiles
 Patch0:		%{name}-authpriv.patch
 Patch1:		%{name}-ac_fixes.patch
 Patch2:		%{name}-am.patch
@@ -96,7 +97,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig/rc-inetd},%{_mandir}/{pl,fr}/man8,%{_var}/run/stunnel}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig/rc-inetd},%{_mandir}/{pl,fr}/man8,%{_var}/run/stunnel} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -108,6 +110,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/stunnel
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/stunnel
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/stunnel
+install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/stunnel
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/stunnel/stunnel.pem
@@ -158,6 +161,7 @@
 %dir %{_sysconfdir}/stunnel
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/stunnel/stunnel.conf
 %attr(750,stunnel,stunnel) %{_var}/run/stunnel
+/usr/lib/tmpfiles.d/%{name}.conf
 %{_mandir}/man8/stunnel.8*
 %lang(fr) %{_mandir}/fr/man8/stunnel.8*
 %lang(pl) %{_mandir}/pl/man8/stunnel.8*
@@ -177,6 +181,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2012/01/31 11:32:16  baggins
+- added tmpfiles config for systemd
+
 Revision 1.128  2011/12/09 16:02:35  qboosh
 - updated to 4.50
 - removed gethostbyname_is_in_libc_aka_no_libnsl patch (at last!)

================================================================
Index: packages/sudo/sudo.spec
diff -u packages/sudo/sudo.spec:1.186 packages/sudo/sudo.spec:1.187
--- packages/sudo/sudo.spec:1.186	Tue Jan 31 11:10:25 2012
+++ packages/sudo/sudo.spec	Tue Jan 31 12:32:17 2012
@@ -31,6 +31,7 @@
 Source1:	%{name}.pamd
 Source2:	%{name}-i.pamd
 Source3:	%{name}.logrotate
+Source4:	%{name}.tmpfiles
 Patch0:		%{name}-libtool.patch
 Patch1:		%{name}-env.patch
 Patch2:		config.patch
@@ -53,6 +54,8 @@
 
 %define		schemadir	/usr/share/openldap/schema
 
+#define		no_install_post_check_tmpfiles	1
+
 %description
 Sudo (superuser do) allows a permitted user to execute a command as
 the superuser (real and effective uid and gid are set to 0 and root's
@@ -182,7 +185,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d},/var/{log/sudo-io,run/sudo},%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d},/var/{log/sudo-io,run/sudo},%{_mandir}/man8} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -194,6 +198,8 @@
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/sudo
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sudo-i
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/sudo
+install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
 touch $RPM_BUILD_ROOT/var/log/sudo
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -248,6 +254,7 @@
 %attr(700,root,root) /var/log/sudo-io
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/sudo
 %attr(700,root,root) %dir /var/run/sudo
+/usr/lib/tmpfiles.d/%{name}.conf
 
 %files -n openldap-schema-sudo
 %defattr(644,root,root,755)
@@ -259,6 +266,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.187  2012/01/31 11:32:17  baggins
+- added tmpfiles config for systemd
+
 Revision 1.186  2012/01/31 10:10:25  arekm
 - up to 1.7.8p2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/speech-dispatcher/speech-dispatcher.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sphinx/sphinx.spec?r1=1.43&r2=1.44&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/splashutils/splashutils.spec?r1=1.46&r2=1.47&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stunnel/stunnel.spec?r1=1.128&r2=1.129&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sudo/sudo.spec?r1=1.186&r2=1.187&f=u

More information about the pld-cvs-commit mailing list