From 769d887949774544fe4a2606119ad6d18cefc527 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 24 May 2007 19:26:47 +0000 Subject: [PATCH] - rediff to insert lines in sane place Changed files: rpm-mono.patch -> 1.6 --- rpm-mono.patch | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/rpm-mono.patch b/rpm-mono.patch index 5379031..eb31d5f 100644 --- a/rpm-mono.patch +++ b/rpm-mono.patch @@ -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 -- 2.43.0