Hello community, here is the log from the commit of package rpm checked in at Thu May 31 21:11:56 CEST 2007. -------- --- rpm/rpm.changes 2007-05-25 16:40:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2007-05-27 16:43:42.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 27 16:43:25 CEST 2007 - schwab@suse.de + +- Remove duplicate rpmpopt alias. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.l21162/_old 2007-05-31 21:11:21.000000000 +0200 +++ /var/tmp/diff_new_pack.l21162/_new 2007-05-31 21:11:21.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 122 +Release: 126 Requires: rpm = %{version} %py_requires ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.l21162/_old 2007-05-31 21:11:21.000000000 +0200 +++ /var/tmp/diff_new_pack.l21162/_new 2007-05-31 21:11:21.000000000 +0200 @@ -20,7 +20,7 @@ Autoreqprov: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 110 +Release: 112 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -325,7 +325,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 338 +Release: 340 # %description -n popt @@ -348,7 +348,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 338 +Release: 340 Requires: popt = 1.7 Requires: glibc-devel @@ -384,6 +384,8 @@ %doc %{_mandir}/man3/popt.3* %changelog +* Sun May 27 2007 - schwab@suse.de +- Remove duplicate rpmpopt alias. * Fri May 25 2007 - mls@suse.de - fix patch-rpm query - do not link convertdb1 statically [#274694] ++++++ rpmpopt.diff ++++++ --- /var/tmp/diff_new_pack.l21162/_old 2007-05-31 21:11:22.000000000 +0200 +++ /var/tmp/diff_new_pack.l21162/_new 2007-05-31 21:11:22.000000000 +0200 @@ -1,7 +1,11 @@ +--- + rpmpopt.in | 47 ++++++++++++++++++++++------------------------- + 1 file changed, 22 insertions(+), 25 deletions(-) + Index: rpmpopt.in =================================================================== ---- rpmpopt.in.orig -+++ rpmpopt.in +--- rpmpopt.in.orig 2007-05-27 16:41:29.000000000 +0200 ++++ rpmpopt.in 2007-05-27 16:42:42.000000000 +0200 @@ -86,7 +86,8 @@ Signature : %|DSAHEADER?{%{DSAHEADER:p %|PACKAGER?{Packager : %{PACKAGER}\n}|\ %|URL?{URL : %{URL}\n}|\ @@ -12,23 +16,20 @@ --POPTdesc=$"list descriptive information from package(s)" rpm alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]' \ -@@ -129,11 +130,11 @@ rpm alias --fileprovide --qf '[%{FILENAM +@@ -129,12 +130,6 @@ rpm alias --fileprovide --qf '[%{FILENAM rpm alias --filerequire --qf '[%{FILENAMES}\t%{FILEREQUIRE}\n]' \ --POPTdesc=$"list file names with requires" -rpm alias --redhatprovides -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatprovides \ - --POPTdesc=$"find package name that contains a provided capability (needs rpmdb-redhat package installed)" -+rpm alias --fileclass --qf '[%{FILENAMES}\t%{FILECLASS}\n]' \ -+ --POPTdesc=$"list file names with classes" - +- -rpm alias --redhatrequires -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatrequires \ - --POPTdesc=$"find package name that contains a required capability (needs rpmdb-redhat package installed)" -+rpm alias --filecolor --qf '[%{FILENAMES}\t%{FILECOLORS}\n]' \ -+ --POPTdesc=$"list file names with colors" - +- # colon separated i18n domains to use as PO catalogue lookaside for * retrieving header group/description/summary. -@@ -201,22 +202,22 @@ rpm alias --timecheck --define '_timeche + # +@@ -201,22 +196,22 @@ rpm alias --timecheck --define '_timeche #rpm exec --target rpmb --target #rpm exec --short-circuit rpmb --short-circuit @@ -67,7 +68,7 @@ #rpm exec -i rpmi -i #rpm exec --install rpmi --install -@@ -382,7 +383,8 @@ Signature : %|DSAHEADER?{%{DSAHEADER:p +@@ -382,7 +377,8 @@ Signature : %|DSAHEADER?{%{DSAHEADER:p %|PACKAGER?{Packager : %{PACKAGER}\n}|\ %|URL?{URL : %{URL}\n}|\ Summary : %{SUMMARY}\n\ @@ -77,7 +78,7 @@ --POPTdesc=$"list descriptive information from package(s)" rpmq alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]' \ -@@ -495,7 +497,8 @@ Size : %-27{SIZE}%|LICENSE?{ +@@ -495,7 +491,8 @@ Size : %-27{SIZE}%|LICENSE?{ %|PACKAGER?{Packager : %{PACKAGER}\n}|\ %|URL?{URL : %{URL}\n}|\ Summary : %{SUMMARY}\n\ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de