X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-mono.patch;h=eb31d5fef06999f0a81fc3fc7cef2f0e2166f6bc;hp=c0184cd9e7c77eed1927706e2bef16deadecab7e;hb=769d887949774544fe4a2606119ad6d18cefc527;hpb=0eb0b57c50d168382fbdb8b92e4a54d9481cfc46

diff --git a/rpm-mono.patch b/rpm-mono.patch
index c0184cd..eb31d5f 100644
--- a/rpm-mono.patch
+++ b/rpm-mono.patch
@@ -65,60 +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	@RPMCONFIGDIR@/monodeps.sh --provides
-+%__mono_requires	@RPMCONFIGDIR@/monodeps.sh --requires
++%__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
-diff -ruN rpm-4.4.2./configure.ac rpm-4.4.2/configure.ac
---- rpm-4.4.2./configure.ac	2005-08-11 17:36:01.000000000 +0200
-+++ rpm-4.4.2/configure.ac	2005-08-11 18:11:15.449385328 +0200
-@@ -1355,7 +1355,7 @@
- 	scripts/php.req scripts/php.prov
- 	rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
- 	scripts/Makefile scripts/brp-redhat
--	scripts/macros.perl scripts/macros.php scripts/macros.python
-+	scripts/macros.perl scripts/macros.php scripts/macros.python scripts/macros.mono
- 	tools/Makefile
- 	tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
- 	misc/Makefile intl/Makefile po/Makefile.in
-diff -ruN rpm-4.4.2./scripts/macros.mono rpm-4.4.2/scripts/macros.mono
---- rpm-4.4.2./scripts/macros.mono	1970-01-01 01:00:00.000000000 +0100
-+++ rpm-4.4.2/scripts/macros.mono	2005-08-11 18:14:44.387621888 +0200
-@@ -0,0 +1,6 @@
-+# Mono specific macro definitions.
-+# To make use of these macros insert the following line into your spec file:
-+# %include /usr/lib/rpm/macros.mono
-+
-+%define		__find_requires	/usr/bin/mono-find-requires
-+%define		__find_provides	/usr/bin/mono-find-provides
-diff -ruN rpm-4.4.2./scripts/macros.mono.in rpm-4.4.2/scripts/macros.mono.in
---- rpm-4.4.2./scripts/macros.mono.in	1970-01-01 01:00:00.000000000 +0100
-+++ rpm-4.4.2/scripts/macros.mono.in	2005-08-11 18:15:49.420735352 +0200
-@@ -0,0 +1,6 @@
-+# Mono specific macro definitions.
-+# To make use of these macros insert the following line into your spec file:
-+# %include @RPMCONFIGDIR@/macros.mono
-+
-+%define		__find_requires	/usr/bin/mono-find-requires
-+%define		__find_provides	/usr/bin/mono-find-provides
-diff -ruN rpm-4.4.2./scripts/Makefile.am rpm-4.4.2/scripts/Makefile.am
---- rpm-4.4.2./scripts/Makefile.am	2005-07-13 14:19:13.000000000 +0200
-+++ rpm-4.4.2/scripts/Makefile.am	2005-08-11 18:13:19.998450992 +0200
-@@ -16,7 +16,7 @@
- 	rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
- 	sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \
- 	vpkg-provides.sh vpkg-provides2.sh \
--	macros.perl* macros.python* \
-+	macros.perl* macros.python* macros.mono* \
- 	macros.php* find-*.php find-php-*
- 
- installprefix = $(DESTDIR)