- %requires_php_extension should include zend_module_api dep

[packages/rpm.git] / rpm-magic-usesystem.patch

diff --git a/rpm-magic-usesystem.patch b/rpm-magic-usesystem.patch
index d3f4196ccae941bbf314c828e139c821d5dd3345..b1b148d90ba31d6c8da416ad76e6fbb863fb75e5 100644 (file)
--- a/rpm-magic-usesystem.patch
+++ b/rpm-magic-usesystem.patch
@@ -1,14 +1,3 @@
---- rpm/build/rpmfc.c.orig     2004-11-22 11:39:55.000000000 +0100
-+++ rpm/build/rpmfc.c  2004-11-22 18:09:14.400710096 +0100
-@@ -1432,7 +1432,7 @@
-     size_t slen;
-     int fcolor;
-     int xx;
--    static const char * magicfile = "/usr/lib/rpm/magic";
-+    static const char * magicfile = "/usr/share/file/magic";
-     int msflags = MAGIC_COMPRESS|MAGIC_CHECK; /* XXX what MAGIC_FOO flags? */
-     magic_t ms = NULL;
- 
 diff -ur rpm.org/file/doc/Makefile.am rpm/file/doc/Makefile.am
 --- rpm.org/file/doc/Makefile.am       2004-11-18 15:04:33.000000000 +0100
 +++ rpm/file/doc/Makefile.am   2004-11-22 01:02:30.114807597 +0100
@@ -18,7 +7,6 @@ diff -ur rpm.org/file/doc/Makefile.am rpm/file/doc/Makefile.am
  if FSECT5
  man_MAGIC = magic.5
  else
-Tylko w rpm/file/doc: Makefile.am~
 diff -ur rpm.org/file/Makefile.am rpm/file/Makefile.am
 --- rpm.org/file/Makefile.am   2004-11-18 15:04:32.000000000 +0100
 +++ rpm/file/Makefile.am       2004-11-22 01:01:36.817958788 +0100
@@ -26,9 +14,8 @@ diff -ur rpm.org/file/Makefile.am rpm/file/Makefile.am
  
  EXTRA_DIST = ChangeLog LEGAL.NOTICE MAINT README
  
--SUBDIRS = src magic doc
-+SUBDIRS = src magic
-Tylko w rpm/file: Makefile.am.orig
+-SUBDIRS = src magic doc python
++SUBDIRS = src magic python
 diff -ur rpm.org/file/src/Makefile.am rpm/file/src/Makefile.am
 --- rpm.org/file/src/Makefile.am       2004-11-18 15:04:33.000000000 +0100
 +++ rpm/file/src/Makefile.am   2004-11-22 01:01:36.823963503 +0100
@@ -45,11 +32,24 @@ diff -ur rpm.org/tools/Makefile.am rpm/tools/Makefile.am
 --- rpm.org/tools/Makefile.am  2004-11-22 00:56:22.484205000 +0100
 +++ rpm/tools/Makefile.am      2004-11-22 01:03:05.178339563 +0100
 @@ -30,7 +30,7 @@
- 
  pkgbindir = @RPMCONFIGDIR@
- pkgbin_PROGRAMS = debugedit javadeps rpmcache rpmdeps rpmfile
+ pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps \
+       rpmcache rpmdeps rpmfile
 -MAGIC = $(pkgbindir)/magic
 +MAGIC = /usr/share/file/magic
  
- bin_PROGRAMS =        rpmgraph
+ bin_PROGRAMS =         rpmdigest rpmgraph
+ 
+diff -urbB rpm-4.4.2.org/tools/Makefile.am rpm-4.4.2/tools/Makefile.am
+--- rpm-4.4.2.org/tools/Makefile.am    2005-09-03 16:35:22.169432000 +0200
++++ rpm-4.4.2/tools/Makefile.am        2005-09-03 16:36:53.947479736 +0200
+@@ -28,7 +28,7 @@
+ noinst_PROGRAMS = dumpdb
+ 
+ pkgbindir = @RPMCONFIGDIR@
+ pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps \
+-      rpmcache rpmdeps rpmfile
++      rpmcache rpmdeps @WITH_RPMFILE@
+ MAGIC = /usr/share/file/magic
  
+ bin_PROGRAMS =         rpmdigest rpmgraph