-diff -ur rpm-4.0.4-/rpmio/Makefile.am rpm-4.0.4/rpmio/Makefile.am
---- rpm-4.0.4-/rpmio/Makefile.am Tue Jul 23 10:23:46 2002
-+++ rpm-4.0.4/rpmio/Makefile.am Tue Jul 23 10:47:16 2002
-@@ -50,7 +50,7 @@
- [ ! -f $$lo -a -f $(top_builddir)/beecrypt/$$lo ] && $(LN_S) \
- $(top_builddir)/beecrypt/$$lo $$lo ; \
- [ ! -f .libs/$$lo -a -f $(top_builddir)/beecrypt/.libs/$$lo ] && $(LN_S) \
-- ../$(top_builddir)/beecrypt/.libs/$$lo .libs/$$lo ; \
-+ ../$(top_builddir)/beecrypt/.libs/$$lo .libs/$$lo ; true ; \
- done
+--- rpm-4.3/rpmio/Makefile.am.wiget 2003-06-01 07:56:41.000000000 +0200
++++ rpm-4.3/rpmio/Makefile.am 2003-06-11 02:02:20.000000000 +0200
+@@ -43,7 +43,7 @@
+ if test X"@WITH_BEECRYPT_SUBDIR@" != X; then \
+ ${MAKE} -C $(top_builddir)/@WITH_BEECRYPT_SUBDIR@ listobjs ; \
+ for lo in $(BEECRYPTLOBJS); do \
+- [ -f $$lo ] || $(LN_S) $(top_builddir)/@WITH_BEECRYPT_SUBDIR@/$$lo $$lo ; \
++ [ -f $$lo ] || $(LN_S) $(top_builddir)/@WITH_BEECRYPT_SUBDIR@/$$lo $$lo ; true ; \
+ done \
+ fi
touch $@
-
---- rpm-4.3/po/fr.po.wiget Thu May 15 18:59:19 2003
-+++ rpm-4.3/po/fr.po Fri May 16 00:11:12 2003
-@@ -2,17 +2,17 @@
+--- rpm-4.3/po/fr.po.wiget 2003-06-11 00:41:26.000000000 +0200
++++ rpm-4.3/po/fr.po 2003-06-11 01:52:36.000000000 +0200
+@@ -2,17 +2,16 @@
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2003-05-15 18:53+0200\n"
+ "POT-Creation-Date: 2003-06-11 00:41+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
-+
#: build.c:40
#, fuzzy
---- rpm-4.3/po/pt_BR.po.wiget Thu May 15 18:59:21 2003
-+++ rpm-4.3/po/pt_BR.po Fri May 16 00:12:02 2003
+--- rpm-4.3/po/pt_BR.po.wiget 2003-06-11 00:41:31.000000000 +0200
++++ rpm-4.3/po/pt_BR.po 2003-06-11 01:53:46.000000000 +0200
@@ -5,6 +5,9 @@
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2003-05-15 18:53+0200\n"
+ "POT-Creation-Date: 2003-06-11 00:41+0200\n"
+"PO-Revision-Date: 2003-03-12 14:47+0200\n"
+"Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+"Language-Team: pt <pt@li.org>\n"
--- rpm-4.0.4/rpmio/Makefile.am.orig Tue May 21 19:07:54 2002
+++ rpm-4.0.4/rpmio/Makefile.am Tue May 21 19:26:14 2002
-@@ -24,6 +24,7 @@
- LIBS = @LIBS@ @WITH_ZLIB_LIB@ -lrt -lpthread
-
- BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs)
-+BEECRYPTOBJS = $(BEECRYPTLOBJS:%.lo=%.o)
-
- lib_LTLIBRARIES = librpmio.la
- librpmio_la_SOURCES = digest.c macro.c rpmio.c rpmlog.c rpmmalloc.c \
@@ -45,6 +46,12 @@
for lo in $(BEECRYPTLOBJS); do \
[ -f $$lo ] || $(LN_S) $(top_builddir)/beecrypt/$$lo $$lo ; \
---- rpm-4.3/po/pl.po.orig 2003-05-17 09:14:21.000000000 +0200
-+++ rpm-4.3/po/pl.po 2003-06-08 23:08:04.000000000 +0200
-@@ -1,61 +1,61 @@
+--- rpm-4.3/po/pl.po.wiget 2003-06-11 00:41:30.000000000 +0200
++++ rpm-4.3/po/pl.po 2003-06-11 01:32:59.000000000 +0200
+@@ -1,61 +1,62 @@
-# Polskie komunikaty dla RPM (1999)
+# Polskie komunikaty dla RPM
# Copyright (C) 1999 Free Software Foundation, Inc.
msgstr ""
-"Project-Id-Version: rpm 4.0.3\n"
+"Project-Id-Version: rpm 4.3-20030515\n"
- "POT-Creation-Date: 2003-05-15 18:53+0200\n"
--"PO-Revision-Date: 1999-05-25 17:00+0100\n"
+ "POT-Creation-Date: 2003-06-11 00:41+0200\n"
+ "PO-Revision-Date: 1999-05-25 17:00+0100\n"
-"Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
-"Language-Team: Polish <pl@li.org>\n"
-+"PO-Revision-Date: 2003-06-08 22:42+0200\n"
+"Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
+"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
#: build.c:40
-#, fuzzy
msgid "Failed build dependencies:\n"
--msgstr "niespe³nione zale¿no¶ci:\n"
+ msgstr "niespe³nione zale¿no¶ci:\n"
+msgstr "Niespe³nione zale¿no¶ci budowania:\n"
#: build.c:71
#. parse up the build operators
#: build.c:324
-@@ -77,44 +77,43 @@
+@@ -77,44 +78,43 @@
msgstr "b³±d odczytu nag³ówka z pakietu\n"
#: rpm2cpio.c:82
#: rpmqv.c:129 lib/poptALL.c:111
#, c-format
-@@ -122,15 +121,15 @@
+@@ -122,15 +122,15 @@
msgstr "RPM wersja %s\n"
#: rpmqv.c:136
#: rpmqv.c:295
#, c-format
-@@ -147,15 +146,15 @@
+@@ -147,15 +147,15 @@
#: rpmqv.c:365
msgid "unexpected query flags"
#: rpmqv.c:413
msgid "only installation, upgrading, rmsource and rmspec may be forced"
-@@ -167,7 +166,7 @@
+@@ -167,7 +167,7 @@
#: rpmqv.c:418
msgid "cannot use --prefix with --relocate or --excludepath"
#: rpmqv.c:421
msgid ""
-@@ -237,27 +236,28 @@
+@@ -237,27 +237,28 @@
msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów"
#: rpmqv.c:486
#: rpmqv.c:500
msgid ""
-@@ -280,7 +280,7 @@
+@@ -280,7 +281,7 @@
#: rpmqv.c:541
msgid "no files to sign\n"
#: rpmqv.c:546
#, c-format
-@@ -329,9 +329,8 @@
+@@ -329,9 +330,8 @@
msgstr "nie podano nazw plików tar do budowania"
#: rpmqv.c:735
#: rpmqv.c:775
msgid "no packages given for install"
-@@ -346,30 +345,28 @@
+@@ -346,30 +346,28 @@
msgstr "nie podano argumentów dla sprawdzania"
#: rpmqv.c:820
#: build/build.c:345
msgid ""
-@@ -377,67 +374,58 @@
+@@ -377,67 +375,58 @@
"\n"
"RPM build errors:\n"
msgstr ""
#: build/files.c:278
#, c-format
-@@ -445,141 +433,141 @@
+@@ -445,141 +434,141 @@
msgstr "TIMECHECK nie powiod³o siê: %s\n"
#: build/files.c:343 build/files.c:543 build/files.c:739
#: build/files.c:2319 build/parsePrep.c:50
#, c-format
-@@ -587,9 +575,9 @@
+@@ -587,9 +576,9 @@
msgstr "B³êdny u¿ytkownik/grupa: %s\n"
#: build/files.c:2363
#: build/files.c:2386
#, c-format
-@@ -597,35 +585,37 @@
+@@ -597,35 +586,37 @@
"Installed (but unpackaged) file(s) found:\n"
"%s"
msgstr ""
#: build/names.c:237
#, c-format
-@@ -633,54 +623,54 @@
+@@ -633,54 +624,54 @@
msgstr "Nie mo¿na rozwi±zaæ nazwy systemu: %s\n"
#: build/pack.c:90
#: build/pack.c:295
#, c-format
-@@ -693,9 +683,9 @@
+@@ -693,9 +684,9 @@
msgstr "readRPM: czytanie %s: %s\n"
#: build/pack.c:314 build/pack.c:543
#: build/pack.c:346
#, c-format
-@@ -708,24 +698,20 @@
+@@ -708,24 +699,20 @@
msgstr "readRPM: czytanie nag³ówka z %s\n"
#: build/pack.c:485
#: build/pack.c:570
#, c-format
-@@ -733,44 +719,43 @@
+@@ -733,44 +720,43 @@
msgstr "Generowanie sygnatury: %d\n"
#: build/pack.c:588
#: build/pack.c:725 lib/psm.c:1725
#, c-format
-@@ -783,456 +768,445 @@
+@@ -783,456 +769,445 @@
msgstr "Nie mo¿na wygenerowaæ wyj¶ciowej nazwy dla pakietu %s: %s\n"
#: build/pack.c:815
#: build/poptBT.c:211
msgid "override build root"
-@@ -1244,52 +1218,47 @@
+@@ -1244,52 +1219,47 @@
#: build/poptBT.c:215 rpmdb/poptDB.c:28
msgid "generate headers compatible with rpm4 packaging"
#: build/poptBT.c:238
msgid "remove sources when done"
-@@ -1312,19 +1281,18 @@
+@@ -1312,19 +1282,18 @@
msgstr "wymu¶ platformê docelow±"
#: build/poptBT.c:248
#: build/spec.c:306
#, c-format
-@@ -1332,9 +1300,9 @@
+@@ -1332,9 +1301,9 @@
msgstr "linia %d: B³êdny numer %s: %s\n"
#: build/spec.c:642
#: build/spec.c:718
#, c-format
-@@ -1363,13 +1331,12 @@
+@@ -1363,13 +1332,12 @@
msgstr "Nieznany typ pliku"
#: lib/cpio.c:234
#: lib/cpio.c:236
msgid "Internal error"
-@@ -1377,59 +1344,55 @@
+@@ -1377,59 +1345,55 @@
#: lib/cpio.c:237
msgid "Archive file not in header"
#. T4. Scan for zeroes.
#: lib/depends.c:1296
-@@ -1437,25 +1400,27 @@
+@@ -1437,25 +1401,27 @@
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
+msgstr "rpmtsOrder nie powiod³o siê, zosta³o %d elementów\n"
#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
- #: rpmdb/header.c:3533 rpmdb/header.c:3562 rpmdb/header.c:3586
-@@ -1463,201 +1428,195 @@
+ #: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562
+@@ -1463,201 +1429,195 @@
msgstr "(nie jest liczb±)"
#: lib/formats.c:171
#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
#, c-format
-@@ -1665,128 +1624,120 @@
+@@ -1665,128 +1625,120 @@
msgstr "%s: Sygnatura nie jest dostêpna\n"
#: lib/package.c:852
#: lib/poptI.c:57
msgid "exclude paths must begin with a /"
-@@ -1794,7 +1745,7 @@
+@@ -1794,7 +1746,7 @@
#: lib/poptI.c:71
msgid "relocations must begin with a /"
#: lib/poptI.c:74
msgid "relocations must contain a ="
-@@ -1806,22 +1757,21 @@
+@@ -1806,22 +1758,21 @@
#: lib/poptI.c:92
msgid "rollback takes a time/date stamp argument"
#: lib/poptI.c:159
msgid ""
-@@ -1833,66 +1783,59 @@
+@@ -1833,66 +1784,59 @@
#: lib/poptI.c:164 tools/rpmgraph.c:273
msgid "use anaconda \"presentation order\""
#: lib/poptI.c:201
msgid "don't verify package architecture"
-@@ -1911,22 +1854,20 @@
+@@ -1911,22 +1855,20 @@
msgstr "zainstaluj dokumentacjê"
#: lib/poptI.c:212
#: lib/poptI.c:230
msgid "do not reorder package installation to satisfy dependencies"
-@@ -1934,52 +1875,51 @@
+@@ -1934,52 +1876,51 @@
#: lib/poptI.c:235
msgid "do not suggest missing dependency resolution(s)"
#: lib/poptI.c:277
msgid ""
-@@ -1999,21 +1939,19 @@
+@@ -1999,21 +1940,19 @@
#: lib/poptI.c:284
msgid "<dir>"
#: lib/poptI.c:293
msgid "install even if the package replaces installed files"
-@@ -2025,70 +1963,59 @@
+@@ -2025,70 +1964,59 @@
#: lib/poptI.c:298
msgid "deinstall new, reinstall old, package(s), back to <date>"
#: lib/poptQV.c:115
msgid "query a spec file"
-@@ -2096,32 +2023,27 @@
+@@ -2096,32 +2024,27 @@
#: lib/poptQV.c:115
msgid "<spec>"
#: lib/poptQV.c:226
msgid "list all configuration files"
-@@ -2133,7 +2055,7 @@
+@@ -2133,7 +2056,7 @@
#: lib/poptQV.c:230
msgid "dump basic file information"
#: lib/poptQV.c:234
msgid "list files in package"
-@@ -2142,196 +2064,179 @@
+@@ -2142,196 +2065,179 @@
#: lib/poptQV.c:239
#, c-format
msgid "skip %%ghost files"
#. @-boundswrite@
#: lib/query.c:165
-@@ -2356,7 +2261,7 @@
+@@ -2356,7 +2262,7 @@
#: lib/query.c:242
msgid "wrong color "
#: lib/query.c:245
msgid "(no state) "
-@@ -2368,14 +2273,12 @@
+@@ -2368,14 +2274,12 @@
msgstr "(nieznany %3d)"
#: lib/query.c:266
#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462
#: lib/rpminstall.c:593 lib/rpminstall.c:1015 lib/rpmts.c:471
-@@ -2394,19 +2297,18 @@
+@@ -2394,19 +2298,18 @@
msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n"
#: lib/query.c:488 lib/rpminstall.c:608
#: lib/query.c:561
#, c-format
-@@ -2419,14 +2321,14 @@
+@@ -2419,14 +2322,14 @@
msgstr "¿aden pakiet nie zahacza %s\n"
#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
#: lib/query.c:673
#, c-format
-@@ -2454,14 +2356,14 @@
+@@ -2454,14 +2357,14 @@
msgstr "b³êdny numer pakietu: %s\n"
#: lib/query.c:751
#: lib/query.c:766 lib/rpminstall.c:779
#, c-format
-@@ -2469,83 +2371,81 @@
+@@ -2469,83 +2372,81 @@
msgstr "pakiet %s nie jest zainstalowany\n"
#: lib/rpmal.c:692
#: lib/rpmchecksig.c:979
msgid "NOT OK"
-@@ -2572,13 +2472,12 @@
+@@ -2572,13 +2473,12 @@
msgstr "OK"
#: lib/rpmds.c:540 lib/rpmds.c:905
#: lib/rpmds.c:870
#, c-format
-@@ -2586,36 +2485,38 @@
+@@ -2586,36 +2486,38 @@
"The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
"\tA = \"%s\"\tB = \"%s\"\n"
msgstr ""
#: lib/rpmfi.c:804
#, c-format
-@@ -2623,41 +2524,38 @@
+@@ -2623,41 +2525,38 @@
msgstr "przesuwanie %s do %s\n"
#: lib/rpmfi.c:891
#: lib/rpminstall.c:409
#, c-format
-@@ -2694,7 +2592,7 @@
+@@ -2694,7 +2593,7 @@
#: lib/rpminstall.c:579
#, c-format
msgid "file %s requires a newer version of RPM\n"
#: lib/rpminstall.c:623
#, c-format
-@@ -2703,22 +2601,21 @@
+@@ -2703,22 +2602,21 @@
#: lib/rpminstall.c:637 lib/rpminstall.c:807 lib/rpminstall.c:1236
#: tools/rpmgraph.c:195
#: lib/rpminstall.c:782
#, c-format
-@@ -2726,9 +2623,9 @@
+@@ -2726,9 +2624,9 @@
msgstr "\"%s\" okre¶la wiele pakietów\n"
#: lib/rpminstall.c:853
#: lib/rpminstall.c:859
#, c-format
-@@ -2738,196 +2635,195 @@
+@@ -2738,196 +2636,195 @@
#: lib/rpminstall.c:1230
#, c-format
msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
#: lib/rpmrc.c:1527
#, c-format
-@@ -2936,127 +2832,125 @@
+@@ -2936,127 +2833,125 @@
#: lib/rpmrc.c:1528
msgid "Please contact rpm-list@redhat.com\n"
#: lib/signature.c:475
#, c-format
-@@ -3065,26 +2959,23 @@
+@@ -3065,26 +2960,23 @@
#. @=boundswrite@
#: lib/signature.c:493 lib/signature.c:608
#: lib/signature.c:590
#, c-format
-@@ -3094,65 +2985,61 @@
+@@ -3094,65 +2986,61 @@
#: lib/signature.c:613
#, c-format
msgid "Got %d bytes of GPG sig\n"
#: lib/transaction.c:105
#, c-format
-@@ -3161,9 +3048,9 @@
+@@ -3161,9 +3049,9 @@
#. @innercontinue@
#: lib/transaction.c:954
#. ===============================================
#. * For packages being installed:
-@@ -3176,7 +3063,7 @@
+@@ -3176,7 +3064,7 @@
#: lib/transaction.c:1067
#, c-format
msgid "sanity checking %d elements\n"
#. ===============================================
#. * Initialize transaction element file info for package:
-@@ -3189,107 +3076,107 @@
+@@ -3189,107 +3077,107 @@
#: lib/transaction.c:1155
#, c-format
msgid "computing %d file fingerprints\n"
-msgstr ""
+msgstr "%s ma zbyt du¿± lub zbyt ma³± warto¶æ ca³kowit±, pominiêto\n"
- #: rpmdb/header.c:2709
+ #: rpmdb/header.c:2685
msgid "missing { after %"
-@@ -3350,20 +3237,20 @@
+@@ -3350,20 +3238,20 @@
#. @=modobserver =observertrans@
- #: rpmdb/header.c:3061
+ #: rpmdb/header.c:3037
msgid "(index out of range)"
-msgstr ""
+msgstr "(indeks spoza zakresu)"
- #: rpmdb/header.c:3308
+ #: rpmdb/header.c:3284
msgid "array iterator used with different sized arrays"
-msgstr ""
+msgstr "iterator tablicy u¿yty na tablicach o ró¿nych rozmiarach"
- #: rpmdb/header.c:3624
+ #: rpmdb/header.c:3600
#, c-format
msgid "%c"
-msgstr ""
+msgstr "%c"
- #: rpmdb/header.c:3640
+ #: rpmdb/header.c:3616
msgid "%a %b %d %Y"
-msgstr ""
+msgstr "%a %d %b %Y"
#: rpmdb/header_internal.c:164
#, c-format
-@@ -3372,176 +3259,173 @@
+@@ -3372,176 +3260,173 @@
#: rpmdb/poptDB.c:18
msgid "initialize database"
msgid "failed to rebuild database: original database remains in place\n"
msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n"
-@@ -3550,14 +3434,14 @@
+@@ -3550,14 +3435,14 @@
msgstr "zamiana starej bazy na now± nie powiod³a siê!\n"
#: rpmdb/rpmdb.c:3780
#: rpmdb/rpmdb.c:3792
#, c-format
-@@ -3581,80 +3465,79 @@
+@@ -3581,80 +3466,79 @@
msgstr "%3d<%*s(pusty)\n"
#: rpmio/macro.c:655
#: rpmio/rpmio.c:632
msgid "Success"
-@@ -3665,9 +3548,8 @@
+@@ -3665,9 +3549,8 @@
msgstr "B³êdna odpowied¼ serwera"
#: rpmio/rpmio.c:638
#: rpmio/rpmio.c:641
msgid "Server timeout"
-@@ -3690,9 +3572,8 @@
+@@ -3690,9 +3573,8 @@
msgstr "Otwarcie transmisji danych z serwera nie powiod³o siê"
#: rpmio/rpmio.c:656
#: rpmio/rpmio.c:659
msgid "Error setting remote server to passive mode"
-@@ -3716,9 +3597,8 @@
+@@ -3716,9 +3598,8 @@
msgstr "logowanie do %s jako %s, has³o %s\n"
#: rpmio/rpmlog.c:59
#. !< RPMLOG_EMERG
#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
-@@ -3738,22 +3618,22 @@
+@@ -3738,22 +3619,22 @@
#: rpmio/rpmmalloc.c:15
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
#: rpmio/url.c:267
#, c-format
-@@ -3771,1809 +3651,161 @@
+@@ -3771,1809 +3652,161 @@
#. XXX Fstrerror
#: rpmio/url.c:543
---- 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,35 @@
+--- rpm-4.3/python/Makefile.am.wig 2003-06-11 02:09:53.000000000 +0200
++++ rpm-4.3/python/Makefile.am 2003-06-11 02:13:28.000000000 +0200
+@@ -29,47 +29,35 @@
rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h
mylibs= \
- $(top_builddir)/rpmdb/.libs/librpmdb.so \
- $(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 \
-+ -lbeecrypt \
-+ -lpopt \
++ $(top_builddir)/lib/librpm.la \
++ $(top_builddir)/rpmdb/librpmdb.la \
++ $(top_builddir)/rpmio/librpmio.la \
++ -lbeecrypt \
++ -lpopt \
@WITH_LIBELF_LIB@
LDADD =
+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_LDADD = @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_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
+-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
-
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
--
+
-rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
- $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_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
-
+-
# rpmmodule.c header-py.c \
# rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
+ # rpmrc-py.c rpmte-py.c rpmts-py.c
---- rpm-4.3/rpmio/Makefile.am.wiget Fri May 16 00:16:34 2003
-+++ rpm-4.3/rpmio/Makefile.am Fri May 16 00:18:17 2003
-@@ -70,34 +70,34 @@
+--- rpm-4.3/rpmio/Makefile.am.wiget 2003-06-11 02:05:34.000000000 +0200
++++ rpm-4.3/rpmio/Makefile.am 2003-06-11 02:05:34.000000000 +0200
+@@ -65,34 +65,34 @@
$(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
tdigest_SOURCES = tdigest.c
tsw_SOURCES = tsw.c
tsw_LDFLAGS = librpmio.la
---- rpm-4.3/rpmdb/Makefile.am.wiget Tue Mar 25 13:49:44 2003
-+++ rpm-4.3/rpmdb/Makefile.am Fri May 16 00:16:34 2003
+--- rpm-4.3/rpmdb/Makefile.am.wiget 2003-05-23 17:00:19.000000000 +0200
++++ rpm-4.3/rpmdb/Makefile.am 2003-06-11 02:05:34.000000000 +0200
@@ -49,7 +49,7 @@
tagname.c tagtbl.c
librpmdb_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
@WITH_LIBELF_LIB@ \
@libdb3@
librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
---- rpm-4.3/lib/Makefile.am.wiget Tue Apr 8 18:38:08 2003
-+++ rpm-4.3/lib/Makefile.am Fri May 16 00:16:34 2003
-@@ -39,7 +39,7 @@
+--- rpm-4.3/lib/Makefile.am.wiget 2003-05-23 16:59:36.000000000 +0200
++++ rpm-4.3/lib/Makefile.am 2003-06-11 02:05:34.000000000 +0200
+@@ -40,7 +40,7 @@
librpm_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la \
getdate.c: getdate.y
@echo expect 10 shift/reduce conflicts
---- rpm-4.3/tools/Makefile.am.wiget Thu Apr 17 18:45:19 2003
-+++ rpm-4.3/tools/Makefile.am Fri May 16 00:16:34 2003
-@@ -39,7 +39,7 @@
+--- rpm-4.3/tools/Makefile.am.wiget 2003-05-23 17:00:27.000000000 +0200
++++ rpm-4.3/tools/Makefile.am 2003-06-11 02:05:34.000000000 +0200
+@@ -40,7 +40,7 @@
debugedit_SOURCES = debugedit.c hashtab.c
debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \
javadeps_SOURCES = javadeps.c
---- rpm-4.3/configure.ac.wiget Fri May 16 00:16:34 2003
-+++ rpm-4.3/configure.ac Fri May 16 00:16:44 2003
-@@ -410,6 +410,17 @@
- ])
- AC_SUBST(WITH_LIBDWARF_INCLUDE)
+--- rpm-4.3/configure.ac.wiget 2003-06-11 02:05:34.000000000 +0200
++++ rpm-4.3/configure.ac 2003-06-11 02:05:34.000000000 +0200
+@@ -431,6 +431,17 @@
+ AC_SUBST(WITH_BEECRYPT_INCLUDE)
+ AC_SUBST(WITH_BEECRYPT_LIB)
+WITH_POPT_SUBDIR=
+WITH_POPT_LIB=
AC_CHECK_FUNC(setreuid, [], [
AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
])
-@@ -470,6 +481,7 @@
+@@ -491,6 +502,7 @@
dnl Check for Berkeley db3 API.
AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"],
AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"],
AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"],
AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"],
-@@ -478,6 +490,7 @@
+@@ -499,6 +511,7 @@
)
)
)
)
if test X"$DBLIBSRCS" = X; then
-@@ -1236,7 +1249,7 @@
+@@ -1257,7 +1270,7 @@
dnl # XXX Propagate -lucb to popt ...
dnl export LIBS INCPATH CONFIG_SITE
AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
scripts/perl.req scripts/perl.prov
-@@ -1260,7 +1273,7 @@
+@@ -1281,7 +1294,7 @@
python/rpmdb/test/Makefile
python/mpw/Makefile
python/mpw/test/Makefile
echo timestamp > beecrypt/stamp-h.in
echo timestamp > stamp-h.in
]
---- rpm-4.3/Makefile.am.wiget Mon May 5 10:44:39 2003
-+++ rpm-4.3/Makefile.am Fri May 16 00:16:34 2003
+--- rpm-4.3/Makefile.am.wiget 2003-05-23 16:57:23.000000000 +0200
++++ rpm-4.3/Makefile.am 2003-06-11 02:08:38.000000000 +0200
@@ -14,7 +14,7 @@
po/*.in po/*.po po/rpm.pot \
rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
--SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_POPT_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
+-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
++SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_FILE_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
INCLUDES = \
-I$(top_srcdir)/build \
---- rpm-4.3/rpmio/Makefile.am.bb Fri May 16 15:18:38 2003
-+++ rpm-4.3/rpmio/Makefile.am Fri May 16 15:19:21 2003
-@@ -32,11 +32,10 @@
- rpmio.c rpmlog.c rpmmalloc.c \
- rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c stubs.c url.c ugid.c
- librpmio_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
- $(top_builddir)/file/src/libfmagic.la \
-+ -lbeecrypt \
- @WITH_ZLIB_LIB@ \
- -lrt -lpthread
--librpmio_la_LIBADD = $(BEECRYPTLOBJS)
--librpmio_la_DEPENDENCIES = .created
-
- $(top_builddir)/beecrypt/listobjs:
- ${MAKE} -C $(top_builddir)/beecrypt listobjs
---- rpm-4.3/Makefile.am.bb Fri May 16 15:16:52 2003
-+++ rpm-4.3/Makefile.am Fri May 16 15:18:21 2003
-@@ -14,7 +14,7 @@
- po/*.in po/*.po po/rpm.pot \
- rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
-
--SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_POPT_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_POPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-
- INCLUDES = \
- -I$(top_srcdir)/build \
---- rpm-4.3/configure.ac.bb Fri May 16 15:17:00 2003
-+++ rpm-4.3/configure.ac Fri May 16 15:17:27 2003
-@@ -1252,8 +1252,8 @@
+--- rpm-4.3/configure.ac.wiget 2003-06-11 02:15:29.000000000 +0200
++++ rpm-4.3/configure.ac 2003-06-11 02:15:29.000000000 +0200
+@@ -1273,7 +1273,7 @@
dnl # XXX Propagate -lucb to popt ...
dnl export LIBS INCPATH CONFIG_SITE
-AC_CONFIG_SUBDIRS(beecrypt file)
+AC_CONFIG_SUBDIRS(file)
-
+
AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
scripts/perl.req scripts/perl.prov
- scripts/php.req scripts/php.prov
-@@ -1277,7 +1275,6 @@
+@@ -1298,7 +1298,6 @@
python/mpw/Makefile
python/mpw/test/Makefile
], [
projects / packages / rpm.git / commitdiff