Mailinglist Archive: opensuse-commit (1059 mails)
| < Previous | Next > |
commit rpm
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 25 Jan 2008 16:54:55 +0100
- Message-id: <20080125155456.2C38E678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package rpm
checked in at Fri Jan 25 16:54:55 CET 2008.
--------
--- rpm/rpm.changes 2008-01-19 17:15:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2008-01-21
13:39:03.283562000 +0100
@@ -1,0 +2,5 @@
+Mon Jan 21 12:27:18 CET 2008 - mls@xxxxxxx
+
+- change vendor detection so that it works in build service, too
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm-python.spec ++++++
--- /var/tmp/diff_new_pack.s22382/_old 2008-01-25 16:54:40.000000000 +0100
+++ /var/tmp/diff_new_pack.s22382/_new 2008-01-25 16:54:40.000000000 +0100
@@ -16,7 +16,7 @@
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2
-Release: 196
+Release: 199
Requires: rpm = %{version}
%py_requires
Source99: rpm.spec
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.s22382/_old 2008-01-25 16:54:40.000000000 +0100
+++ /var/tmp/diff_new_pack.s22382/_new 2008-01-25 16:54:40.000000000 +0100
@@ -20,7 +20,7 @@
AutoReqProv: on
Summary: The RPM Package Manager
Version: 4.4.2
-Release: 159
+Release: 161
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
@@ -345,7 +345,7 @@
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
-Release: 387
+Release: 389
#
%description -n popt
@@ -368,7 +368,7 @@
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
-Release: 387
+Release: 389
Requires: popt = 1.7
Requires: glibc-devel
@@ -403,6 +403,8 @@
%doc %{_mandir}/man3/popt.3*
%changelog
+* Mon Jan 21 2008 mls@xxxxxxx
+- change vendor detection so that it works in build service, too
* Sat Jan 19 2008 mls@xxxxxxx
- update rpm-suse_macros so that the build service can build, too
* Thu Jan 17 2008 wberrier@xxxxxxx
++++++ build.diff ++++++
--- /var/tmp/diff_new_pack.s22382/_old 2008-01-25 16:54:40.000000000 +0100
+++ /var/tmp/diff_new_pack.s22382/_new 2008-01-25 16:54:40.000000000 +0100
@@ -297,23 +297,16 @@
*) RPMCANONCOLOR=0; RPMCANONARCH=unknown ;;
esac
case "${build_os_noversion}" in
-@@ -1290,7 +1287,7 @@ mint) RPMCANONARCH=m68kmint ;;
+@@ -1290,7 +1287,8 @@ mint) RPMCANONARCH=m68kmint ;;
esac
RPMCANONVENDOR="$build_vendor"
case "${build_vendor}" in
-unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos)
+unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos|suse)
++ RPMCANONVENDOR=suse
test -f /etc/redhat-release && RPMCANONVENDOR=redhat
test -f /etc/pld-release && RPMCANONVENDOR=pld
test -f /etc/mandrake-release && RPMCANONVENDOR=mandrake
-@@ -1298,6 +1295,7 @@ unknown|pc|ibm|redhat|pld|mandrake|conec
- test -f /etc/lvr-release && RPMCANONVENDOR=lvr
- test -f /etc/yellowdog-release && RPMCANONVENDOR=yellowdog
- test -f /etc/caos-release && RPMCANONVENDOR=caos
-+ test -f /etc/SuSE-release -o -f /.buildenv && RPMCANONVENDOR=suse
- ;;
- esac
- RPMCANONOS="$build_os_noversion"
@@ -1372,7 +1370,7 @@ dnl XXX this causes popt to depend on zl
dnl # XXX Propagate -lucb to popt ...
dnl export LIBS INCPATH CONFIG_SITE
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |