- updated for new snap

Changed files:
    rpm-amd64.patch -> 1.7
    rpm-magic-usesystem.patch -> 1.3
    rpm-php-deps.patch -> 1.2
    rpm-rpmpopt.patch -> 1.17
    rpm-rpmrc.patch -> 1.26
    rpm-system_libs-more.patch -> 1.5
    rpm-system_libs.patch -> 1.12

diff --git a/rpm-amd64.patch b/rpm-amd64.patch
index 485acc9faefddcfff5021b95f7649e21eb119679..414368253dc22336f3dfba00160ecab3a1ccc7ed 100644 (file)
--- a/rpm-amd64.patch
+++ b/rpm-amd64.patch
@@ -35,18 +35,6 @@ diff -urN rpm.org/build/parseSpec.c rpm/build/parseSpec.c
        arch = _free(arch);
      } else if (! strncmp("%ifos", s, sizeof("%ifos")-1)) {
        const char *os = rpmExpand("%{_target_os}", NULL);
-diff -urN rpm.org/installplatform rpm/installplatform
---- rpm.org/installplatform    2004-06-14 14:53:29.722428584 +0200
-+++ rpm/installplatform        2004-06-14 14:57:50.898723752 +0200
-@@ -66,7 +66,7 @@
-     ppc-linux) MULTILIBNO=1 ;;
-     ppc64-linux) LIB=lib64; MULTILIBNO=2 ;;
-     i?86-linux|pentium?-linux|athlon-linux) MULTILIBNO=1 ;;
--    x86_64-linux) LIB=lib64; MULTILIBNO=2 ;;
-+    x86_64-linux|amd64-linux|ia32e-linux) LIB=lib64; MULTILIBNO=2 ;;
-   esac
- 
-   if [ -n "$MULTILIBNO" ]; then
 diff -urN rpm.org/lib/rpmrc.c rpm/lib/rpmrc.c
 --- rpm.org/lib/rpmrc.c        2004-06-14 14:53:19.117040848 +0200
 +++ rpm/lib/rpmrc.c    2004-06-14 14:55:21.421447752 +0200

diff --git a/rpm-magic-usesystem.patch b/rpm-magic-usesystem.patch
index 973ebd3b9dd7263f66057c4e8686a47e15321b87..edab548eabbff93b3f78df67f73674fd8d1c2432 100644 (file)
--- a/rpm-magic-usesystem.patch
+++ b/rpm-magic-usesystem.patch
@@ -9,13 +9,13 @@ diff -urN rpm-4.3.org/file/Makefile.am rpm-4.3/file/Makefile.am
 diff -urN rpm-4.3.org/file/src/Makefile.am rpm-4.3/file/src/Makefile.am
 --- rpm-4.3.org/file/src/Makefile.am   2004-01-07 02:01:54.159548970 +0100
 +++ rpm-4.3/file/src/Makefile.am       2004-01-07 02:09:30.670672672 +0100
-@@ -24,7 +24,7 @@
- file_LDADD =  libfmagic.la
+@@ -3,7 +3,7 @@
  
+ #MAGIC         = $(pkgdatadir)/magic
  pkglibdir =  @prefix@/lib/rpm
--MAGIC  = $(pkglibdir)/magic
-+MAGIC  = /usr/share/file/magic
- CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+-MAGIC    = $(pkglibdir)/magic
++MAGIC    = /usr/share/file/magic
+ 
+ AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
  
- listobjs:
 

diff --git a/rpm-php-deps.patch b/rpm-php-deps.patch
index 31fada87dfff505ae68190e5978ff976a1b9c431..21b113fdb1351a2cfd1cfe84eb876dd4c82bd261 100644 (file)
--- a/rpm-php-deps.patch
+++ b/rpm-php-deps.patch
@@ -46,17 +46,17 @@
      { NULL, 0 }
  };
  
-@@ -1167,6 +1177,10 @@
+@@ -1204,6 +1204,10 @@
+ /*@-branchstate@*/
        if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
-           strcpy(fm->obuf, "Perl5 module source text");
- 
-+      /* XXX all files with extension ".php" are PHP modules for now. */
-+      if (slen >= sizeof(".php") && !strcmp(s+slen-(sizeof(".php")-1), ".php"))
-+              strcpy(fm->obuf, "PHP script text");
-+
-       se = fm->obuf;
-         rpmMessage(RPMMESS_DEBUG, "%s: %s\n", s, se);
- 
+           ftype = "Perl5 module source text";
++      else
++          /* XXX all files with extension ".php" are PHP modules for now. */
++          if (slen >= sizeof(".php") && !strcmp(s+slen-(sizeof(".php")-1), ".php"))
++              ftype = "PHP script text";
+       else {
+           ftype = magic_file(ms, s);
+           if (ftype == NULL) {
 --- rpm-4.2/build/rpmfc.h.wiget        Tue Apr  1 10:00:23 2003
 +++ rpm-4.2/build/rpmfc.h      Tue Apr  1 10:01:22 2003
 @@ -40,6 +40,7 @@

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 7c4633ccd947c29098974f2dfea2a629e90392ed..8ba3a6ef0903ee550b0015e51741703c867fc003 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -54,24 +54,24 @@
  #==============================================================================
  rpmd  alias --dbpath          --define '_dbpath !#:+' \
        --POPTdesc=$"use database in DIRECTORY" \
---- rpm-4.3/po/pl.po.orig      2003-06-10 23:48:19.000000000 +0200
-+++ rpm-4.3/po/pl.po   2003-06-10 23:59:11.000000000 +0200
-@@ -3791,6 +3791,18 @@
- msgid "disable configure <option> for build"
- msgstr "wy³±cz <opcjê> konfiguracji przy budowaniu"
- 
-+#: ../rpmpopt:217
-+msgid "make all needed dirs for building binary rpms"
-+msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
-+
-+#: ../rpmpopt:220
-+msgid "build packages with debug information"
-+msgstr "buduj pakiety z informacjami do odpluskwiania"
-+
-+#: ../rpmpopt:223
-+msgid "find all --with/--without values"
-+msgstr "znajd¼ wszystkie warto¶ci --with/--without"
-+
- #: ../rpmpopt:216 ../rpmpopt:231 ../rpmpopt:246 ../rpmpopt:254
- #: ../rpmpopt:262 ../rpmpopt:270 ../rpmpopt:278 ../rpmpopt:286
- #: ../rpmpopt:294 ../rpmpopt:389 ../rpmpopt:483 ../rpmpopt:491
+;--- rpm-4.3/po/pl.po.orig     2003-06-10 23:48:19.000000000 +0200
+;+++ rpm-4.3/po/pl.po  2003-06-10 23:59:11.000000000 +0200
+;@@ -3791,6 +3791,18 @@
+; msgid "disable configure <option> for build"
+; msgstr "wy³±cz <opcjê> konfiguracji przy budowaniu"
+; 
+;+#: ../rpmpopt:217
+;+msgid "make all needed dirs for building binary rpms"
+;+msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
+;+
+;+#: ../rpmpopt:220
+;+msgid "build packages with debug information"
+;+msgstr "buduj pakiety z informacjami do odpluskwiania"
+;+
+;+#: ../rpmpopt:223
+;+msgid "find all --with/--without values"
+;+msgstr "znajd¼ wszystkie warto¶ci --with/--without"
+;+
+; #: ../rpmpopt:216 ../rpmpopt:231 ../rpmpopt:246 ../rpmpopt:254
+; #: ../rpmpopt:262 ../rpmpopt:270 ../rpmpopt:278 ../rpmpopt:286
+; #: ../rpmpopt:294 ../rpmpopt:389 ../rpmpopt:483 ../rpmpopt:491

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index a05b49cdb9a9b60ee6df60293a6735e5bf725039..0a39bc1e4e73ae642b35df9f82bf5d590e6a41b8 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -1,7 +1,7 @@
 diff -urN rpm.org/rpmrc.in rpm/rpmrc.in
---- rpm.org/rpmrc.in   2004-06-01 23:50:45.000000000 +0200
-+++ rpm/rpmrc.in       2004-07-08 01:21:16.468982520 +0200
-@@ -11,60 +11,118 @@
+--- rpm.org/rpmrc.in   2004-10-14 20:43:36.000000000 +0200
++++ rpm/rpmrc.in       2004-11-18 17:37:41.454167194 +0100
+@@ -11,63 +11,65 @@
  #############################################################
  # Values for RPM_OPT_FLAGS for various platforms
  
@@ -32,6 +32,9 @@ diff -urN rpm.org/rpmrc.in rpm/rpmrc.in
 -optflags: m68k -O2 -g -fomit-frame-pointer
 -
 -optflags: ppc -O2 -g -fsigned-char
+-optflags: ppc8260 -O2 -g -fsigned-char
+-optflags: ppc8560 -O2 -g -fsigned-char
+-optflags: ppc32dy4 -O2 -g -fsigned-char
 -optflags: ppciseries -O2 -g -fsigned-char
 -optflags: ppcpseries -O2 -g -fsigned-char
 -optflags: ppc64 -O2 -g -fsigned-char
@@ -56,69 +59,14 @@ diff -urN rpm.org/rpmrc.in rpm/rpmrc.in
 -optflags: atariclone -O2 -g -fomit-frame-pointer
 -optflags: milan -O2 -g -fomit-frame-pointer
 -optflags: hades -O2 -g -fomit-frame-pointer
--
--optflags: s390 -O2 -g
--optflags: s390x -O2 -g
-+optflags: i386 -O2 -march=i386 -mcpu=i686
-+optflags: i486 -O2 -march=i486
-+optflags: i586 -O2 -march=i586
-+optflags: i686 -O2 -march=i686 -mcpu=pentium4
-+optflags: pentium3 -O2 -march=pentium3
-+optflags: pentium4 -O2 -march=pentium4
-+optflags: athlon -O2 -march=athlon
-+optflags: ia64 -O2
-+optflags: x86_64 -O2
-+optflags: amd64 -O2
-+optflags: ia32e -O2
-+
-+optflags: alpha -O2 -mieee
-+optflags: alphaev5 -O2 -mieee -mcpu=ev5
-+optflags: alphaev56 -O2 -mieee -mcpu=ev56
-+optflags: alphapca56 -O2 -mieee -mcpu=pca56
-+optflags: alphaev6 -O2 -mieee -mcpu=ev6
-+optflags: alphaev67 -O2 -mieee -mcpu=ev67
-+
-+optflags: sparc -O2 -m32 -mtune=ultrasparc
-+optflags: sparcv8 -O2 -m32 -mcpu=ultrasparc -mv8
-+optflags: sparcv9 -O2 -m32 -mcpu=ultrasparc
-+optflags: sparc64 -O2 -m64 -mcpu=ultrasparc
-+
-+optflags: m68k -O2 -fomit-frame-pointer
-+
-+optflags: ppc -O2 -fsigned-char
-+optflags: ppciseries -O2 -fsigned-char
-+optflags: ppcpseries -O2 -fsigned-char
-+optflags: ppc64 -O2 -fsigned-char
-+
-+optflags: parisc -O2 -mpa-risc-1-0
-+optflags: hppa1.0 -O2 -mpa-risc-1-0
-+optflags: hppa1.1 -O2 -mpa-risc-1-0
-+optflags: hppa1.2 -O2 -mpa-risc-1-0
-+optflags: hppa2.0 -O2 -mpa-risc-1-0
-+
-+optflags: mips -O2
-+optflags: mipsel -O2
-+
-+optflags: armv3l -O2 -fsigned-char -fomit-frame-pointer -march=armv3
-+optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer -march=armv4
-+optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer -march=armv4
-+
-+optflags: atarist -O2 -fomit-frame-pointer
-+optflags: atariste -O2 -fomit-frame-pointer
-+optflags: ataritt -O2 -fomit-frame-pointer
-+optflags: falcon -O2 -fomit-frame-pointer
-+optflags: atariclone -O2 -fomit-frame-pointer
-+optflags: milan -O2 -fomit-frame-pointer
-+optflags: hades -O2 -fomit-frame-pointer
-+
-+optflags: s390 -O2
-+optflags: s390x -O2
-+
-+optflags: i386 -O2 -march=i386%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i386: %{specflags_i386}}}
-+#optflags: i386 -O2 -march=i486 -mcpu=pentium4
++optflags: i386 -O2 -march=i386 -mcpu=pentium4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i386: %{specflags_i386}}}
 +optflags: i486 -O2 -march=i486%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i486: %{specflags_i486}}}
-+optflags: i586 -O2 -march=i586%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i586: %{specflags_i586}}}
-+optflags: i686 -O2 -march=i686 -mcpu=pentium4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i686: %{specflags_i686}}}
++optflags: i586 -O2 -march=i586%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i586: %{specflags
++_i586}}}
++optflags: i686 -O2 -march=i686 -mcpu=pentium4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i6
++86: %{specflags_i686}}}
++optflags: pentium3 -O2 -march=pentium3%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_pentium3: %{specflags_pentium3}}}
++optflags: pentium4 -O2 -march=pentium4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_pentium4: %{specflags_pentium4}}}
 +optflags: athlon -O2 -march=athlon%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_athlon: %{specflags_athlon}}}
 +optflags: ia64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia64: %{specflags_ia64}}}
 +optflags: x86_64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_x86_64: %{specflags_x86_64}}}
@@ -135,14 +83,17 @@ diff -urN rpm.org/rpmrc.in rpm/rpmrc.in
 +optflags: sparc -O2 -m32 -mtune=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}}
 +optflags: sparcv8 -O2 -m32 -mcpu=ultrasparc -mv8%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv8: %{specflags_sparcv8}}}
 +optflags: sparcv9 -O2 -m32 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv9: %{specflags_sparcv9}}}
-+optflags: sparc64 -O2 -m64 -mcpu=ultrasparc -Wcast-align%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparc64: %{specflags_sparc64}}}
++optflags: sparc64 -O2 -m64 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparc64: %{specflags_sparc64}}}
 +
 +optflags: m68k -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_m68k: %{specflags_m68k}}}
 +
 +optflags: ppc -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}}
-+optflags: ppciseries -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppciseries: %{specflags_ppciseries}}}
-+optflags: ppcpseries -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppcpseries: %{specflags_ppcpseries}}}
-+optflags: ppc64 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppc64: %{specflags_ppc64}}}
++optflags: ppc8260 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8260: %{specflags_ppc8260}}}
++optflags: ppc8560 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8560: %{specflags_ppc8560}}}
++optflags: ppc32dy4 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc32dy4: %{specflags_ppc32dy4}}}
++optflags: ppciseries -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppciseries: %{specflags_ppciseries}}}
++optflags: ppcpseries -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppcpseries: %{specflags_ppcpseries}}}
++optflags: ppc64 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc64: %{specflags_ppc64}}}
 +
 +optflags: parisc -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_parisc: %{specflags_parisc}}}
 +optflags: hppa1.0 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_0: %{specflags_hppa1_0}}}
@@ -164,13 +115,11 @@ diff -urN rpm.org/rpmrc.in rpm/rpmrc.in
 +optflags: atariclone -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atariclone: %{specflags_atariclone}}}
 +optflags: milan -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_milan: %{specflags_milan}}}
 +optflags: hades -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hades: %{specflags_hades}}}
-+
+ 
+-optflags: s390 -O2 -g
+-optflags: s390x -O2 -g
 +optflags: s390 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}}
 +optflags: s390x -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}%{?specflags_s390x: %{specflags_s390x}}}
-+
-+  
-+  #############################################################
-+  # Canonical arch names and numbers
  
  #############################################################
  # Canonical arch names and numbers

diff --git a/rpm-system_libs-more.patch b/rpm-system_libs-more.patch
index d432b083687138fed16e2dab8a4abf32bf89ad7d..983783091a94b01a62b25917ef09cffbc8cbbfc8 100644 (file)
--- a/rpm-system_libs-more.patch
+++ b/rpm-system_libs-more.patch
@@ -13,17 +13,14 @@ diff -urN rpm-4.3.org/Makefile.am rpm-4.3/Makefile.am
 diff -urN rpm-4.3.org/rpmdb/Makefile.am rpm-4.3/rpmdb/Makefile.am
 --- rpm-4.3.org/rpmdb/Makefile.am      2003-12-28 01:33:46.160517288 +0100
 +++ rpm-4.3/rpmdb/Makefile.am  2003-12-28 01:56:22.000000000 +0100
-@@ -25,18 +25,15 @@
+@@ -25,17 +25,13 @@
  noinst_HEADERS = fprint.h header_internal.h legacy.h
  
  pkgbindir = @RPMCONFIGDIR@
 -pkgbin_PROGRAMS = \
--      rpmdb_deadlock rpmdb_dump rpmdb_load rpmdb_svc rpmdb_stat rpmdb_verify
--noinst_PROGRAMS = \
--      rpmdb_archive rpmdb_checkpoint rpmdb_printlog rpmdb_recover \
--      rpmdb_upgrade
-+pkgbin_PROGRAMS =
-+noinst_PROGRAMS =
+-      rpmdb_archive rpmdb_checkpoint rpmdb_deadlock rpmdb_dump rpmdb_load \
+-      rpmdb_printlog rpmdb_recover rpmdb_svc rpmdb_stat rpmdb_upgrade \
+-      rpmdb_verify 
  
  mylibs = librpmdb.la
  

diff --git a/rpm-system_libs.patch b/rpm-system_libs.patch
index 0629b625f7c8a2fe24aeed5c25e6b0164fdc3c3b..031faded4d08ae7f74dfc5179babaa99db72a365 100644 (file)
--- a/rpm-system_libs.patch
+++ b/rpm-system_libs.patch
@@ -118,19 +118,18 @@ diff -urN rpm.org/rpmdb/Makefile.am rpm/rpmdb/Makefile.am
        @WITH_LIBELF_LIB@
  librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la)
  librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la)
-diff -urN rpm.org/rpmio/Makefile.am rpm/rpmio/Makefile.am
---- rpm.org/rpmio/Makefile.am  2004-06-14 11:46:09.817153912 +0200
-+++ rpm/rpmio/Makefile.am      2004-06-14 11:48:20.584274288 +0200
-@@ -11,7 +11,6 @@
- INCLUDES = -I. \
+--- rpm.org/rpmio/Makefile.am.org      2004-11-18 17:42:53.756263795 +0100
++++ rpm.org/rpmio/Makefile.am  2004-11-18 17:43:09.526885309 +0100
+@@ -12,7 +12,6 @@
        -I$(top_srcdir) \
        @WITH_BEECRYPT_INCLUDE@ \
+       @WITH_LUA_INCLUDE@ \
 -      -I$(top_srcdir)/popt \
-       -I$(top_srcdir)/lua/include \
-       -I$(top_srcdir)/lua/local \
        @INCPATH@
-@@ -69,34 +68,34 @@
-       $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
+ 
+ pkgincdir = $(pkgincludedir)
+@@ -70,43 +69,43 @@
+ tax_LDADD = librpmio.la
  
  tdigest_SOURCES = tdigest.c
 -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt
@@ -146,6 +145,17 @@ diff -urN rpm.org/rpmio/Makefile.am rpm/rpmio/Makefile.am
 -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
 +tfts_LDADD = librpmio.la -lpopt
  
+ tget_SOURCES = tget.c
+ tget_LDFLAGS = -all-static
+-tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++tget_LDADD = librpmio.la -lpopt
+ 
+ tput_SOURCES = tput.c
+ tput_LDFLAGS = -all-static
+-tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++tput_LDADD = librpmio.la -lpopt
+ 
+ 
  tglob_SOURCES = tglob.c
  tglob_LDFLAGS = -all-static
 -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la