packages: tenshi/tenshi.spec, tor/tor.spec, ucarp/ucarp.spec, udisks/udisks...

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


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

---- Files affected:
packages/tenshi:
   tenshi.spec (1.23 -> 1.24) 
packages/tor:
   tor.spec (1.62 -> 1.63) 
packages/ucarp:
   ucarp.spec (1.20 -> 1.21) 
packages/udisks:
   udisks.spec (1.27 -> 1.28) 
packages/util-vserver:
   util-vserver.spec (1.287 -> 1.288) 
packages/varnish:
   varnish.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: packages/tenshi/tenshi.spec
diff -u packages/tenshi/tenshi.spec:1.23 packages/tenshi/tenshi.spec:1.24
--- packages/tenshi/tenshi.spec:1.23	Tue Oct  5 14:00:48 2010
+++ packages/tenshi/tenshi.spec	Tue Jan 31 12:32:18 2012
@@ -10,6 +10,7 @@
 Source0:	http://dev.inversepath.com/tenshi/%{name}-%{version}.tar.gz
 # Source0-md5:	2b5b19c3b74b3fa7bb2a768b7a9c01ae
 Source1:	%{name}.init
+Source2:	%{name}.tmpfiles
 Patch0:		%{name}-root.patch
 Patch1:		%{name}-config.patch
 URL:		http://www.inversepath.com/tenshi.html
@@ -67,12 +68,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_mandir}/man8,/var/run/tenshi}
+install -d $RPM_BUILD_ROOT{%{_mandir}/man8,/var/run/tenshi} \
+	$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 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -106,6 +109,7 @@
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %{_mandir}/man8/*
 %dir %attr(775,root,tenshi) /var/run/tenshi
+/usr/lib/tmpfiles.d/%{name}.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -113,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2012/01/31 11:32:18  baggins
+- added tmpfiles config for systemd
+
 Revision 1.23  2010/10/05 12:00:48  glen
 - up to 0.12, fixes cpu spinning on pipe mode
 

================================================================
Index: packages/tor/tor.spec
diff -u packages/tor/tor.spec:1.62 packages/tor/tor.spec:1.63
--- packages/tor/tor.spec:1.62	Fri Dec 23 09:39:30 2011
+++ packages/tor/tor.spec	Tue Jan 31 12:32:19 2012
@@ -11,6 +11,7 @@
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
+Source4:	%{name}.tmpfiles
 URL:		http://www.torproject.org/
 # http://archives.seul.org/or/announce/Feb-2009/msg00000.html
 BuildRequires:	libevent-devel >= 1.1
@@ -84,6 +85,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/var/{{lib,run}/%{name},log/{,archive/}%{name}} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -92,10 +95,7 @@
 install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install -D %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-
-install -d $RPM_BUILD_ROOT/var/lib/%{name}
-install -d $RPM_BUILD_ROOT/var/run/%{name}
-install -d $RPM_BUILD_ROOT/var/log/{,archive/}%{name}
+install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -130,6 +130,7 @@
 %attr(640,root,tor)  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
+/usr/lib/tmpfiles.d/%{name}.conf
 %dir %attr(750,root,tor) /var/lib/%{name}
 %dir %attr(750,root,tor) /var/run/%{name}
 %dir %attr(750,root,tor) /var/log/%{name}
@@ -142,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2012/01/31 11:32:19  baggins
+- added tmpfiles config for systemd
+
 Revision 1.62  2011/12/23 08:39:30  lisu
 - 0.2.2.35
 

================================================================
Index: packages/ucarp/ucarp.spec
diff -u packages/ucarp/ucarp.spec:1.20 packages/ucarp/ucarp.spec:1.21
--- packages/ucarp/ucarp.spec:1.20	Wed Mar  9 18:17:35 2011
+++ packages/ucarp/ucarp.spec	Tue Jan 31 12:32:20 2012
@@ -11,6 +11,7 @@
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.config.template
+Source4:	%{name}.tmpfiles
 URL:		http://www.ucarp.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -57,17 +58,22 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
+	$RPM_BUILD_ROOT%{_varrun}/%{name} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} $RPM_BUILD_ROOT%{_varrun}/%{name}
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.template
 install -p examples/linux/vip-down.sh $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install -p examples/linux/vip-up.sh $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
+install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -90,6 +96,7 @@
 %{_sysconfdir}/%{name}/config.template
 %attr(750,root,root) %{_sysconfdir}/%{name}/vip-down.sh
 %attr(750,root,root) %{_sysconfdir}/%{name}/vip-up.sh
+/usr/lib/tmpfiles.d/%{name}.conf
 %{_varrun}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -98,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2012/01/31 11:32:20  baggins
+- added tmpfiles config for systemd
+
 Revision 1.20  2011/03/09 17:17:35  arekm
 - rel 2; files fixed
 

================================================================
Index: packages/udisks/udisks.spec
diff -u packages/udisks/udisks.spec:1.27 packages/udisks/udisks.spec:1.28
--- packages/udisks/udisks.spec:1.27	Wed Aug 31 08:50:46 2011
+++ packages/udisks/udisks.spec	Tue Jan 31 12:32:21 2012
@@ -7,6 +7,7 @@
 Group:		Libraries
 Source0:	http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 # Source0-md5:	86c63b2b5484f2060499a052b5b6256b
+Source1:	%{name}.tmpfiles
 URL:		http://www.freedesktop.org/wiki/Software/udisks
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -114,14 +115,17 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+# see https://bugs.freedesktop.org/show_bug.cgi?id=24265
+install -d $RPM_BUILD_ROOT/var/run/udisks \
+	$RPM_BUILD_ROOT/etc/bash_completion.d \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/etc/bash_completion.d
 mv $RPM_BUILD_ROOT{%{_sysconfdir}/profile.d/udisks-bash-completion.sh,/etc/bash_completion.d/udisks}
 
-# see https://bugs.freedesktop.org/show_bug.cgi?id=24265
-install -d $RPM_BUILD_ROOT/var/run/udisks
+install %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 %find_lang udisks
 
@@ -161,6 +165,7 @@
 %{_datadir}/dbus-1/system-services/org.freedesktop.UDisks.service
 %attr(700,root,root) /var/lib/udisks
 %attr(700,root,root) /var/run/udisks
+/usr/lib/tmpfiles.d/%{name}.conf
 %{_mandir}/man1/udisks-tcp-bridge.1*
 %{_mandir}/man1/udisks.1*
 %{_mandir}/man7/udisks.7*
@@ -193,6 +198,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2012/01/31 11:32:21  baggins
+- added tmpfiles config for systemd
+
 Revision 1.27  2011/08/31 06:50:46  glen
 - make /var/run/udisks at package creation time, as long as we have static /var/run
 

================================================================
Index: packages/util-vserver/util-vserver.spec
diff -u packages/util-vserver/util-vserver.spec:1.287 packages/util-vserver/util-vserver.spec:1.288
--- packages/util-vserver/util-vserver.spec:1.287	Sat Nov 26 23:29:38 2011
+++ packages/util-vserver/util-vserver.spec	Tue Jan 31 12:32:22 2012
@@ -50,6 +50,7 @@
 Source14:	ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
 # Source14-md5:	08b29584dd349aac9caa7610131a0a88
 Source15:	%{name}.init
+Source16:	%{name}.tmpfiles
 Patch0:		%{name}-vsysvwrapper.patch
 Patch1:		%{name}-pld.patch
 Patch2:		%{name}-centos.patch
@@ -483,7 +484,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/vservers/.pkg,/etc/{sysconfig,rc.d/init.d,cron.d}} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/vservices \
-	$RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/{apps/vdevmap,cgroup}
+	$RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/{apps/vdevmap,cgroup} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} -j1 install install-distribution \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -540,6 +542,8 @@
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys
 cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys/pld-th.asc
 
+install %{SOURCE16} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
 # set arch for pld-ac in pld.conf
 %ifarch i586 i686 ppc sparc alpha athlon
 %define		ftp_arch	%{_target_cpu}
@@ -838,6 +842,7 @@
 %{_mandir}/man8/vtop.8*
 %attr(000,root,root) %dir /vservers
 %dir /vservers/.pkg
+/usr/lib/tmpfiles.d/%{name}.conf
 %dir %{_localstatedir}/run/vservers
 %dir %{_localstatedir}/run/vservers.rev
 %dir %{_localstatedir}/run/vshelper
@@ -996,6 +1001,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.288  2012/01/31 11:32:22  baggins
+- added tmpfiles config for systemd
+
 Revision 1.287  2011/11/26 22:29:38  arekm
 - up to pre3002; /etc/tld-release shouldn't be required
 

================================================================
Index: packages/varnish/varnish.spec
diff -u packages/varnish/varnish.spec:1.68 packages/varnish/varnish.spec:1.69
--- packages/varnish/varnish.spec:1.68	Fri Jan 13 09:39:48 2012
+++ packages/varnish/varnish.spec	Tue Jan 31 12:32:23 2012
@@ -23,6 +23,7 @@
 Source5:	%{name}ncsa.sysconfig
 Source6:	%{name}.logrotate
 Source7:	%{name}.conf
+Source8:	%{name}.tmpfiles
 #Patch100:	branch.diff
 Patch0:		no-ccache.patch
 URL:		http://www.varnish-cache.org/
@@ -134,7 +135,8 @@
 
 # make dirs after make install to know which ones needs spec and which ones make install
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{logrotate.d,rc.d/init.d,sysconfig},/var/{run,lib}/varnish} \
-	$RPM_BUILD_ROOT/var/log/{archive/,}varnish
+	$RPM_BUILD_ROOT/var/log/{archive/,}varnish \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/varnish
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/varnishncsa
@@ -143,6 +145,8 @@
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/logrotate.d/varnish
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.vcl
 
+install %{SOURCE8} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/vmods/*.la
 
@@ -219,6 +223,7 @@
 %{_mandir}/man7/vcl.7*
 %dir /var/lib/varnish
 %dir /var/run/varnish
+/usr/lib/tmpfiles.d/%{name}.conf
 
 %dir %attr(751,root,root) /var/log/varnish
 %dir %attr(750,root,root) /var/log/archive/varnish
@@ -250,6 +255,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2012/01/31 11:32:23  baggins
+- added tmpfiles config for systemd
+
 Revision 1.68  2012/01/13 08:39:48  lisu
 - no more separated libtinfo(w)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tenshi/tenshi.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tor/tor.spec?r1=1.62&r2=1.63&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ucarp/ucarp.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udisks/udisks.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-vserver/util-vserver.spec?r1=1.287&r2=1.288&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.spec?r1=1.68&r2=1.69&f=u



More information about the pld-cvs-commit mailing list