X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-python-fix.patch;h=bee6b94cdf1d0a58939b8c2e1d3bcc2fb5b0c453;hb=bc78210b793f8fa6f3fd61a92e8da7e54306f29e;hp=7ce68e945e98034ff80e7775b3709c5646080fab;hpb=a95c61081cd8ef4483466109b7a0feef06b77e6a;p=packages%2Frpm.git

diff --git a/rpm-python-fix.patch b/rpm-python-fix.patch
index 7ce68e9..bee6b94 100644
--- a/rpm-python-fix.patch
+++ b/rpm-python-fix.patch
@@ -1,6 +1,7 @@
---- rpm-4.3/python/Makefile.am.wiget	2003-05-06 17:44:12.000000000 +0200
-+++ rpm-4.3/python/Makefile.am	2003-06-10 13:22:13.859888700 +0200
-@@ -29,45 +29,34 @@
+diff -urN rpm-4.3.org/python/Makefile.am rpm-4.3/python/Makefile.am
+--- rpm-4.3.org/python/Makefile.am	2003-12-27 23:56:46.082303664 +0100
++++ rpm-4.3/python/Makefile.am	2003-12-28 00:07:26.082008920 +0100
+@@ -29,46 +29,33 @@
  	rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h
  
  mylibs= \
@@ -9,9 +10,10 @@
 -	$(top_builddir)/rpmio/.libs/librpmio.so \
 -	$(top_builddir)/popt/.libs/libpopt.so \
 +	$(top_builddir)/lib/librpm.la \
-+ 	$(top_builddir)/rpmdb/librpmdb.la \
-+ 	$(top_builddir)/rpmio/librpmio.la \
-+ 	-lpopt \
++	$(top_builddir)/rpmdb/librpmdb.la \
++	$(top_builddir)/rpmio/librpmio.la \
++	-lbeecrypt \
++	-lpopt \
  	@WITH_LIBELF_LIB@
  
  LDADD =
@@ -25,39 +27,38 @@
 +rpmdb_LTLIBRARIES = _rpmdb.la
  
 -noinst_PROGRAMS = poptmodule.so
-+_rpmdb_la_SOURCES = _rpmdb.c
-+_rpmdb_la_LIBADD = $(mylibs) $(LIBS)
-+_rpmdb_la_LDFLAGS = -module -avoid-version
++rpmmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
++rpmmodule_la_LIBADD =  @WITH_BEECRYPT_LIB@
  
 -rpmmodule_so_SOURCES =
 -rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
-+poptmodule_la_SOURCES = poptmodule.c
-+poptmodule_la_LIBADD = $(mylibs) $(LIBS)
-+poptmodule_la_LDFLAGS = -module -avoid-version
+-rpmmodule_so_LDADD =	@WITH_BEECRYPT_LIB@
++_rpmdb_la_SOURCES = _rpmdb.c
++_rpmdb_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
  
 -_rpmdb_so_SOURCES = _rpmdb.c
 -_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so
--
++poptmodule_la_SOURCES = poptmodule.c
++poptmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
+ 
 -poptmodule_so_SOURCES = poptmodule.c
 -poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
 -
 -noinst_LTLIBRARIES = librpmmodule.la
 -librpmmodule_la_SOURCES = rpmmodule.c header-py.c \
 +rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
- 	rpmbc-py.c rpmmpw-py.c rpmrng-py.c \
  	rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
  	rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c
+-librpmmodule_OBJECTS = $(subst .c,.o,$(librpmmodule_la_SOURCES))
 -
--rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
--	$(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
+-rpmmodule.so$(EXEEXT): librpmmodule.la
+-	$(CC) -o $@ $(librpmmodule_OBJECTS) $(rpmmodule_so_LDFLAGS)
 -
--_rpmdb.so$(EXEEXT): _rpmdb.lo
--	$(CC) -o $@ _rpmdb.lo $(_rpmdb_so_LDFLAGS)
+-_rpmdb.so$(EXEEXT): _rpmdb.o
+-	$(CC) -o $@ _rpmdb.o $(_rpmdb_so_LDFLAGS)
 -
--poptmodule.so$(EXEEXT): poptmodule.lo
--	$(CC) -o $@ poptmodule.lo $(poptmodule_so_LDFLAGS)
-+rpmmodule_la_LIBADD = $(mylibs) $(LIBS)
-+rpmmodule_la_LDFLAGS = -module -avoid-version 
+-poptmodule.so$(EXEEXT): poptmodule.o
+-	$(CC) -o $@ poptmodule.o $(poptmodule_so_LDFLAGS)
  
  # rpmmodule.c header-py.c \
  # 	rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \