rpm-python-fix.patch

   1 diff -urN rpm-4.3.org/python/Makefile.am rpm-4.3/python/Makefile.am
   2 --- rpm-4.3.org/python/Makefile.am      2003-12-27 23:56:46.082303664 +0100
   3 +++ rpm-4.3/python/Makefile.am  2003-12-28 00:07:26.082008920 +0100
   4 @@ -29,46 +29,33 @@
   5         rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h
   6
   7  mylibs= \
   8 -       $(top_builddir)/lib/.libs/librpm.so \
   9 -       $(top_builddir)/rpmdb/.libs/librpmdb.so \
  10 -       $(top_builddir)/rpmio/.libs/librpmio.so \
  11 -       $(top_builddir)/popt/.libs/libpopt.so \
  12 +       $(top_builddir)/lib/librpm.la \
  13 +       $(top_builddir)/rpmdb/librpmdb.la \
  14 +       $(top_builddir)/rpmio/librpmio.la \
  15 +       -lbeecrypt \
  16 +       -lpopt \
  17         @WITH_LIBELF_LIB@
  18
  19  LDADD =
  20
  21  pythondir = $(pylibdir)/site-packages
  22 -python_PROGRAMS = rpmmodule.so
  23 +python_LTLIBRARIES = rpmmodule.la poptmodule.la
  24
  25  rpmdbdir = $(pylibdir)/site-packages/rpmdb
  26 -rpmdb_PROGRAMS = _rpmdb.so
  27 +rpmdb_LTLIBRARIES = _rpmdb.la
  28
  29 -noinst_PROGRAMS = poptmodule.so
  30 +rpmmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
  31 +rpmmodule_la_LIBADD =  @WITH_BEECRYPT_LIB@
  32
  33 -rpmmodule_so_SOURCES =
  34 -rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
  35 -rpmmodule_so_LDADD =   @WITH_BEECRYPT_LIB@
  36 +_rpmdb_la_SOURCES = _rpmdb.c
  37 +_rpmdb_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
  38
  39 -_rpmdb_so_SOURCES = _rpmdb.c
  40 -_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so
  41 +poptmodule_la_SOURCES = poptmodule.c
  42 +poptmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
  43
  44 -poptmodule_so_SOURCES = poptmodule.c
  45 -poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
  46 -
  47 -noinst_LTLIBRARIES = librpmmodule.la
  48 -librpmmodule_la_SOURCES = rpmmodule.c header-py.c \
  49 +rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
  50         rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
  51         rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c
  52 -librpmmodule_OBJECTS = $(subst .c,.o,$(librpmmodule_la_SOURCES))
  53 -
  54 -rpmmodule.so$(EXEEXT): librpmmodule.la
  55 -       $(CC) -o $@ $(librpmmodule_OBJECTS) $(rpmmodule_so_LDFLAGS)
  56 -
  57 -_rpmdb.so$(EXEEXT): _rpmdb.o
  58 -       $(CC) -o $@ _rpmdb.o $(_rpmdb_so_LDFLAGS)
  59 -
  60 -poptmodule.so$(EXEEXT): poptmodule.o
  61 -       $(CC) -o $@ poptmodule.o $(poptmodule_so_LDFLAGS)
  62
  63  # rpmmodule.c header-py.c \
  64  #      rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \