rpms/tor/devel tor.upstart,1.4,1.5 tor.spec,1.41,1.42

[ensc]

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10963

Modified Files:
	tor.upstart tor.spec 
Log Message:
updated -upstart to upstart 0.6.3



Index: tor.upstart
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.upstart,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tor.upstart	22 Nov 2009 10:41:28 -0000	1.4
+++ tor.upstart	6 Dec 2009 10:42:26 -0000	1.5
@@ -2,9 +2,9 @@
 
 #start on starting local
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on (runlevel 0 or
+          runlevel 1 or
+          runlevel 6)
 
 limit nofile 4096
 


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- tor.spec	15 Nov 2009 11:40:58 -0000	1.41
+++ tor.spec	6 Dec 2009 10:42:26 -0000	1.42
@@ -13,7 +13,7 @@
 
 Name:		tor
 Version:	0.2.1.20
-Release:	%release_func 1300
+Release:	%release_func 1301
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -62,8 +62,7 @@ Group:			System Environment/Base
 Source20:		%name.upstart
 Provides:		init(%name) = upstart
 Requires:		%name = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 %{?noarch}
@@ -135,7 +134,7 @@ mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/lo
 install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
 install -p -m0644 %SOURCE2  $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
 
-install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/event.d/tor
+install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/init/tor
 
 
 %pre core
@@ -222,10 +221,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files upstart
 %defattr(-,root,root,-)
-%config(noreplace) /etc/event.d/*
+%config(noreplace) /etc/init/*
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.20-1301
+- updated -upstart to upstart 0.6.3
+
 * Sat Nov 14 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.20-1300
 - updated URLs (#532373)
 - removed (inactive) update mechanism for GeoIP data; this might