Hello community, here is the log from the commit of package rpm checked in at Thu Mar 22 11:05:34 CET 2007. -------- --- rpm/rpm.changes 2007-03-19 16:48:39.000000000 +0100 +++ rpm/rpm.changes 2007-03-22 10:48:22.000000000 +0100 @@ -0,0 +1,9 @@ +------------------------------------------------------------------ +Thu Mar 22 10:45:08 CET 2007 - dmueller@suse.de + +- remove strangely duplicated libpopt +- remove static popt and corresponding .la file to reduce + dependencies +- Fix various format string errors in german translation + which cause crashes + New: ---- po-file-fixes.diff popt-so-version.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.Pb9934/_old 2007-03-22 11:05:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Pb9934/_new 2007-03-22 11:05:09.000000000 +0100 @@ -16,7 +16,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 95 +Release: 96 Requires: rpm = %{version} %py_requires ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.Pb9934/_old 2007-03-22 11:05:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Pb9934/_new 2007-03-22 11:05:09.000000000 +0100 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 88 +Release: 89 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -116,6 +116,8 @@ Patch88: modalias-kernel_module.diff Patch89: querybuffer.diff Patch90: testmode.diff +Patch91: popt-so-version.diff +Patch92: po-file-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -185,7 +187,7 @@ %patch -P 60 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89 -%patch -P 90 +%patch -P 90 -P 91 -P 92 chmod 755 scripts/find-supplements{,.ksyms} chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms tar -xjvf %{SOURCE1} @@ -214,7 +216,6 @@ ./autogen.sh --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --libdir=/usr/lib --sysconfdir=/etc --localstatedir=/var --with-lua --without-selinux --enable-shared rm po/de.gmo make %{?jobs:-j%jobs} -(cd popt; gcc -shared .libs/popt.o .libs/findme.o .libs/poptparse.o .libs/poptconfig.o .libs/popthelp.o $RPM_OPT_FLAGS -Wl,-soname -Wl,libpopt.so.1 -o .libs/libpopt.so.1.0.0) %install rm -rf $RPM_BUILD_ROOT @@ -223,8 +224,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/locale ln -s ../share/locale $RPM_BUILD_ROOT/usr/lib/locale make DESTDIR="$RPM_BUILD_ROOT" install -cp popt/.libs/libpopt.so.1.0.0 $RPM_BUILD_ROOT/%{_libdir} -ln -sf libpopt.so.1.0.0 $RPM_BUILD_ROOT/%{_libdir}/libpopt.so.1 +rm -f $RPM_BUILD_ROOT/%_libdir/libpopt.a $RPM_BUILD_ROOT/%_libdir/libpopt.la mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/usr/sbin @@ -313,7 +313,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 316 +Release: 317 # %description -n popt @@ -336,7 +336,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 316 +Release: 317 Requires: popt = 1.7 Requires: glibc-devel @@ -368,12 +368,16 @@ %files -n popt-devel %defattr(644,root,root,755) /usr/include/popt.h - %{_libdir}/libpopt.a - %{_libdir}/libpopt.la %{_libdir}/libpopt.so %doc %{_mandir}/man3/popt.3* %changelog +* Thu Mar 22 2007 - dmueller@suse.de +- remove strangely duplicated libpopt +- remove static popt and corresponding .la file to reduce + dependencies +- Fix various format string errors in german translation + which cause crashes * Mon Mar 19 2007 - rguenther@suse.de - do not require build-key * Tue Mar 06 2007 - rguenther@suse.de ++++++ po-file-fixes.diff ++++++ --- po/de.po +++ po/de.po @@ -1568,7 +1568,7 @@ #: lib/fsm.c:1354 #, 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:1657 #, c-format @@ -2038,12 +2038,12 @@ #: lib/poptI.c:277 #, 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:280 #, 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:290 msgid "do not execute any scriptlet(s) triggered by this package" @@ -3302,7 +3302,7 @@ #: lib/signature.c:612 #, c-format msgid "gpg exec failed (%d)\n" -msgstr "GPG fehlgeschlagen\n" +msgstr "GPG fehlgeschlagen (%d)\n" #. GPG failed to write signature #. Just in case @@ -3592,12 +3592,12 @@ #: rpmdb/db3.c:189 #, 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 #, 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 #, c-format @@ -3812,7 +3812,7 @@ #: rpmdb/rpmdb.c:2696 #, 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 von %s\n" #: rpmdb/rpmdb.c:2811 #, c-format ++++++ popt-so-version.diff ++++++ --- popt/Makefile.am +++ popt/Makefile.am @@ -39,7 +39,7 @@ usrlib_LTLIBRARIES = libpopt.la libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c -libpopt_la_LDFLAGS = @INTLLIBS@ +libpopt_la_LDFLAGS = @INTLLIBS@ -version-info 8:0:7 man_MANS = popt.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org