rpms/upstart/devel upstart-rpm.patch, NONE, 1.1 upstart.spec, 1.9, 1.10
Casey Dahlin (sadmac)
fedora-extras-commits at redhat.com
Wed Mar 12 17:00:19 UTC 2008
Author: sadmac
Update of /cvs/pkgs/rpms/upstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25357
Modified Files:
upstart.spec
Added Files:
upstart-rpm.patch
Log Message:
patch for .rpm{save,new} files
upstart-rpm.patch:
--- NEW FILE upstart-rpm.patch ---
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)
ptr = strrchr (path, '.');
if (ptr && (! strncmp (ptr, ".dpkg-", 6)))
return TRUE;
-
+ if (ptr && (! strncmp (ptr, ".rpmsave",8)))
+ return TRUE;
+ if (ptr && (! strncmp (ptr, ".rpmnew",7)))
+ return TRUE;
return FALSE;
}
Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- upstart.spec 2 Mar 2008 23:29:26 -0000 1.9
+++ upstart.spec 12 Mar 2008 16:59:43 -0000 1.10
@@ -1,6 +1,6 @@
Name: upstart
Version: 0.3.9
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: An event-driven init system
Group: System Environment/Base
@@ -10,6 +10,7 @@
Patch0: upstart-gcc43.patch
Patch1: upstart-force-on-shutdown-reboot.patch
Patch2: upstart-tty-stack.patch
+Patch3: upstart-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -24,6 +25,7 @@
%patch0 -p1
%patch1 -p1
%patch2
+%patch3 -p1
%build
%configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib}
@@ -85,6 +87,9 @@
%{_mandir}/man8/telinit.8.gz
%changelog
+* Wed Mar 13 2008 Casey Dahlin <cjdahlin at ncsu.edu> - 0.3.9-10
+- Add patch to ignore .rpm{new,save} files
+
* Sun Mar 03 2008 Casey Dahlin <cjdahlin at ncsu.edu> - 0.3.9-9
- Remove automake dependency, build Makefile.in changes into patch
More information about the fedora-extras-commits
mailing list