Author: glen Date: Tue Sep 2 12:03:21 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- include patchlevel in version
- update urls and sources
- check-files cleanup without java
---- Files affected:
SPECS:
db4.5.spec (1.22 -> 1.23)
---- Diffs:
================================================================
Index: SPECS/db4.5.spec
diff -u SPECS/db4.5.spec:1.22 SPECS/db4.5.spec:1.23
--- SPECS/db4.5.spec:1.22 Tue Sep 2 12:23:22 2008
+++ SPECS/db4.5.spec Tue Sep 2 14:03:16 2008
@@ -17,22 +17,23 @@
%ifnarch i586 i686 athlon pentium3 pentium4 %{x8664}
%undefine with_java
%endif
-%define mver 4.5
+
+%define mver 4.5
+%define ver %{mver}.20
+%define patchlevel 2
Summary: Berkeley DB database library for C
Summary(pl.UTF-8): Biblioteka C do obsługi baz Berkeley DB
Name: db4.5
-Version: %{mver}.20
-Release: 8
+Version: %{ver}.%{patchlevel}
+Release: 1
Epoch: 0
License: Sleepycat public license (GPL-like, see LICENSE)
Group: Libraries
-# alternative site (sometimes working): http://www.berkeleydb.com/
-Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
+Source0: http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz
# Source0-md5: b0f1c777708cb8e9d37fb47e7ed3312d
-Patch0: patch.4.5.20.1
-Patch1: patch.4.5.20.2
-Patch10: db-rpm-robustness.patch
-URL: http://www.oracle.com/technology/products/berkeley-db/index.html
+%patchset_source -f
http://www.oracle.com/technology/products/berkeley-db/db/update/%{ver}/patch.%{ver}.%g
1 %{patchlevel}
+Patch0: db-rpm-robustness.patch
+URL:
http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: ed
@@ -40,6 +41,7 @@
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpmbuild(macros) >= 1.426
BuildRequires: sed >= 4.0
%{?with_tcl:BuildRequires: tcl-devel >= 8.4.0}
%{?with_rpm_robustness:Requires: uname(release) >= 2.6.17}
@@ -250,11 +252,12 @@
poleceń.
%prep
-%setup -q -n db-%{version}
-%patch0 -p0
-%patch1 -p0
+%setup -q -n db-%{ver}
+
+# official patches
+%patchset_patch 1 %{patchlevel}
-%{?with_rpm_robustness:%patch10 -p1}
+%{?with_rpm_robustness:%patch0 -p1}
%if !%{with nptl}
sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
@@ -376,6 +379,12 @@
%if %{with java}
install -d $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}
cp -rf examples_java/* $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}
+%else
+rm -rf $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/java
+rm -rf $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/collections
+rm -rf $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/gsg/JAVA
+rm -rf $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/gsg_txn/JAVA
+rm -rf $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/gsg_db_rep/JAVA
%endif
%clean
@@ -507,6 +516,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2008/09/02 12:03:16 glen
+- include patchlevel in version
+- update urls and sources
+- check-files cleanup without java
+
Revision 1.22 2008/09/02 10:23:22 glen
- compatible with ac build
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/db4.5.spec?r1=1.22&r2=1.23&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
