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

- build against db 4.7.x

Browse Source
This commit is contained in:
Panu Matilainen 2009-02-09 09:59:15 +00:00
parent cef0937683
commit 61eecfc649
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rpm.spec
View File

@ -12,12 +12,13 @@
%define rpmver 4.6.0 %define rpmver 4.6.0
%define srcver %{rpmver} %define srcver %{rpmver}
%define bdbver 4.5.20 %define bdbver 4.7.25
%define dbprefix db
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: 1%{?dist} Release: 2%{?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
@ -46,8 +47,8 @@ License: GPLv2+
Requires(post): coreutils Requires(post): coreutils
%if %{without int_bdb} %if %{without int_bdb}
# normally db4-utils = %{bdbver} for the rpmdb_foo symlinks # db recovery tools, rpmdb_util symlinks
Requires: compat-db45 Requires: db4-utils = %{bdbver}
%endif %endif
Requires: popt >= 1.10.2.1 Requires: popt >= 1.10.2.1
Requires: crontabs Requires: crontabs
@ -55,9 +56,7 @@ Requires: logrotate
Requires: curl Requires: curl
%if %{without int_bdb} %if %{without int_bdb}
# XXX using BDB 4.5.20 from compat-db45 for now to provide a safe downgrade BuildRequires: db4-devel = %{bdbver}
# route to older rpm.
BuildRequires: compat-db45
%endif %endif
# XXX generally assumed to be installed but make it explicit as rpm # XXX generally assumed to be installed but make it explicit as rpm
@ -182,8 +181,8 @@ ln -s db-%{bdbver} db
%build %build
%if %{without int_bdb} %if %{without int_bdb}
CPPFLAGS=-I%{_includedir}/db%{bdbver} #CPPFLAGS=-I%{_includedir}/db%{bdbver}
LDFLAGS=-L%{_libdir}/db%{bdbver} #LDFLAGS=-L%{_libdir}/db%{bdbver}
%endif %endif
CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`" CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
CFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS"
@ -234,14 +233,13 @@ done
# plant links to db utils as rpmdb_foo so existing documantion is usable # plant links to db utils as rpmdb_foo so existing documantion is usable
%if %{without int_bdb} %if %{without int_bdb}
dbprefix=db45
for dbutil in \ for dbutil in \
archive deadlock dump load printlog \ archive deadlock dump load printlog \
recover stat upgrade verify recover stat upgrade verify
do do
ln -s ../../bin/${dbprefix}_${dbutil} $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_${dbutil} ln -s ../../bin/%{dbprefix}_${dbutil} $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_${dbutil}
done done
ln -s ../../bin/berkeley_${dbprefix}_svc $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_svc ln -s ../../bin/berkeley_%{dbprefix}_svc $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_svc
%endif %endif
%find_lang %{name} %find_lang %{name}
@ -375,6 +373,9 @@ exit 0
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Mon Feb 09 2009 Panu Matilainen <pmatilai@redhat.com> - 4.6.0-2
- build against db 4.7.x
* Fri Feb 06 2009 Panu Matilainen <pmatilai@redhat.com> - 4.6.0-1 * Fri Feb 06 2009 Panu Matilainen <pmatilai@redhat.com> - 4.6.0-1
- update to 4.6.0 final - update to 4.6.0 final
- revert libmagic looking into compressed files for now, breaks ooffice build - revert libmagic looking into compressed files for now, breaks ooffice build