- Separated cxx-devel & tcl-devel

- Putting subpkgs in alphabetical order (devel & static on top)
- TODO: splitting development docs; proper desc.

Changed files:
    db.spec -> 1.22

diff --git a/db.spec b/db.spec
index 45fcb07cf0392a70fb440ec5e5ec68019e22b0e6..9fd46d44ad3cce002914e7221a8ca5c912bd22a0 100644 (file)
--- a/db.spec
+++ b/db.spec
@@ -6,7 +6,7 @@ Summary:        BSD database library for C
 Summary(pl):   Biblioteka C do obs³ugi baz Berkeley DB
 Name:          db
 Version:       4.1.25
-Release:       2
+Release:       3
 License:       GPL
 Group:         Libraries
 # alternative site (sometimes working): http://www.berkeleydb.com/
@@ -35,14 +35,15 @@ zapewniaj
 klient-serwer. Berkeley db jest u¿ywana wielu aplikacjach, w tym w
 Pythonie i Perlu.
 
-%package utils
-Summary:       Command line tools for managing Berkeley DB databases
-Summary(pl):   Narzêdzia do obs³ugi baz Berkeley DB z linii poleceñ
-Group:         Applications/Databases
+%package devel
+Summary:       Header files for Berkeley database library
+Summary(pl):   Pliki nag³ówkowe do biblioteki Berkeley Database
+Group:         Development/Libraries
 Requires:      %{name} = %{version}
-Obsoletes:     db4-utils
+Obsoletes:     db4-devel
+Obsoletes:     db3-devel
 
-%description utils
+%description devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
 provides embedded database support for both traditional and
 client/server applications. Berkeley DB includes B+tree, Extended
@@ -50,10 +51,10 @@ Linear Hashing, Fixed and Variable-length record access methods,
 transactions, locking, logging, shared memory caching and database
 recovery. DB supports C, C++, Java and Perl APIs.
 
-This package contains command line tools for managing Berkeley DB
-databases.
+This package contains the header files, libraries, and documentation
+for building programs which use Berkeley DB.
 
-%description utils -l pl
+%description devel -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 obs³ugje dostêp do bazy przez B-drzewa i
@@ -61,21 +62,38 @@ funkcje mieszaj
 transakcje, kroniki, pamiêæ dzielon± i odtwarzanie baz. Ma wsparcie
 dla C, C++, Javy i Perla.
 
-Ten pakiet zawiera narzêdzia do obs³ugi baz Berkeley DB z linii
-poleceñ.
+Ten pakiet zawiera pliki nag³ówkowe i dokumentacjê do budowania
+programów u¿ywaj±cych Berkeley DB.
 
-%package tcl
-Summary:       Berkeley database library for TCL
-Summary(pl):   Biblioteka baz danych Berkeley dla TCL
-Group:         Development/Languages/Tcl
-Requires:      tcl
-Obsoletes:     db4-tcl
+%package static
+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
 
-%description tcl
-Berkeley database library for TCL.
+%description static
+The Berkeley Database (Berkeley DB) is a programmatic toolkit that
+provides embedded database support for both traditional and
+client/server applications. Berkeley DB includes B+tree, Extended
+Linear Hashing, Fixed and Variable-length record access methods,
+transactions, locking, logging, shared memory caching and database
+recovery. DB supports C, C++, Java and Perl APIs.
 
-%description tcl -l pl
-Biblioteka baz danych Berkeley dla TCL.
+This package contains the static libraries for building programs which
+use Berkeley DB.
+
+%description static -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 obs³ugje dostêp do bazy przez B-drzewa i
+funkcje mieszaj±ce ze sta³± lub zmienn± wielko¶ci± rekordu,
+transakcje, kroniki, pamiêæ dzielon± i odtwarzanie baz. Ma wsparcie
+dla C, C++, Javy i Perla.
+
+Ten pakiet zawiera statyczne biblioteki do budowania programów
+u¿ywaj±cych Berkeley DB.
 
 %package cxx
 Summary:       Berkeley database library for C++
@@ -89,6 +107,20 @@ Berkeley database library for C++.
 %description cxx -l pl
 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
+Requires:      %{name}-cxx = %{version}
+Obsoletes:     %{name}-devel < 4.1.25-3
+Obsoletes:     db4-cxx
+
+%description cxx-devel
+Berkeley database library for C++.
+
+%description cxx-devel -l pl
+Biblioteka baz danych Berkeley dla C++.
+
 %package java
 Summary:       Berkeley database library for Java
 Summary(pl):   Biblioteka baz danych Berkeley dla Javy
@@ -100,47 +132,42 @@ Berkeley database library for Java.
 %description java -l pl
 Biblioteka baz danych Berkeley dla Javy.
 
-%package devel
-Summary:       Header files for Berkeley database library
-Summary(pl):   Pliki nag³ówkowe do biblioteki Berkeley Database
-Group:         Development/Libraries
-Requires:      %{name} = %{version}
-Requires:      %{name}-cxx = %{version}
-Requires:      %{name}-tcl = %{version}
-Obsoletes:     db4-devel
-Obsoletes:     db3-devel
+%package tcl
+Summary:       Berkeley database library for TCL
+Summary(pl):   Biblioteka baz danych Berkeley dla TCL
+Group:         Development/Languages/Tcl
+Requires:      tcl
+Obsoletes:     db4-tcl
 
-%description devel
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that
-provides embedded database support for both traditional and
-client/server applications. Berkeley DB includes B+tree, Extended
-Linear Hashing, Fixed and Variable-length record access methods,
-transactions, locking, logging, shared memory caching and database
-recovery. DB supports C, C++, Java and Perl APIs.
+%description tcl
+Berkeley database library for TCL.
 
-This package contains the header files, libraries, and documentation
-for building programs which use Berkeley DB.
+%description tcl -l pl
+Biblioteka baz danych Berkeley dla TCL.
 
-%description devel -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 obs³ugje dostêp do bazy przez B-drzewa i
-funkcje mieszaj±ce ze sta³± lub zmienn± wielko¶ci± rekordu,
-transakcje, kroniki, pamiêæ dzielon± i odtwarzanie baz. Ma wsparcie
-dla C, C++, Javy i Perla.
+%package tcl-devel
+Summary:       Berkeley database library for TCL
+Summary(pl):   Biblioteka baz danych Berkeley dla TCL
+Group:         Development/Languages/Tcl
+Requires:      tcl
+Requires:      %{name}-tcl = %{version}
+Obsoletes:     %{name}-devel < 4.1.25-3
+Obsoletes:     db4-tcl
 
-Ten pakiet zawiera pliki nag³ówkowe i dokumentacjê do budowania
-programów u¿ywaj±cych Berkeley DB.
+%description tcl-devel
+Berkeley database library for TCL.
 
-%package static
-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
+%description tcl-devel -l pl
+Biblioteka baz danych Berkeley dla TCL.
 
-%description static
+%package utils
+Summary:       Command line tools for managing Berkeley DB databases
+Summary(pl):   Narzêdzia do obs³ugi baz Berkeley DB z linii poleceñ
+Group:         Applications/Databases
+Requires:      %{name} = %{version}
+Obsoletes:     db4-utils
+
+%description utils
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
 provides embedded database support for both traditional and
 client/server applications. Berkeley DB includes B+tree, Extended
@@ -148,10 +175,10 @@ Linear Hashing, Fixed and Variable-length record access methods,
 transactions, locking, logging, shared memory caching and database
 recovery. DB supports C, C++, Java and Perl APIs.
 
-This package contains the static libraries for building programs which
-use Berkeley DB.
+This package contains command line tools for managing Berkeley DB
+databases.
 
-%description static -l pl
+%description utils -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 obs³ugje dostêp do bazy przez B-drzewa i
@@ -159,8 +186,8 @@ funkcje mieszaj
 transakcje, kroniki, pamiêæ dzielon± i odtwarzanie baz. Ma wsparcie
 dla C, C++, Javy i Perla.
 
-Ten pakiet zawiera statyczne biblioteki do budowania programów
-u¿ywaj±cych Berkeley DB.
+Ten pakiet zawiera narzêdzia do obs³ugi baz Berkeley DB z linii
+poleceñ.
 
 %prep
 %setup -q
@@ -270,26 +297,36 @@ rm -rf $RPM_BUILD_ROOT
 #%attr(755,root,root) /lib/libdb-*.so
 %attr(755,root,root) %{_libdir}/libdb-*.so
 
-%files utils
+%files devel
 %defattr(644,root,root,755)
-%doc docs/utility/*
-%attr(755,root,root) %{_bindir}/berkeley_db_svc
-%attr(755,root,root) %{_bindir}/db*_archive
-%attr(755,root,root) %{_bindir}/db*_checkpoint
-%attr(755,root,root) %{_bindir}/db*_deadlock
-%attr(755,root,root) %{_bindir}/db*_dump
-#%attr(755,root,root) %{_bindir}/db*_dump185
-%attr(755,root,root) %{_bindir}/db*_load
-%attr(755,root,root) %{_bindir}/db*_printlog
-%attr(755,root,root) %{_bindir}/db*_recover
-%attr(755,root,root) %{_bindir}/db*_stat
-%attr(755,root,root) %{_bindir}/db*_upgrade
-%attr(755,root,root) %{_bindir}/db*_verify
+%doc docs/{api*,ref,index.html,sleepycat,images} examples_c*
+%{_includedir}/db.h
+%{_includedir}/db_185.h
+%{_libdir}/libdb-4.1.la
+%{_libdir}/libdb.la
+%{_libdir}/libdb.so
+%{_libdir}/libdb4.la
+%{_libdir}/libdb4.so
+%{_libdir}/libndbm.la
+%{_libdir}/libndbm.so
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a
 
 %files cxx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdb_cxx-*.so
 
+%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.la
+%{_libdir}/libdb_cxx.so
+
 %if %{?_with_java:1}%{!?_with_java:0}
 %files java
 %defattr(644,root,root,755)
@@ -301,18 +338,24 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdb_tcl-*.so
 
-%files devel
+%files tcl-devel
 %defattr(644,root,root,755)
-%doc docs/{api*,ref,index.html,sleepycat,images} examples_c*
-%{_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
-%attr(755,root,root) %{_libdir}/libdb_tcl.so
-%attr(755,root,root) %{_libdir}/libdb_cxx.so
-%{_includedir}/*
+%{_libdir}/libdb_tcl-4.1.la
+%{_libdir}/libdb_tcl.la
+%{_libdir}/libdb_tcl.so
 
-%files static
+%files utils
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%doc docs/utility/*
+%attr(755,root,root) %{_bindir}/berkeley_db_svc
+%attr(755,root,root) %{_bindir}/db*_archive
+%attr(755,root,root) %{_bindir}/db*_checkpoint
+%attr(755,root,root) %{_bindir}/db*_deadlock
+%attr(755,root,root) %{_bindir}/db*_dump
+#%attr(755,root,root) %{_bindir}/db*_dump185
+%attr(755,root,root) %{_bindir}/db*_load
+%attr(755,root,root) %{_bindir}/db*_printlog
+%attr(755,root,root) %{_bindir}/db*_recover
+%attr(755,root,root) %{_bindir}/db*_stat
+%attr(755,root,root) %{_bindir}/db*_upgrade
+%attr(755,root,root) %{_bindir}/db*_verify