SOURCES: rpm-doxygen_hack.patch, rpm-no-neon.patch, rpm-pld-autode...

qboosh qboosh at pld-linux.org
Mon Apr 17 19:29:38 CEST 2006


Author: qboosh                       Date: Mon Apr 17 17:29:38 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 4.4.6

---- Files affected:
SOURCES:
   rpm-doxygen_hack.patch (1.6 -> 1.7) , rpm-no-neon.patch (1.5 -> 1.6) , rpm-pld-autodep.patch (1.13 -> 1.14) , rpm-pl.po.patch (1.18 -> 1.19) , rpm-po.patch (1.14 -> 1.15) , rpm-system_libs.patch (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SOURCES/rpm-doxygen_hack.patch
diff -u SOURCES/rpm-doxygen_hack.patch:1.6 SOURCES/rpm-doxygen_hack.patch:1.7
--- SOURCES/rpm-doxygen_hack.patch:1.6	Tue Feb 28 23:02:55 2006
+++ SOURCES/rpm-doxygen_hack.patch	Mon Apr 17 19:29:33 2006
@@ -1,6 +1,6 @@
---- rpm-4.4.5/Doxyfile.in.orig	2006-02-21 01:03:02.000000000 +0100
-+++ rpm-4.4.5/Doxyfile.in	2006-02-28 21:50:15.890636250 +0100
-@@ -383,29 +383,7 @@
+--- rpm-4.4.6/Doxyfile.in.orig	2006-03-30 03:31:41.000000000 +0200
++++ rpm-4.4.6/Doxyfile.in	2006-04-17 18:04:54.724431250 +0200
+@@ -470,29 +470,7 @@
                           @top_srcdir@/rpmrc \
                           @top_srcdir@/rpm2cpio.c \
                           @top_srcdir@/system.h \
@@ -31,16 +31,21 @@
                           @top_srcdir@/doc/manual/builddependencies \
                           @top_srcdir@/doc/manual/buildroot \
                           @top_srcdir@/doc/manual/conditionalbuilds \
-@@ -420,194 +398,12 @@
+@@ -507,195 +485,12 @@
                           @top_srcdir@/doc/manual/spec \
                           @top_srcdir@/doc/manual/triggers \
                           @top_srcdir@/doc/manual/tsort \
 -                         @top_srcdir@/file/src/apprentice.c \
+-                         @top_srcdir@/file/src/apptype.c \
 -                         @top_srcdir@/file/src/ascmagic.c \
 -                         @top_srcdir@/file/src/compress.c \
 -                         @top_srcdir@/file/src/file.c \
 -                         @top_srcdir@/file/src/file.h \
 -                         @top_srcdir@/file/src/fsmagic.c \
+-                         @top_srcdir@/file/src/funcs.c \
+-                         @top_srcdir@/file/src/is_tar.c \
+-                         @top_srcdir@/file/src/magic.c \
+-                         @top_srcdir@/file/src/magic.h \
 -                         @top_srcdir@/file/src/names.h \
 -                         @top_srcdir@/file/src/print.c \
 -                         @top_srcdir@/file/src/readelf.c \
@@ -95,6 +100,8 @@
 -                         @top_srcdir@/lib/stringbuf.c \
 -                         @top_srcdir@/lib/stringbuf.h \
 -                         @top_srcdir@/lib/transaction.c \
+-                         @top_srcdir@/lib/tar.c \
+-                         @top_srcdir@/lib/tar.h \
 -                         @top_srcdir@/lib/verify.c \
 -			 @top_srcdir@/lua/lapi.c \
 -			 @top_srcdir@/lua/lapi.h \
@@ -183,14 +190,6 @@
 -                         @top_srcdir@/rpmio/ugid.c \
 -                         @top_srcdir@/rpmio/ugid.h \
 -                         @top_srcdir@/rpmio/url.c \
--                         @top_srcdir@/popt/findme.c \
--                         @top_srcdir@/popt/findme.h \
--                         @top_srcdir@/popt/popt.c \
--                         @top_srcdir@/popt/popt.h \
--                         @top_srcdir@/popt/poptconfig.c \
--                         @top_srcdir@/popt/popthelp.c \
--                         @top_srcdir@/popt/poptint.h \
--                         @top_srcdir@/popt/poptparse.c \
 -                         @top_srcdir@/python/header-py.c \
 -                         @top_srcdir@/python/header-py.h \
 -                         @top_srcdir@/python/rpmal-py.c \
@@ -208,6 +207,8 @@
 -                         @top_srcdir@/python/rpmmi-py.c \
 -                         @top_srcdir@/python/rpmmi-py.h \
 -                         @top_srcdir@/python/rpmmodule.c \
+-                         @top_srcdir@/python/rpmps-py.c \
+-                         @top_srcdir@/python/rpmps-py.h \
 -                         @top_srcdir@/python/rpmrc-py.c \
 -                         @top_srcdir@/python/rpmrc-py.h \
 -                         @top_srcdir@/python/rpmte-py.c \
@@ -232,9 +233,9 @@
  
  # If the value of the INPUT tag contains directories, you can use the 
  # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-@@ -616,8 +412,8 @@
- # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
- # *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
+@@ -704,8 +499,8 @@
+ # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+ # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
  
 -FILE_PATTERNS          = *.c \
 -                         *.h

================================================================
Index: SOURCES/rpm-no-neon.patch
diff -u SOURCES/rpm-no-neon.patch:1.5 SOURCES/rpm-no-neon.patch:1.6
--- SOURCES/rpm-no-neon.patch:1.5	Tue Feb 28 23:02:56 2006
+++ SOURCES/rpm-no-neon.patch	Mon Apr 17 19:29:33 2006
@@ -29,9 +29,9 @@
  AC_SUBST(WITH_NEON_SUBDIR)
  AC_SUBST(WITH_NEON_INCLUDE)
  AC_SUBST(WITH_NEON_LIB)
---- rpm-4.4.5/rpmio/rpmdav.c.orig	2006-02-22 00:58:54.000000000 +0100
-+++ rpm-4.4.5/rpmio/rpmdav.c	2006-02-28 22:00:44.929948750 +0100
-@@ -9,24 +9,6 @@
+--- rpm-4.4.6/rpmio/rpmdav.c.orig	2006-03-12 20:24:23.000000000 +0100
++++ rpm-4.4.6/rpmio/rpmdav.c	2006-04-17 18:20:07.597482250 +0200
+@@ -9,31 +9,6 @@
  #include <pthread.h>
  #endif
  
@@ -53,10 +53,17 @@
 -#include "ne_string.h"
 -#include "ne_utils.h"
 -
+-/* XXX API changes for neon-0.26.0 */
+-#if !defined(NE_FREE)
+-#define	ne_set_persist(_sess, _flag)
+-#define	ne_propfind_set_private(_pfh, _create_item, NULL) \
+-	ne_propfind_set_private(_pfh, _create_item, NULL, NULL)
+-#endif
+-
  #include <rpmio_internal.h>
  
  #define _RPMDAV_INTERNAL
-@@ -62,1326 +44,6 @@
+@@ -69,1332 +44,6 @@
  }
  
  /* =============================================================== */
@@ -404,8 +411,8 @@
 -static void *fetch_destroy_item(/*@only@*/ struct fetch_resource_s *res)
 -	/*@modifies res @*/
 -{
--    NE_FREE(res->uri);
--    NE_FREE(res->error_reason);
+-    ne_free(res->uri);
+-    ne_free(res->error_reason);
 -    res = _free(res);
 -    return NULL;
 -}
@@ -555,7 +562,7 @@
 -    }
 -}
 -
--static void fetch_results(void *userdata, const char *uri,
+-static void fetch_results(void *userdata, void *uarg,
 -		    const ne_prop_result_set *set)
 -	/*@*/
 -{
@@ -566,7 +573,13 @@
 -    const ne_status *status = NULL;
 -    const char * path = NULL;
 -
+-#if !defined(NE_FREE)
+-    const ne_uri * uri = uarg;
+-    (void) urlPath(uri->path, &path);
+-#else
+-    const char * uri = uarg;
 -    (void) urlPath(uri, &path);
+-#endif
 -    if (path == NULL)
 -	return;
 -
@@ -725,7 +738,7 @@
 -	xx = argvAdd(&ctx->av, val);
 -if (_dav_debug < 0)
 -fprintf(stderr, "*** argvAdd(%p,\"%s\")\n", &ctx->av, val);
--	NE_FREE(val);
+-	ne_free(val);
 -
 -	while (ctx->ac >= ctx->nalloced) {
 -	    if (ctx->nalloced <= 0)
@@ -1383,7 +1396,7 @@
  /*@unchecked@*/
  int avmagicdir = 0x3607113;
  
-@@ -1504,172 +166,3 @@
+@@ -1517,172 +166,3 @@
  /*@=kepttrans@*/
  }
  /*@=boundswrite@*/

================================================================
Index: SOURCES/rpm-pld-autodep.patch
diff -u SOURCES/rpm-pld-autodep.patch:1.13 SOURCES/rpm-pld-autodep.patch:1.14
--- SOURCES/rpm-pld-autodep.patch:1.13	Sat Nov 19 10:17:13 2005
+++ SOURCES/rpm-pld-autodep.patch	Mon Apr 17 19:29:33 2006
@@ -311,7 +311,7 @@
 +        }
 +        hdr=rpmdbNextIterator(it);
 +        assert(hdr!=NULL);
-+        r=rpmHeaderGetEntry(hdr,RPMTAG_NAME,NULL,(void **)&hname, NULL);
++        r=headerGetEntry(hdr,RPMTAG_NAME,NULL,(void **)&hname, NULL);
 +        assert(r<2);
 +        if (!strcmp(hname,N)) {
 +            rpmMessage(RPMMESS_DEBUG, _("%s -> %s (skipping)\n"),N,hname);

================================================================
Index: SOURCES/rpm-pl.po.patch
diff -u SOURCES/rpm-pl.po.patch:1.18 SOURCES/rpm-pl.po.patch:1.19
--- SOURCES/rpm-pl.po.patch:1.18	Sat Mar  4 16:38:35 2006
+++ SOURCES/rpm-pl.po.patch	Mon Apr 17 19:29:33 2006
@@ -1,105 +1,115 @@
---- rpm-4.4.5/po/pl.po.orig	2006-02-22 01:30:32.000000000 +0100
-+++ rpm-4.4.5/po/pl.po	2006-03-04 16:21:10.931303500 +0100
-@@ -4,15 +4,15 @@
- # get your own copy of PePeSza from http://www.ids.pl/~pkollegu/pepesza.html
- # Wojciech Drapiński <wojciech.drapinski at zie.pg.gda.pl>, 1999.
- # Paweł Dziekoński <pdziekonski at mml.ch.pwr.wroc.pl>, 1999
--# Jakub Bogusz <qboosh at pld-linux.org>, 2002-2005.
-+# Jakub Bogusz <qboosh at pld-linux.org>, 2002-2006.
- # Arkadiusz Miśkiewicz <arekm at pld-linux.org>, 2004.
+--- rpm-4.4.6/po/pl.po.orig	2006-04-08 22:45:18.000000000 +0200
++++ rpm-4.4.6/po/pl.po	2006-04-17 17:50:01.616615500 +0200
+@@ -9,10 +9,10 @@
  #
  msgid ""
  msgstr ""
--"Project-Id-Version: rpm 4.4.4\n"
-+"Project-Id-Version: rpm 4.4.5\n"
+-"Project-Id-Version: rpm 4.4.5\n"
++"Project-Id-Version: rpm 4.4.6\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-02-21 19:05-0500\n"
--"PO-Revision-Date: 2005-12-14 23:47+0100\n"
-+"PO-Revision-Date: 2006-02-28 20:20+0100\n"
+ "POT-Creation-Date: 2006-04-08 15:03-0400\n"
+-"PO-Revision-Date: 2006-02-28 20:20+0100\n"
++"PO-Revision-Date: 2006-04-17 17:43+0200\n"
  "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
  "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
  "MIME-Version: 1.0\n"
-@@ -2897,7 +2897,7 @@
+@@ -939,9 +939,9 @@
+ msgstr "BuildRoot nie może być \"/\": %s\n"
  
- #: lib/rpminstall.c:213
- msgid "Repackaging..."
--msgstr "Ponowne pakowywanie..."
-+msgstr "Ponowne pakowanie..."
- 
- #: lib/rpminstall.c:215
- msgid "Repackaging erased files..."
-@@ -3003,14 +3003,13 @@
- msgstr "Instalacja %s\n"
- 
- #: lib/rpminstall.c:1138
--#, fuzzy
- msgid "Missing repackaged package(s) detected:\n"
--msgstr "Czyszczenie przepakowanych pakietów:\n"
-+msgstr "Wykryto brakujące przepakowane pakiety:\n"
- 
- #: lib/rpminstall.c:1140
--#, fuzzy, c-format
-+#, c-format
- msgid "    %s[%d]: %s\n"
--msgstr "%s: %s\n"
-+msgstr "    %s[%d]: %s\n"
- 
- #: lib/rpminstall.c:1363
- #, c-format
-@@ -3079,14 +3078,14 @@
- msgstr "pakiet %s (nowszy niż %s) jest już zainstalowany"
- 
- #: lib/rpmps.c:243
--#, fuzzy, c-format
-+#, c-format
- msgid "installing package %s needs %lu%cB on the %s filesystem"
--msgstr "instalacja pakietu %s wymaga %ld%cB w systemie plików %s"
-+msgstr "instalacja pakietu %s wymaga %lu%cB w systemie plików %s"
- 
- #: lib/rpmps.c:253
+ #: build/parsePreamble.c:606
 -#, fuzzy, c-format
 +#, c-format
- msgid "installing package %s needs %lu inodes on the %s filesystem"
--msgstr "instalacja pakietu %s wymaga %ld i-węzłów w systemie plików %s"
-+msgstr "instalacja pakietu %s wymaga %lu i-węzłów w systemie plików %s"
+ msgid "line %d: Prefixes must begin with \"/\": %s\n"
+-msgstr "linia %d: Prefiksy nie mogą się kończyć na \"/\": %s\n"
++msgstr "linia %d: Prefiksy muszą zaczynać się od \"/\": %s\n"
  
- #: lib/rpmps.c:258
+ #: build/parsePreamble.c:614
  #, c-format
-@@ -3109,9 +3108,9 @@
- msgstr "%s jest w konflikcie z %s%s"
+@@ -954,9 +954,9 @@
+ msgstr "linia %d: Docdir musi się zaczynać od '/': %s\n"
  
- #: lib/rpmps.c:273
+ #: build/parsePreamble.c:640
 -#, fuzzy, c-format
 +#, c-format
- msgid "installing package %s on %s rdonly filesystem"
--msgstr "instalacja pakietu %s wymaga %ld%cB w systemie plików %s"
-+msgstr "instalacja pakietu %s w systemie plików %s tylko do odczytu"
+ msgid "line %d: %s takes an integer value: %s\n"
+-msgstr "linia %d: Etykieta przyjmuje tylko jeden znacznik: %s\n"
++msgstr "linia %d: %s przyjmuje wartość całkowitą: %s\n"
  
- #: lib/rpmps.c:278
+ #: build/parsePreamble.c:680 build/parsePreamble.c:691
  #, c-format
-@@ -3300,19 +3299,19 @@
- msgstr "    i        urz    bloków  bl.wolnych    i.wolnych punkt montowania\n"
+@@ -1376,9 +1376,8 @@
+ msgstr "Brakujące twarde dowiązania"
  
- #: lib/rpmts.c:1293
--#, fuzzy, c-format
-+#, c-format
- msgid "%5d 0x%08x %8u %12ld %12ld %s %s\n"
--msgstr "%5d 0x%08x %8u %12ld %12ld %s\n"
-+msgstr "%5d 0x%08x %8u %12ld %12ld %s %s\n"
+ #: lib/cpio.c:277
+-#, fuzzy
+ msgid "File digest mismatch"
+-msgstr "Błąd sumy MD5"
++msgstr "Niezgodność skrótu pliku"
+ 
+ #: lib/cpio.c:278
+ msgid "Internal error"
+@@ -1524,9 +1523,8 @@
+ msgstr "(błędny typ xml)"
  
- #: lib/signature.c:139
--#, fuzzy, c-format
-+#, c-format
- msgid "Expected size: %12lu = lead(%d)+sigs(%d)+pad(%d)+data(%lu)\n"
--msgstr "Oczekiwany rozmiar: %12d = nagł(%d)+sygn(%d)+wyrówn(%d)+dane(%d)\n"
-+msgstr "Oczekiwany rozmiar: %12lu = nagł(%d)+sygn(%d)+wyrówn(%d)+dane(%lu)\n"
+ #: lib/formats.c:578
+-#, fuzzy
+ msgid "(invalid yaml type)"
+-msgstr "(błędny typ xml)"
++msgstr "(błędny typ yaml)"
+ 
+ #: lib/formats.c:687
+ msgid "(not an OpenPGP signature)"
+@@ -2059,9 +2057,8 @@
  
- #: lib/signature.c:144
--#, fuzzy, c-format
-+#, c-format
- msgid "  Actual size: %12lu\n"
--msgstr "  Faktyczny rozmiar: %12d\n"
-+msgstr "  Faktyczny rozmiar: %12lu\n"
+ #: lib/poptI.c:317 lib/poptI.c:319 lib/poptQV.c:354 lib/poptQV.c:357
+ #: lib/poptQV.c:359
+-#, fuzzy
+ msgid "don't verify file digests"
+-msgstr "nie sprawdzaj skrótów pakietu"
++msgstr "nie sprawdzaj skrótów plików"
+ 
+ #: lib/poptI.c:321
+ msgid "don't install file security contexts"
+@@ -2260,9 +2257,8 @@
+ msgstr "odpytaj/sprawdź pakiet(y) wymagające zasobu"
  
- #: lib/signature.c:187
- #, c-format
+ #: lib/poptQV.c:147
+-#, fuzzy
+ msgid "query/verify the package(s) which require any contained provide"
+-msgstr "odpytaj/sprawdź pakiet(y) wymagające zasobu"
++msgstr "odpytaj/sprawdź pakiet(y) wymagające dowolnej zawartej własności"
+ 
+ #: lib/poptQV.c:151
+ msgid "query/verify the package(s) which provide a dependency"
+@@ -4508,19 +4504,16 @@
+ msgid "DIRECTORY"
+ msgstr "KATALOG"
+ 
+-#~ msgid "line %d: Epoch/Serial field must be a number: %s\n"
+-#~ msgstr "linia %d: pole Epoch/Serial musi być liczbą: %s\n"
+-
+-#~ msgid "generate headers compatible with rpm4 packaging"
+-#~ msgstr "generuj nagłówki kompatybilne z pakietami rpm4"
+-
+-#~ msgid ""
+-#~ "generate package header(s) compatible with (legacy) rpm[23] packaging"
+-#~ msgstr ""
+-#~ "generuj nagłówki pakietu kompatybilne z (wymierającymi) pakietami rpm[23]"
+-
+-#~ msgid "generate headers compatible with (legacy) rpm[23] packaging"
+-#~ msgstr "generuj nagłówki kompatybilne z (wymierającymi) pakietami rpm[23]"
++# --- from popt/po/pl.po (in popt.h, not in .pot) ---
++msgid "Options implemented via popt alias/exec:"
++msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
++
++msgid "Help options:"
++msgstr "Opcje pomocy:"
++
++# --- from popt (displayed using rpm domain)
++msgid "Show this help message"
++msgstr "Pokaż tę pomoc"
+ 
+-#~ msgid "don't verify MD5 digest of files"
+-#~ msgstr "nie sprawdzaj skrótów MD5 plików"
++msgid "Display brief usage message"
++msgstr "Wyświetl skrócony sposób użycia"

================================================================
Index: SOURCES/rpm-po.patch
diff -u SOURCES/rpm-po.patch:1.14 SOURCES/rpm-po.patch:1.15
--- SOURCES/rpm-po.patch:1.14	Thu Dec 15 00:02:10 2005
+++ SOURCES/rpm-po.patch	Mon Apr 17 19:29:33 2006
@@ -9,34 +9,34 @@
  
  dnl Checks for programs.
  AC_PROG_CXX
---- rpm-4.4.4/po/de.po.orig	2005-12-13 13:22:59.000000000 +0100
-+++ rpm-4.4.4/po/de.po	2005-12-15 00:04:09.888163608 +0100
-@@ -1606,7 +1606,7 @@
- #: lib/fsm.c:1391
+--- rpm-4.4.6/po/de.po.orig	2006-04-08 22:45:17.000000000 +0200
++++ rpm-4.4.6/po/de.po	2006-04-17 18:01:32.139770500 +0200
+@@ -1607,7 +1607,7 @@
+ #: lib/fsm.c:1407
  #, c-format
  msgid "%s directory created with perms %04o, context %s.\n"
 -msgstr "Verzeichnis %s mit Berechtigungen %04o erstellt, Kontext.\n"
 +msgstr "Verzeichnis %s mit Berechtigungen %04o erstellt, Kontext %s.\n"
  
- #: lib/fsm.c:1697
+ #: lib/fsm.c:1713
  #, c-format
-@@ -2106,12 +2106,12 @@
- #: lib/poptI.c:341
+@@ -2108,12 +2108,12 @@
+ #: lib/poptI.c:343
  #, c-format
  msgid "do not execute %%preun scriptlet (if any)"
 -msgstr "%preun-Skriptlet nicht ausfĂźhren (wenn vorhanden)"
 +msgstr "%%preun-Skriptlet nicht ausfĂźhren (wenn vorhanden)"
  
- #: lib/poptI.c:344
+ #: lib/poptI.c:346
  #, c-format
  msgid "do not execute %%postun scriptlet (if any)"
 -msgstr "%postun-Skriptlet nicht ausfĂźhren (wenn vorhanden)"
 +msgstr "%%postun-Skriptlet nicht ausfĂźhren (wenn vorhanden)"
  
- #: lib/poptI.c:354
+ #: lib/poptI.c:356
  msgid "do not execute any scriptlet(s) triggered by this package"
-@@ -2797,8 +2797,7 @@
- #: lib/rpmds.c:1427
+@@ -2804,8 +2804,7 @@
+ #: lib/rpmds.c:1509
  #, c-format
  msgid "%s:%d \"%s\" must begin with alphanumeric, '_', '/' or '%%'.\n"
 -msgstr ""
@@ -44,8 +44,8 @@
 +msgstr "%s:%d \"%s\" muss alphanumerisch, mit '_', '/' oder '%%' beginnen.\n"
  
  #. XXX No comparison operator found.
- #: lib/rpmds.c:1461
-@@ -2822,7 +2821,9 @@
+ #: lib/rpmds.c:1543
+@@ -2829,7 +2828,9 @@
  msgid ""
  "\tline %d: \"%s\" must begin with alphanumeric, '_', '/' or '%%'. "
  "Skipping ...\n"
@@ -55,8 +55,8 @@
 +"Ăœberspringe...\n"
  
  #. XXX No comparison operator found.
- #: lib/rpmds.c:3027
-@@ -3416,7 +3417,7 @@
+ #: lib/rpmds.c:3176
+@@ -3438,7 +3439,7 @@
  #: lib/signature.c:614
  #, c-format
  msgid "gpg exec failed (%d)\n"
@@ -65,29 +65,29 @@
  
  #. GPG failed to write signature
  #. Just in case
-@@ -3750,12 +3751,12 @@
- #: rpmdb/db3.c:189
+@@ -3771,12 +3772,12 @@
+ #: rpmdb/db3.c:190
  #, c-format
  msgid "closed   db environment %s/%s\n"
 -msgstr "Closed   DB-Umgebung    %s/%s %s\n"
 +msgstr "Closed   DB-Umgebung    %s/%s\n"
  
- #: rpmdb/db3.c:207
+ #: rpmdb/db3.c:208
  #, c-format
  msgid "removed  db environment %s/%s\n"
 -msgstr "Removed  DB-Umgebung    %s/%s %s\n"
 +msgstr "Removed  DB-Umgebung    %s/%s\n"
  
- #: rpmdb/db3.c:298
+ #: rpmdb/db3.c:299
  #, c-format
-@@ -3974,7 +3975,7 @@
- #: rpmdb/rpmdb.c:2716
+@@ -3990,7 +3991,7 @@
+ #: rpmdb/rpmdb.c:2735
  #, c-format
  msgid "error(%d) setting header #%d record for %s removal\n"
 -msgstr "Fehler(%d) beim Markieren des Header-Eintrags #%d zur Entfernung\n"
 +msgstr "Fehler(%d) beim Markieren des Header-Eintrags #%d zur Entfernung %s\n"
  
- #: rpmdb/rpmdb.c:2824
+ #: rpmdb/rpmdb.c:2843
  #, c-format
 --- rpm-4.4.3/po/id.po.orig	2005-11-19 08:59:12.402832000 +0100
 +++ rpm-4.4.3/po/id.po	2005-11-19 09:14:05.194107648 +0100

================================================================
Index: SOURCES/rpm-system_libs.patch
diff -u SOURCES/rpm-system_libs.patch:1.16 SOURCES/rpm-system_libs.patch:1.17
--- SOURCES/rpm-system_libs.patch:1.16	Sat Jul 23 13:32:30 2005
+++ SOURCES/rpm-system_libs.patch	Mon Apr 17 19:29:33 2006
@@ -19,28 +19,6 @@
  	echo timestamp > stamp-h.in
    
  ]],[[]])
---- rpm-4.4.2/lib/Makefile.am.orig	2005-02-17 01:14:40.000000000 +0100
-+++ rpm-4.4.2/lib/Makefile.am	2005-07-23 13:32:57.886832096 +0200
-@@ -98,7 +98,7 @@
- 	$(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \
- 	-lselinux \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la
-+	-lpopt
- 	
- #tds: tds.c librpm.la
- #	$(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs)
-@@ -109,8 +109,8 @@
- tthread: tthread.o librpm.la
- 	$(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) @WITH_LIBELF_LIB@
- 
--tsystem: tsystem.o $(top_builddir)/popt/libpopt.la
--	$(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+tsystem: tsystem.o
-+	$(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la -lpopt
- 
- tre: tre.o librpm.la
- 	$(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \
 diff -urN rpm.org/Makefile.am rpm/Makefile.am
 --- rpm.org/Makefile.am	2004-06-14 11:46:04.409975928 +0200
 +++ rpm/Makefile.am	2004-06-14 11:48:04.236759488 +0200
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-doxygen_hack.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-no-neon.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-pld-autodep.patch?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-pl.po.patch?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-po.patch?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-system_libs.patch?r1=1.16&r2=1.17&f=u



More information about the pld-cvs-commit mailing list