- merged 4.1 patches... hope I didn't brake anything

[packages/rpm.git] / rpm-python-amfix.patch

diff --git a/rpm-python-amfix.patch b/rpm-python-amfix.patch
index 2bead41adb9773f8faf78b80f28be92690559f97..1aa12e96458737cafb5d06add317ce828e35c408 100644 (file)
--- a/rpm-python-amfix.patch
+++ b/rpm-python-amfix.patch
@@ -1,9 +1,15 @@
---- rpm-4.0.2/python/Makefile.am.orig  Mon Jun 19 01:26:50 2000
-+++ rpm-4.0.2/python/Makefile.am       Sun Sep  9 00:41:37 2001
-@@ -25,5 +25,5 @@
+--- rpm-4.0.4/python/Makefile.am.wiget2        Tue Feb 12 23:20:17 2002
++++ rpm-4.0.4/python/Makefile.am       Tue Feb 12 23:21:09 2002
+@@ -34,10 +34,10 @@
  noinst_LTLIBRARIES = librpmmodule.la
  librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c
  
 -rpmmodule.so: $(librpmmodule_la_OBJECTS)
 +rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
-       $(LINK) -o $@ $^ $(rpmmodule_so_LDFLAGS)
+       $(LINK) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
+ 
+-poptmodule.so: $(poptmodule_so_OBJECTS)
++poptmodule.so$(EXEEXT): $(poptmodule_so_OBJECTS)
+       $(LINK) -o $@ $(poptmodule_so_OBJECTS) $(poptmodule_so_LDFLAGS)
+ 
+ .PHONY:       lclint