SPECS: db4.1.spec - don't provide default db*-devel, missing dir

Fri Nov 18 20:36:53 CET 2005

Author: qboosh                       Date: Fri Nov 18 19:36:53 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't provide default db*-devel, missing dir

---- Files affected:
SPECS:
   db4.1.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/db4.1.spec
diff -u SPECS/db4.1.spec:1.11 SPECS/db4.1.spec:1.12

--- SPECS/db4.1.spec:1.11	Fri Nov 18 20:11:37 2005
+++ SPECS/db4.1.spec	Fri Nov 18 20:36:48 2005
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-# _with_java	- build db-java (required for openoffice)
+%bcond_with	java	# build db-java
 #
 Summary:	BSD database library for C
 Summary(pl):	Biblioteka C do obsługi baz Berkeley DB
@@ -19,11 +19,10 @@
 URL:		http://www.sleepycat.com/
 BuildRequires:	autoconf
 BuildRequires:	ed
-%{?_with_java:BuildRequires:	gcc-java}
+%{?with_java:BuildRequires:	gcc-java}
 BuildRequires:	libstdc++-devel
 BuildRequires:	tcl-devel >= 8.3.2
-Provides:	db = 4.1.25-4
-Obsoletes:	db < 4.2
+Provides:	db = %{version}-%{release}
 Obsoletes:	db4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,9 +45,6 @@
 Summary(pl):	Pliki nagłówkowe do biblioteki Berkeley Database
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Provides:	db-devel = 4.1.25-4
-Obsoletes:	db-devel < 4.2
-Obsoletes:	db3-devel
 Obsoletes:	db4-devel
 
 %description devel
@@ -78,9 +74,6 @@
 Summary(pl):	Statyczne biblioteki Berkeley Database
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
-Provides:	db-static = 4.1.25-4
-Obsoletes:	db-static < 4.2
-Obsoletes:	db3-static
 Obsoletes:	db4-static
 
 %description static
@@ -109,8 +102,7 @@
 Summary:	Berkeley database library for C++
 Summary(pl):	Biblioteka baz danych Berkeley dla C++
 Group:		Libraries
-Provides:	db-cxx = 4.1.25-4
-Obsoletes:	db-cxx < 4.2
+Provides:	db-cxx = %{version}-%{release}
 Obsoletes:	db4-cxx
 
 %description cxx
@@ -125,8 +117,6 @@
 Group:		Libraries
 Requires:	%{name}-cxx = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
-Provides:	db-cxx-devel = 4.1.25-4
-Obsoletes:	db-cxx-devel < 4.2
 Obsoletes:	db4-cxx
 Conflicts:	db-devel < 4.1.25-3
 
@@ -140,8 +130,7 @@
 Summary:	Berkeley database library for Java
 Summary(pl):	Biblioteka baz danych Berkeley dla Javy
 Group:		Libraries
-Provides:	db-java = 4.1.25-4
-Obsoletes:	db-java < 4.2
+Provides:	db-java = %{version}-%{release}
 
 %description java
 Berkeley database library for Java.
@@ -154,8 +143,7 @@
 Summary(pl):	Biblioteka baz danych Berkeley dla Tcl
 Group:		Development/Languages/Tcl
 Requires:	tcl
-Provides:	db-tcl = 4.1.25-4
-Obsoletes:	db-tcl < 4.2
+Provides:	db-tcl = %{version}-%{release}
 Obsoletes:	db4-tcl
 
 %description tcl
@@ -170,8 +158,6 @@
 Group:		Development/Languages/Tcl
 Requires:	tcl
 Requires:	%{name}-tcl = %{version}-%{release}
-Provides:	db-tcl-devel = 4.1.25-4
-Obsoletes:	db-tcl-devel < 4.2
 Obsoletes:	db4-tcl
 Conflicts:	db-devel < 4.1.25-3
 
@@ -186,7 +172,7 @@
 Summary(pl):	Narzędzia do obsługi baz Berkeley DB z linii poleceń
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
-Provides:	db-utils = 4.1.25-4
+Provides:	db-utils = %{version}-%{release}
 Obsoletes:	db-utils < 4.2
 Obsoletes:	db4-utils
 
@@ -254,14 +240,14 @@
 	--enable-cxx \
 	--enable-tcl \
 	--with-tcl=/usr/lib \
-	%{?_with_java:--enable-java}
+	%{?with_java:--enable-java}
 
 %{__make} library_build \
 	TCFLAGS='-I$(builddir) -I%{_includedir}'
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},/lib}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir}}
 
 cd build_unix.static
 
@@ -284,19 +270,8 @@
 #cp -a java/src/com/sleepycat/examples examples_java
 
 cd $RPM_BUILD_ROOT%{_libdir}
-ln -sf libdb-4.1.so libdb4.so
-ln -sf libdb-4.1.so libndbm-4.1.so
-ln -sf libdb-4.1.la libdb.la
-ln -sf libdb-4.1.la libdb4.la
-ln -sf libdb-4.1.la libndbm-4.1.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-4.1.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
@@ -319,42 +294,41 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README
-%attr(755,root,root) %{_libdir}/libdb-4.*.so
+%attr(755,root,root) %{_libdir}/libdb-4.1.so
 
 %files devel
 %defattr(644,root,root,755)
 %doc docs/{api*,ref,index.html,sleepycat,images} examples_c*
+%{_libdir}/libdb-4.1.la
+%dir %{_includedir}
 %{_includedir}/db.h
 %{_includedir}/db_185.h
-%{_libdir}/libdb-4.*.la
-%{_libdir}/libndbm-4.*.la
-%{_libdir}/libndbm-4.*.so
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*-4.*.a
+%{_libdir}/lib*-4.1.a
 
 %files cxx
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_cxx-4.*.so
+%attr(755,root,root) %{_libdir}/libdb_cxx-4.1.so
 
 %files cxx-devel
 %defattr(644,root,root,755)
+%{_libdir}/libdb_cxx-4.1.la
 %{_includedir}/cxx_common.h
 %{_includedir}/cxx_except.h
 %{_includedir}/db_cxx.h
-%{_libdir}/libdb_cxx-4.*.la
 
-%if %{?_with_java:1}%{!?_with_java:0}
+%if %{with java}
 %files java
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdb_java*.so
-%attr(644,root,root) %{_libdir}/db.jar
+%{_libdir}/db.jar
 %endif
 
 %files tcl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_tcl-4.*.so
+%attr(755,root,root) %{_libdir}/libdb_tcl-4.1.so
 
 %files tcl-devel
 %defattr(644,root,root,755)
@@ -382,6 +356,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/11/18 19:36:48  qboosh
+- don't provide default db*-devel, missing dir
+
 Revision 1.11  2005/11/18 19:11:37  qboosh
 - updated URLs, strict internal deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/db4.1.spec?r1=1.11&r2=1.12&f=u


