- updated to 4.1.25, removed obsolete patches

[packages/db4.2.git] / db4.2.spec

diff --git a/db4.2.spec b/db4.2.spec
index 90d3990334256309e96c9d920ee7b0f069a06b71..7aa70840192d7e04f61f5015f3071b6a9acb03f5 100644 (file)
--- a/db4.2.spec
+++ b/db4.2.spec
@@ -1,17 +1,12 @@
 Summary:       BSD database library for C
 Summary(pl):   Biblioteka C do obs³ugi baz Berkeley DB
 Name:          db
-Version:       4.1.24
-Release:       3
+Version:       4.1.25
+Release:       1
 License:       GPL
 Group:         Libraries
 Source0:       http://www.berkeleydb.com/update/snapshot/%{name}-%{version}.tar.gz
-Patch0:                http://www.sleepycat.com/update/4.1.24/patch.4.1.24.1
-Patch1:                http://www.sleepycat.com/update/4.1.24/patch.4.1.24.2
-Patch2:                http://www.sleepycat.com/update/4.1.24/patch.4.1.24.3
-Patch3:                http://www.sleepycat.com/update/4.1.24/patch.4.1.24.4
-Patch4:                http://www.sleepycat.com/update/4.1.24/patch.4.1.24.5
-Patch5:                http://www.sleepycat.com/update/4.1.24/patch.4.1.24.6
+Patch0:                %{name}-o_direct.patch
 URL:           http://www.berkeleydb.com/
 %{?_with_java:BuildRequires:   jdk}
 BuildRequires: tcl-devel >= 8.3.2
@@ -86,14 +81,14 @@ Biblioteka baz danych Berkeley dla C++.
 
 %package java
 Summary:       Berkeley database library for Java
-Summary(pl):   Biblioteka baz danych Berkeley dla Java
+Summary(pl):   Biblioteka baz danych Berkeley dla Javy
 Group:         Libraries
 
 %description java
 Berkeley database library for Java.
 
 %description java -l pl
-Biblioteka baz danych Berkeley dla Java.
+Biblioteka baz danych Berkeley dla Javy.
 
 %package devel
 Summary:       Header files for Berkeley database library
@@ -157,21 +152,23 @@ u
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-
+%patch0 -p1
 
 %build
+cd dist
+sh s_config
+cd ..
+
 cp -a build_unix build_unix.static
 
 cd build_unix.static
 
-CFLAGS="%{rpmcflags} -fno-rtti -fno-implicit-templates" \
-CXXFLAGS="%{rpmcflags} -fno-rtti -fno-implicit-templates" \
+CC="%{__cc}"
+CXX="%{__cxx}"
+CFLAGS="%{rpmcflags} -fno-rtti -fno-implicit-templates"
+CXXFLAGS="%{rpmcflags} -fno-rtti -fno-implicit-templates"
+export CC CXX CFLAGS CXXFLAGS
+
 ../dist/configure \
        --prefix=%{_prefix} \
        --enable-compat185 \
@@ -187,10 +184,6 @@ CXXFLAGS="%{rpmcflags} -fno-rtti -fno-implicit-templates" \
 
 cd ../build_unix
 
-CFLAGS="%{rpmcflags} -fno-rtti -fno-implicit-templates" \
-CXXFLAGS="%{rpmcflags} -fno-rtti -fno-implicit-templates" \
-
-%if %{?_with_java:1}%{!?_with_java:0}
 ../dist/configure \
        --prefix=%{_prefix} \
        --enable-compat185 \
@@ -199,19 +192,8 @@ CXXFLAGS="%{rpmcflags} -fno-rtti -fno-implicit-templates" \
        --enable-rpc \
        --enable-cxx \
        --enable-tcl \
-       --with-tcl=%{_libdir} \
-       --enable-java
-%else
-../dist/configure \
-       --prefix=%{_prefix} \
-       --enable-compat185 \
-       --enable-shared \
-       --disable-static \
-       --enable-rpc \
-       --enable-cxx \
-       --enable-tcl \
-       --with-tcl=/usr/lib
-%endif
+       --with-tcl=/usr/lib \
+       %{?_with_java:--enable-java}
 
 %{__make} library_build TCFLAGS='-I$(builddir) -I%{_includedir}'
 
@@ -309,8 +291,8 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc docs/{api*,ref,index.html,sleepycat,images} examples_c*
-%attr(755,root,root) %{_libdir}/libdb*.la
-%attr(755,root,root) %{_libdir}/libndbm.la
+%{_libdir}/libdb*.la
+%{_libdir}/libndbm.la
 %attr(755,root,root) %{_libdir}/libdb.so
 %attr(755,root,root) %{_libdir}/libdb4.so
 %attr(755,root,root) %{_libdir}/libndbm.so