- put version on rpmpopt filename to avoid legacy filename collision.

CVS patchset: 3897
CVS date: 2000/06/22 13:39:44

diff --git a/CHANGES b/CHANGES
index 6b6b9ab..91fdea6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -66,6 +66,7 @@
        - fix: typo in brp-compress caused i18n man pages not to compress.
        - API: uncouple fadio from rest of rpmio.
        - API: externalize legacy fdOpen interface for rpmfind et al.
+       - put version on rpmpopt filename to avoid legacy name collision.
 
 3.0.4 -> 3.0.5
        - handle version 4 packaging as input.

diff --git a/Makefile.am b/Makefile.am
index 87b306e..35ac506 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = CHANGES CREDITS GROUPS README.amiga INSTALL \
        gendiff installplatform platform* \
        po/*.in po/*.po po/rpm.pot \
        python/*.am python/*.in python/*.c python/*.h python/testit \
-       rpm.magic rpmpopt* rpmqv.c rpm.spec
+       rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.spec
 
 EXTRA_PROGRAMS = rpmconvert
 
@@ -40,10 +40,13 @@ noinst_PROGRAMS =   @BUILD_RPMCONVERT@
 
 pkglibdir =            @RPMCONFIGDIR@
 pkglib_PROGRAMS =      rpmb rpmdb rpmi rpmk rpmq
-pkglib_DATA =          rpmrc rpmpopt macros
+pkglib_DATA =          rpmrc rpmpopt-$(VERSION) macros
 pkglib_SCRIPTS =       find-provides find-requires mkinstalldirs \
                        config.guess config.sub
 
+rpmpopt-$(VERSION): rpmpopt
+       cp $< $@
+
 noinst_HEADERS = \
        acconfig.h      build.h         system.h
 

diff --git a/configure.in b/configure.in
index 8530f2f..8b259c3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -942,7 +942,7 @@ AC_SUBST(SYSCONFIGDIR)
 LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc"
 AC_DEFINE_UNQUOTED(LIBRPMRC_FILENAME, "$LIBRPMRC_FILENAME")
 AC_SUBST(LIBRPMRC_FILENAME)
-LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt"
+LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt-${VERSION}"
 AC_DEFINE_UNQUOTED(LIBRPMALIAS_FILENAME, "$LIBRPMALIAS_FILENAME")
 AC_SUBST(LIBRPMALIAS_FILENAME)
 FINDREQUIRES="${RPMCONFIGDIR}/find-requires"

diff --git a/po/da.po b/po/da.po
index f32cc54..dd24160 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -1182,11 +1182,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1203,32 +1198,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1246,10 +1225,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2017,7 +1992,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2172,45 +2147,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3291,11 +3266,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr "%6d %s\n"
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3316,6 +3286,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr "%6d %s\n"
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3884,40 +3859,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/python/Makefile.in b/python/Makefile.in
index b618b25..a9d39db 100644 (file)
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -177,7 +177,7 @@ pythondir = $(prefix)/lib/python1.5/site-packages
 python_PROGRAMS = rpmmodule.so
 rpmmodule_so_SOURCES = 
 # XXX rpmmodule_so_LDFLAGS = -L../lib/.libs -lrpm -L../popt/.libs -lpopt $(LIBS) -shared -Wl,-soname,rpmmodule.so
-rpmmodule_so_LDFLAGS = $(top_builddir)/lib/librpm.la   $(top_builddir)/rpmio/librpmio.la               $(LIBS) -shared -Wl,-soname,rpmmodule.so
+rpmmodule_so_LDFLAGS = $(top_builddir)/lib/librpm.la           $(top_builddir)/rpmio/librpmio.la                       $(top_builddir)/popt/libpopt.la                         $(LIBS) -shared -Wl,-soname,rpmmodule.so
 
 
 noinst_LTLIBRARIES = librpmmodule.la

diff --git a/rpm.spec b/rpm.spec
index 43d6a3a..948bbf4 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -169,7 +169,7 @@ fi
 %{__prefix}/lib/rpm/mkinstalldirs
 %{__prefix}/lib/rpm/rpmdb
 %{__prefix}/lib/rpm/rpm[eiukqv]
-%{__prefix}/lib/rpm/rpmpopt
+%{__prefix}/lib/rpm/rpmpopt*
 %{__prefix}/lib/rpm/rpmrc
 %{__prefix}/lib/rpm/vpkg-provides.sh
 %{__prefix}/lib/rpm/vpkg-provides2.sh