testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=31

Browse Source
This commit is contained in:
OBS User unknown 2008-01-25 15:54:57 +00:00 committed by Git OBS Bridge
parent 2c9120d841
commit 067e8ebe8f
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.diff
View File

@ -297,23 +297,16 @@ Index: configure.ac
*) RPMCANONCOLOR=0; RPMCANONARCH=unknown ;; *) RPMCANONCOLOR=0; RPMCANONARCH=unknown ;;
esac esac
case "${build_os_noversion}" in case "${build_os_noversion}" in
@@ -1290,7 +1287,7 @@ mint) RPMCANONARCH=m68kmint ;; @@ -1290,7 +1287,8 @@ mint) RPMCANONARCH=m68kmint ;;
esac esac
RPMCANONVENDOR="$build_vendor" RPMCANONVENDOR="$build_vendor"
case "${build_vendor}" in case "${build_vendor}" in
-unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos) -unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos)
+unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos|suse) +unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos|suse)
+ RPMCANONVENDOR=suse
test -f /etc/redhat-release && RPMCANONVENDOR=redhat test -f /etc/redhat-release && RPMCANONVENDOR=redhat
test -f /etc/pld-release && RPMCANONVENDOR=pld test -f /etc/pld-release && RPMCANONVENDOR=pld
test -f /etc/mandrake-release && RPMCANONVENDOR=mandrake 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 @@ -1372,7 +1370,7 @@ dnl XXX this causes popt to depend on zl
dnl # XXX Propagate -lucb to popt ... dnl # XXX Propagate -lucb to popt ...
dnl export LIBS INCPATH CONFIG_SITE dnl export LIBS INCPATH CONFIG_SITE

2
rpm-python.spec
View File

@ -16,7 +16,7 @@ License: GPL v2 or later
Group: System/Packages Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2 Version: 4.4.2
Release: 196 Release: 199
Requires: rpm = %{version} Requires: rpm = %{version}
%py_requires %py_requires
Source99: rpm.spec Source99: rpm.spec

5
rpm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 21 12:27:18 CET 2008 - mls@suse.de
- change vendor detection so that it works in build service, too
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 19 17:14:55 CET 2008 - mls@suse.de Sat Jan 19 17:14:55 CET 2008 - mls@suse.de

8
rpm.spec
View File

@ -20,7 +20,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on AutoReqProv: on
Summary: The RPM Package Manager Summary: The RPM Package Manager
Version: 4.4.2 Version: 4.4.2
Release: 159 Release: 161
Source: rpm-%{version}.tar.bz2 Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2 Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2 Source2: RPM-Tips.html.tar.bz2
@ -345,7 +345,7 @@ Summary: A C library for parsing command line parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 387 Release: 389
# #
%description -n popt %description -n popt
@ -368,7 +368,7 @@ Summary: C Library for Parsing Command Line Parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 387 Release: 389
Requires: popt = 1.7 Requires: popt = 1.7
Requires: glibc-devel Requires: glibc-devel
@ -403,6 +403,8 @@ Authors:
%doc %{_mandir}/man3/popt.3* %doc %{_mandir}/man3/popt.3*
%changelog %changelog
* Mon Jan 21 2008 mls@suse.de
- change vendor detection so that it works in build service, too
* Sat Jan 19 2008 mls@suse.de * Sat Jan 19 2008 mls@suse.de
- update rpm-suse_macros so that the build service can build, too - update rpm-suse_macros so that the build service can build, too
* Thu Jan 17 2008 wberrier@suse.de * Thu Jan 17 2008 wberrier@suse.de