rpms/upstart/devel upstart-rpm.patch, 1.2, 1.3 upstart.spec, 1.12, 1.13

[Casey Dahlin (sadmac)]

Author: sadmac

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

Modified Files:
	upstart-rpm.patch upstart.spec 
Log Message:
More exclude rpm tempfiles in /etc/event.d


upstart-rpm.patch:

Index: upstart-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/devel/upstart-rpm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- upstart-rpm.patch	12 Mar 2008 22:20:50 -0000	1.2
+++ upstart-rpm.patch	17 Mar 2008 02:59:03 -0000	1.3
@@ -1,17 +1,23 @@
-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,12 @@ nih_file_is_packaging (const char *path)
- 	ptr = strrchr (path, '.');
+=== modified file 'nih/file.c'
+--- nih/file.c	2007-06-03 12:32:56 +0000
++++ nih/file.c	2008-03-17 02:47:17 +0000
+@@ -375,6 +375,18 @@
  	if (ptr && (! strncmp (ptr, ".dpkg-", 6)))
  		return TRUE;
--
-+	if (ptr && (! strncmp (ptr, ".rpmsave",8)))
+ 
++	/* Matches rpm temp files */
++	if (ptr && (! strncmp (ptr, ".rpmsave",9)))
++		return TRUE;
++	if (ptr && (! strncmp (ptr, ".rpmorig",9)))
 +		return TRUE;
-+	if (ptr && (! strncmp (ptr, ".rpmorig",8)))
++	if (ptr && (! strncmp (ptr, ".rpmnew",8)))
 +		return TRUE;
-+	if (ptr && (! strncmp (ptr, ".rpmnew",7)))
++
++	/* More rpm temp file matching */
++	ptr = strrchr (path, ';');
++	if (ptr && strspn (ptr + 1, "abcdefABCDEF0123456789") == 8 && !ptr[9])
 +		return TRUE;
  
  	return FALSE;
  }
+


Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- upstart.spec	12 Mar 2008 22:20:50 -0000	1.12
+++ upstart.spec	17 Mar 2008 02:59:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -25,7 +25,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
-%patch3 -p1
+%patch3
 
 %build
 %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib}
@@ -87,6 +87,10 @@
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Thu Mar 14 2008 Bill Nottingham <notting at redhat.com> - 0.3.9-13
+- Ignore rpm temporary files of the foo;<somehex> format
+- Make ignores of .rpm{new,orig,save} match only at the end of the name
+
 * Wed Mar 13 2008 Bill Nottingham <notting at redhat.com> - 0.3.9-12
 - forgot about rpmorig too (ugh)