SOURCES (rpm-4_5): rpm-mono.patch - adjust for libmagic string change

megabajt megabajt at pld-linux.org
Sun Nov 9 15:24:10 CET 2008


Author: megabajt                     Date: Sun Nov  9 14:24:10 2008 GMT
Module: SOURCES                       Tag: rpm-4_5
---- Log message:
- adjust for libmagic string change

---- Files affected:
SOURCES:
   rpm-mono.patch (1.7 -> 1.7.2.1) 

---- Diffs:

================================================================
Index: SOURCES/rpm-mono.patch
diff -u SOURCES/rpm-mono.patch:1.7 SOURCES/rpm-mono.patch:1.7.2.1
--- SOURCES/rpm-mono.patch:1.7	Wed Jan 30 23:11:11 2008
+++ SOURCES/rpm-mono.patch	Sun Nov  9 15:24:05 2008
@@ -1,13 +1,11 @@
---- rpm-5.0.1/macros.in~	2008-01-31 00:06:10.000000000 +0200
-+++ rpm-5.0.1/macros.in	2008-01-31 00:07:31.097681189 +0200
-@@ -1578,8 +1578,8 @@
- #
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
--%__mono_provides	%{_rpmhome}/mono-find-provides
--%__mono_requires	%{_rpmhome}/mono-find-requires
-+%__mono_provides	%{nil}
-+%__mono_requires	%{nil}
+diff -urN rpm-4.5/lib/rpmfc.c rpm-4.5.new/lib/rpmfc.c
+--- rpm-4.5/lib/rpmfc.c	2008-11-09 15:05:53.000000000 +0100
++++ rpm-4.5.new/lib/rpmfc.c	2008-11-09 15:07:53.000000000 +0100
+@@ -555,6 +555,7 @@
+   { "Java ",			RPMFC_JAVA|RPMFC_INCLUDE },
+ 
+   /* .NET executables and libraries. file(1) cannot differ it from native win32 executables unfortunatelly */
++  { "Mono/.Net assembly",	RPMFC_MONO|RPMFC_INCLUDE },
+   { "PE executable",		RPMFC_MONO|RPMFC_INCLUDE },
+   { "executable PE",		RPMFC_MONO|RPMFC_INCLUDE },
  
- #------------------------------------------------------------------------
- # executable(...) configuration.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-mono.patch?r1=1.7&r2=1.7.2.1&f=u



More information about the pld-cvs-commit mailing list