rpms/rpm
5
0
Fork 0
Code Issues Pull Requests Releases Activity

rebuild against new libdb

Browse Source
This commit is contained in:
Jindrich Novy 2012-04-04 14:52:14 +02:00
parent 16864eefd3
commit 871a7817ae
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpm.spec
View File

@ -1,7 +1,7 @@
# build against xz? # build against xz?
%bcond_without xz %bcond_without xz
# just for giggles, option to build with internal Berkeley DB # just for giggles, option to build with internal Berkeley DB
%bcond_without int_bdb %bcond_with int_bdb
# run internal testsuite? # run internal testsuite?
%bcond_without check %bcond_without check
# disable plugins initially # disable plugins initially
@ -22,12 +22,14 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}11%{?dist} Release: %{?snapver:0.%{snapver}.}12%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
%if %{with int_bdb} %if %{with int_bdb}
Source1: db-%{bdbver}.tar.gz Source1: db-%{bdbver}.tar.gz
%else
BuildRequires: libdb-devel
%endif %endif
Source10: libsymlink.attr Source10: libsymlink.attr
@ -89,9 +91,6 @@ BuildRequires: elfutils-libelf-devel%{_isa}
BuildRequires: readline-devel%{_isa} zlib-devel%{_isa} BuildRequires: readline-devel%{_isa} zlib-devel%{_isa}
BuildRequires: nss-devel%{_isa} BuildRequires: nss-devel%{_isa}
BuildRequires: nss-softokn-freebl-devel%{_isa} BuildRequires: nss-softokn-freebl-devel%{_isa}
BuildRequires: libtool%{_isa}
BuildRequires: autoconf
BuildRequires: automake
# The popt version here just documents an older known-good version # The popt version here just documents an older known-good version
BuildRequires: popt-devel%{_isa} >= 1.10.2 BuildRequires: popt-devel%{_isa} >= 1.10.2
BuildRequires: file-devel%{_isa} BuildRequires: file-devel%{_isa}
@ -256,11 +255,6 @@ CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
CFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS"
export CPPFLAGS CFLAGS LDFLAGS export CPPFLAGS CFLAGS LDFLAGS
libtoolize
aclocal
autoconf
automake
# Using configure macro has some unwanted side-effects on rpm platform # Using configure macro has some unwanted side-effects on rpm platform
# setup, use the old-fashioned way for now only defining minimal paths. # setup, use the old-fashioned way for now only defining minimal paths.
./configure \ ./configure \
@ -461,6 +455,9 @@ exit 0
%doc COPYING doc/librpm/html/* %doc COPYING doc/librpm/html/*
%changelog %changelog
* Wed Apr 04 2012 Jindrich Novy <jnovy@redhat.com> - 4.9.90-0.git11505.12
- rebuild against new libdb
* Tue Apr 03 2012 Jindrich Novy <jnovy@redhat.com> - 4.9.90-0.git11505.11 * Tue Apr 03 2012 Jindrich Novy <jnovy@redhat.com> - 4.9.90-0.git11505.11
- build with internal libdb to allow libdb build with higher soname - build with internal libdb to allow libdb build with higher soname

1
sources
View File

@ -1,2 +1 @@
9206167147441cda84a56c338de9ebaa rpm-4.9.90.git11505.tar.bz2 9206167147441cda84a56c338de9ebaa rpm-4.9.90.git11505.tar.bz2
5493fb5f7cc3915887c836b096f18773 db-5.3.15.tar.gz