X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=db4.2.spec;h=45ead8d1d00c20116387b5f24bea8dadb5bbafd7;hb=13f761d04704ec602d8270993c8b77a7f8314603;hp=ba02f3f3da8e59148f39c183f312b1c454867424;hpb=5096614098b675864c84f549fada236fd73f5bad;p=packages%2Fdb4.2.git

diff --git a/db4.2.spec b/db4.2.spec
index ba02f3f..45ead8d 100644
--- a/db4.2.spec
+++ b/db4.2.spec
@@ -1,23 +1,23 @@
 #
 # Conditional build:
-# _with_java	- build db-java (required for openoffice)
+%bcond_with	java	# don't build db-java (required for openoffice)
 #
 Summary:	BSD database library for C
 Summary(pl):	Biblioteka C do obs³ugi baz Berkeley DB
 Name:		db
-Version:	4.1.25
-Release:	4
-License:	GPL
+Version:	4.2.50
+Release:	1
+License:	BSD
 Group:		Libraries
 # alternative site (sometimes working): http://www.berkeleydb.com/
 Source0:	http://www.sleepycat.com/update/snapshot/%{name}-%{version}.tar.gz
-# Source0-md5: df71961002b552c0e72c6e4e358f27e1
-Patch0:		%{name}-o_direct.patch
-Patch1:		http://www.sleepycat.com/update/4.1.25/patch.4.1.25.1
+# Source0-md5:	644522fe89c565ec10c6d2e2d010227b
 URL:		http://www.sleepycat.com/
 BuildRequires:	autoconf
 BuildRequires:	ed
-%{?_with_java:BuildRequires:	jdk}
+# gcc-java or jdk
+# but requires some Java VM - gij is not sufficient
+%{?with_java:BuildRequires:	jdk}
 BuildRequires:	libstdc++-devel
 BuildRequires:	tcl-devel >= 8.3.2
 Obsoletes:	db4
@@ -32,7 +32,7 @@ including Python and Perl, so this should be installed on all systems.
 %description -l pl
 Berkeley Database (Berkeley DB) to zestaw narzêdzi programistycznych
 zapewniaj±cych obs³ugê baz danych w aplikacjach tradycyjnych jak i
-klient-serwer. Berkeley db jest u¿ywana wielu aplikacjach, w tym w
+klient-serwer. Berkeley db jest u¿ywana w wielu aplikacjach, w tym w
 Pythonie i Perlu.
 
 %package devel
@@ -40,8 +40,8 @@ Summary:	Header files for Berkeley database library
 Summary(pl):	Pliki nag³ówkowe do biblioteki Berkeley Database
 Group:		Development/Libraries
 Requires:	%{name} = %{version}
-Obsoletes:	db4-devel
 Obsoletes:	db3-devel
+Obsoletes:	db4-devel
 
 %description devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -70,8 +70,8 @@ Summary:	Static libraries for Berkeley database library
 Summary(pl):	Statyczne biblioteki Berkeley Database
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}
-Obsoletes:	db4-static
 Obsoletes:	db3-static
+Obsoletes:	db4-static
 
 %description static
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -108,18 +108,31 @@ Berkeley database library for C++.
 Biblioteka baz danych Berkeley dla C++.
 
 %package cxx-devel
-Summary:	Berkeley database library for C++
-Summary(pl):	Biblioteka baz danych Berkeley dla C++
-Group:		Libraries
+Summary:	Header files for db-cxx library
+Summary(pl):	Pliki nag³ówkowe biblioteki db-cxx
+Group:		Development/Libraries
 Requires:	%{name}-cxx = %{version}
-Obsoletes:	%{name}-devel < 4.1.25-3
-Obsoletes:	db4-cxx
+Requires:	%{name}-devel = %{version}
+Conflicts:	db-devel < 4.1.25-3
 
 %description cxx-devel
-Berkeley database library for C++.
+Header files for db-cxx library.
 
 %description cxx-devel -l pl
-Biblioteka baz danych Berkeley dla C++.
+Pliki nag³ówkowe biblioteki db-cxx.
+
+%package cxx-static
+Summary:	Static version of db-cxx library
+Summary(pl):	Statyczna wersja biblioteki db-cxx
+Group:		Development/Libraries
+Requires:	%{name}-cxx-devel = %{version}
+Conflicts:	db-static < 4.2.50-1
+
+%description cxx-static
+Static version of db-cxx library.
+
+%description cxx-static -l pl
+Statyczna wersja biblioteki db-cxx.
 
 %package java
 Summary:	Berkeley database library for Java
@@ -146,19 +159,18 @@ Berkeley database library for TCL.
 Biblioteka baz danych Berkeley dla TCL.
 
 %package tcl-devel
-Summary:	Berkeley database library for TCL
-Summary(pl):	Biblioteka baz danych Berkeley dla TCL
+Summary:	Development files for db-tcl library
+Summary(pl):	Pliki programistyczne biblioteki db-tcl
 Group:		Development/Languages/Tcl
 Requires:	tcl
 Requires:	%{name}-tcl = %{version}
-Obsoletes:	%{name}-devel < 4.1.25-3
-Obsoletes:	db4-tcl
+Conflicts:	db-devel < 4.1.25-3
 
 %description tcl-devel
-Berkeley database library for TCL.
+Development files for db-tcl library.
 
 %description tcl-devel -l pl
-Biblioteka baz danych Berkeley dla TCL.
+Pliki programistyczne biblioteki db-tcl.
 
 %package utils
 Summary:	Command line tools for managing Berkeley DB databases
@@ -191,8 +203,6 @@ polece
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
 
 %build
 cd dist
@@ -205,12 +215,11 @@ cd build_unix.static
 
 CC="%{__cc}"
 CXX="%{__cxx}"
-CFLAGS="%{rpmcflags} -fno-implicit-templates"
+CFLAGS="%{rpmcflags}"
 CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
 export CC CXX CFLAGS CXXFLAGS
 
-../dist/configure \
-	--prefix=%{_prefix} \
+../dist/%configure \
 	--enable-compat185 \
 	--disable-shared \
 	--enable-static \
@@ -224,8 +233,9 @@ export CC CXX CFLAGS CXXFLAGS
 
 cd ../build_unix
 
-../dist/configure \
+../dist/%configure \
 	--prefix=%{_prefix} \
+	--libdir=%{_libdir} \
 	--enable-compat185 \
 	--enable-shared \
 	--disable-static \
@@ -233,49 +243,51 @@ cd ../build_unix
 	--enable-cxx \
 	--enable-tcl \
 	--with-tcl=/usr/lib \
-	%{?_with_java:--enable-java}
+	%{?with_java:--enable-java}
 
-%{__make} library_build TCFLAGS='-I$(builddir) -I%{_includedir}'
+%{__make} library_build \
+	TCFLAGS='-I$(builddir) -I%{_includedir}'
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},/lib}
 
-cd build_unix.static
-
-%{__make} library_install \
-	prefix=$RPM_BUILD_ROOT%{_prefix}
-
-cd ../build_unix
+%{__make} -C build_unix.static library_install \
+	bindir=$RPM_BUILD_ROOT%{_bindir} \
+	prefix=$RPM_BUILD_ROOT%{_prefix} \
+	libdir=$RPM_BUILD_ROOT%{_libdir} \
+	includedir=$RPM_BUILD_ROOT%{_includedir}
 
-%{__make} library_install \
+%{__make} -C build_unix library_install \
+	bindir=$RPM_BUILD_ROOT%{_bindir} \
 	prefix=$RPM_BUILD_ROOT%{_prefix} \
+	libdir=$RPM_BUILD_ROOT%{_libdir} \
 	includedir=$RPM_BUILD_ROOT%{_includedir} \
 	LIB_INSTALL_FILE_LIST=""
 
-(cd $RPM_BUILD_ROOT%{_libdir}
-ln -sf libdb-4.1.so libdb4.so
-ln -sf libdb-4.1.so libndbm.so
-ln -sf libdb-4.1.la libdb.la
-ln -sf libdb-4.1.la libdb4.la
-ln -sf libdb-4.1.la libndbm.la
-ln -sf libdb_tcl-4.1.la libdb_tcl.la
-ln -sf libdb_cxx-4.1.la libdb_cxx.la
-mv -f libdb.a libdb-4.1.a
-ln -sf libdb-4.1.a libdb.a
-ln -sf libdb-4.1.a libdb4.a
-ln -sf libdb-4.1.a libndbm.a
-mv -f libdb_cxx.a libdb_cxx-4.1.a
-ln -sf libdb_cxx-4.1.a libdb_cxx.a
-
-mv -f libdb-4.1.la libdb-4.1.la.tmp
-mv -f libdb_cxx-4.1.la libdb_cxx-4.1.la.tmp
-sed -e "s/old_library=''/old_library='libdb-4.1.a'/" libdb-4.1.la.tmp > libdb-4.1.la
-sed -e "s/old_library=''/old_library='libdb_cxx-4.1.a'/" libdb_cxx-4.1.la.tmp > libdb_cxx-4.1.la
+cd $RPM_BUILD_ROOT%{_libdir}
+ln -sf libdb-4.2.so libdb4.so
+ln -sf libdb-4.2.so libndbm.so
+ln -sf libdb-4.2.la libdb.la
+ln -sf libdb-4.2.la libdb4.la
+ln -sf libdb-4.2.la libndbm.la
+ln -sf libdb_tcl-4.2.la libdb_tcl.la
+ln -sf libdb_cxx-4.2.la libdb_cxx.la
+mv -f libdb.a libdb-4.2.a
+ln -sf libdb-4.2.a libdb.a
+ln -sf libdb-4.2.a libdb4.a
+ln -sf libdb-4.2.a libndbm.a
+mv -f libdb_cxx.a libdb_cxx-4.2.a
+ln -sf libdb_cxx-4.2.a libdb_cxx.a
+
+mv -f libdb-4.2.la libdb-4.2.la.tmp
+mv -f libdb_cxx-4.2.la libdb_cxx-4.2.la.tmp
+sed -e "s/old_library=''/old_library='libdb-4.2.a'/" libdb-4.2.la.tmp > libdb-4.2.la
+sed -e "s/old_library=''/old_library='libdb_cxx-4.2.a'/" libdb_cxx-4.2.la.tmp > libdb_cxx-4.2.la
 rm -f libdb*.la.tmp
-)
 
-cd ..
+#cd -
+#cd ..
 #rm -rf examples_java
 #cp -a java/src/com/sleepycat/examples examples_java
 
@@ -294,25 +306,27 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README
-#%attr(755,root,root) /lib/libdb-*.so
 %attr(755,root,root) %{_libdir}/libdb-*.so
 
 %files devel
 %defattr(644,root,root,755)
 %doc docs/{api*,ref,index.html,sleepycat,images} examples_c*
-%{_includedir}/db.h
-%{_includedir}/db_185.h
-%{_libdir}/libdb-4.1.la
+%{_libdir}/libdb-4.2.la
 %{_libdir}/libdb.la
 %{_libdir}/libdb.so
 %{_libdir}/libdb4.la
 %{_libdir}/libdb4.so
 %{_libdir}/libndbm.la
 %{_libdir}/libndbm.so
+%{_includedir}/db.h
+%{_includedir}/db_185.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libdb-4.2.a
+%{_libdir}/libdb4.a
+%{_libdir}/libdb.a
+%{_libdir}/libndbm.a
 
 %files cxx
 %defattr(644,root,root,755)
@@ -320,14 +334,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files cxx-devel
 %defattr(644,root,root,755)
-%{_includedir}/cxx_common.h
-%{_includedir}/cxx_except.h
 %{_includedir}/db_cxx.h
-%{_libdir}/libdb_cxx-4.1.la
+%{_libdir}/libdb_cxx-4.2.la
 %{_libdir}/libdb_cxx.la
 %{_libdir}/libdb_cxx.so
 
-%if %{?_with_java:1}%{!?_with_java:0}
+%files cxx-static
+%defattr(644,root,root,755)
+%{_libdir}/libdb_cxx-4.2.a
+%{_libdir}/libdb_cxx.a
+
+%if %{with java}
 %files java
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdb_java*.so
@@ -336,11 +353,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tcl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_tcl-*.so
+%attr(755,root,root) %{_libdir}/libdb_tcl-4.2.so
 
 %files tcl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libdb_tcl-4.1.la
+%{_libdir}/libdb_tcl-4.2.la
 %{_libdir}/libdb_tcl.la
 %{_libdir}/libdb_tcl.so