rpms/rpm/devel rpm.spec,1.324,1.325
Panu Matilainen
pmatilai at fedoraproject.org
Mon Feb 9 09:59:46 UTC 2009
- Previous message (by thread): rpms/bluez/devel .cvsignore, 1.23, 1.24 bluez.spec, 1.33, 1.34 sources, 1.23, 1.24
- Next message (by thread): rpms/alleyoop/devel .cvsignore, 1.2, 1.3 alleyoop.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pmatilai
Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14644
Modified Files:
rpm.spec
Log Message:
- build against db 4.7.x
Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- rpm.spec 6 Feb 2009 13:55:13 -0000 1.324
+++ rpm.spec 9 Feb 2009 09:59:15 -0000 1.325
@@ -12,12 +12,13 @@
%define rpmver 4.6.0
%define srcver %{rpmver}
-%define bdbver 4.5.20
+%define bdbver 4.7.25
+%define dbprefix db
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -46,8 +47,8 @@
Requires(post): coreutils
%if %{without int_bdb}
-# normally db4-utils = %{bdbver} for the rpmdb_foo symlinks
-Requires: compat-db45
+# db recovery tools, rpmdb_util symlinks
+Requires: db4-utils = %{bdbver}
%endif
Requires: popt >= 1.10.2.1
Requires: crontabs
@@ -55,9 +56,7 @@
Requires: curl
%if %{without int_bdb}
-# XXX using BDB 4.5.20 from compat-db45 for now to provide a safe downgrade
-# route to older rpm.
-BuildRequires: compat-db45
+BuildRequires: db4-devel = %{bdbver}
%endif
# XXX generally assumed to be installed but make it explicit as rpm
@@ -182,8 +181,8 @@
%build
%if %{without int_bdb}
-CPPFLAGS=-I%{_includedir}/db%{bdbver}
-LDFLAGS=-L%{_libdir}/db%{bdbver}
+#CPPFLAGS=-I%{_includedir}/db%{bdbver}
+#LDFLAGS=-L%{_libdir}/db%{bdbver}
%endif
CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
CFLAGS="$RPM_OPT_FLAGS"
@@ -234,14 +233,13 @@
# plant links to db utils as rpmdb_foo so existing documantion is usable
%if %{without int_bdb}
-dbprefix=db45
for dbutil in \
archive deadlock dump load printlog \
recover stat upgrade verify
do
- ln -s ../../bin/${dbprefix}_${dbutil} $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_${dbutil}
+ ln -s ../../bin/%{dbprefix}_${dbutil} $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_${dbutil}
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
%find_lang %{name}
@@ -375,6 +373,9 @@
%doc doc/librpm/html/*
%changelog
+* Mon Feb 09 2009 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-2
+- build against db 4.7.x
+
* Fri Feb 06 2009 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-1
- update to 4.6.0 final
- revert libmagic looking into compressed files for now, breaks ooffice build
- Previous message (by thread): rpms/bluez/devel .cvsignore, 1.23, 1.24 bluez.spec, 1.33, 1.34 sources, 1.23, 1.24
- Next message (by thread): rpms/alleyoop/devel .cvsignore, 1.2, 1.3 alleyoop.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list