rpms/upstart/devel upstart-rpm.patch, 1.1, 1.2 upstart.spec, 1.11, 1.12

Bill Nottingham (notting) fedora-extras-commits at redhat.com
Wed Mar 12 22:21:24 UTC 2008


Author: notting

Update of /cvs/extras/rpms/upstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10415

Modified Files:
	upstart-rpm.patch upstart.spec 
Log Message:
oh yeah, that too. #@#&#@ rpm


upstart-rpm.patch:

Index: upstart-rpm.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/devel/upstart-rpm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstart-rpm.patch	12 Mar 2008 16:59:43 -0000	1.1
+++ upstart-rpm.patch	12 Mar 2008 22:20:50 -0000	1.2
@@ -1,13 +1,15 @@
 diff -up upstart-0.3.9/nih/file.c.foo upstart-0.3.9/nih/file.c
 --- upstart-0.3.9/nih/file.c.foo	2008-03-12 12:03:50.000000000 -0400
 +++ upstart-0.3.9/nih/file.c	2008-03-12 12:05:39.000000000 -0400
-@@ -374,7 +374,10 @@ nih_file_is_packaging (const char *path)
+@@ -374,7 +374,12 @@ nih_file_is_packaging (const char *path)
  	ptr = strrchr (path, '.');
  	if (ptr && (! strncmp (ptr, ".dpkg-", 6)))
  		return TRUE;
 -
 +	if (ptr && (! strncmp (ptr, ".rpmsave",8)))
 +		return TRUE;
++	if (ptr && (! strncmp (ptr, ".rpmorig",8)))
++		return TRUE;
 +	if (ptr && (! strncmp (ptr, ".rpmnew",7)))
 +		return TRUE;
  


Index: upstart.spec
===================================================================
RCS file: /cvs/extras/rpms/upstart/devel/upstart.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- upstart.spec	12 Mar 2008 20:29:44 -0000	1.11
+++ upstart.spec	12 Mar 2008 22:20:50 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -87,6 +87,9 @@
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Wed Mar 13 2008 Bill Nottingham <notting at redhat.com> - 0.3.9-12
+- forgot about rpmorig too (ugh)
+
 * Wed Mar 13 2008 Casey Dahlin <cjdahlin at ncsu.edu> - 0.3.9-11
 - Make logd a noreplace
 




More information about the fedora-extras-commits mailing list