OBS User unknown 2008-02-25 16:02:20 +00:00 committed by Git OBS Bridge
parent 0995c2ab10
commit cd53d6acdb
4 changed files with 29 additions and 5 deletions

14
noautoreloc.diff Normal file
View File

@ -0,0 +1,14 @@
--- ./configure.ac.orig 2008-02-21 20:47:51.000000000 +0000
+++ ./configure.ac 2008-02-21 20:51:38.000000000 +0000
@@ -1300,6 +1300,11 @@ unknown|pc|ibm|redhat|pld|mandrake|conec
test -f /etc/caos-release && RPMCANONVENDOR=caos
;;
esac
+if test "$RPMCANONVENDOR" = suse ; then
+ RPMCANONCOLOR=0
+ autorelocate_path='%{nil}'
+ autorelocate_dcolor='0'
+fi
RPMCANONOS="$build_os_noversion"
AC_SUBST(RPMCANONCOLOR)
AC_SUBST(autorelocate_path)

View File

@ -10,13 +10,14 @@
# norootforbuild
Name: rpm-python
BuildRequires: libbz2-devel ncurses-devel python-devel zlib-devel
License: GPL v2 or later
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2
Release: 203
Release: 212
Requires: rpm = %{version}
%py_requires
Source99: rpm.spec

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 21 21:58:39 CET 2008 - mls@suse.de
- do not configure autoreloc or colors
-------------------------------------------------------------------
Thu Jan 31 15:12:55 CET 2008 - ro@suse.de

View File

@ -10,6 +10,7 @@
# norootforbuild
Name: rpm
License: GPL v2 or later
Group: System/Packages
@ -20,7 +21,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on
Summary: The RPM Package Manager
Version: 4.4.2
Release: 165
Release: 170
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
@ -128,6 +129,7 @@ Patch99: rpm-debugedit-shared.diff
Patch100: rpm-gcc43.diff
Patch101: lzma.diff
Patch102: rpm-shorten-changelog.diff
Patch103: noautoreloc.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@ -198,7 +200,7 @@ rm -f rpmdb/db.h
%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 -P 91 -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 -P 99
%patch -P 100 -P 101 -P 102
%patch -P 100 -P 101 -P 102 -P 103
chmod 755 scripts/find-supplements{,.ksyms}
chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
tar -xjvf %{SOURCE1}
@ -345,7 +347,7 @@ Summary: A C library for parsing command line parameters
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
Release: 393
Release: 398
#
%description -n popt
@ -368,7 +370,7 @@ Summary: C Library for Parsing Command Line Parameters
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
Release: 393
Release: 398
Requires: popt = 1.7
Requires: glibc-devel
@ -403,6 +405,8 @@ Authors:
%doc %{_mandir}/man3/popt.3*
%changelog
* Thu Feb 21 2008 mls@suse.de
- do not configure autoreloc or colors
* Thu Jan 31 2008 ro@suse.de
- brp-symlink: whitelist /opt/kde3/share/doc*/HTML/*/common
* Mon Jan 28 2008 ro@suse.de