Author: qboosh Date: Thu May 24 19:26:52 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- rediff to insert lines in sane place
---- Files affected:
SOURCES:
rpm-mono.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/rpm-mono.patch
diff -u SOURCES/rpm-mono.patch:1.5 SOURCES/rpm-mono.patch:1.6
--- SOURCES/rpm-mono.patch:1.5 Tue May 22 22:27:45 2007
+++ SOURCES/rpm-mono.patch Thu May 24 21:26:47 2007
@@ -65,16 +65,15 @@
RPMFC_WHITE = (1 << 29),
RPMFC_INCLUDE = (1 << 30),
-diff -ruN rpm-4.4.2./macros.in rpm-4.4.2/macros.in
---- rpm-4.4.2./macros.in 2005-08-11 13:11:54.000000000 +0200
-+++ rpm-4.4.2/macros.in 2005-08-11 17:20:46.276790376 +0200
-@@ -443,6 +443,9 @@
- %__python_provides @RPMCONFIGDIR@/pythondeps.sh --provides
- %__python_requires @RPMCONFIGDIR@/pythondeps.sh --requires
+--- rpm-4.4.9/macros.in.orig 2007-05-24 21:20:58.889811039 +0200
++++ rpm-4.4.9/macros.in 2007-05-24 21:20:49.657284908 +0200
+@@ -1406,6 +1406,9 @@
+ #%__php_provides %{_usrlibrpm}/php.prov
+ #%__php_requires %{_usrlibrpm}/php.req
+%__mono_provides %{nil}
+%__mono_requires %{nil}
+
+ #------------------------------------------------------------------------
+ # java(...) configuration.
#
- # fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
- # These macros are necessary only for legacy compatibility, and have moved
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm-mono.patch?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
