- drop obsolete and outdated manual inclusion of rpm macros

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

diff --git a/db4.8.spec b/db4.8.spec
index c5217031ba382ae006dbc2cd2219ebbc388677bf..de232b10f856c9ae7539bbdb18cd647b8c2cb9c8 100644 (file)
--- a/db4.8.spec
+++ b/db4.8.spec
@@ -5,7 +5,6 @@
 %bcond_without static_libs     # don't build static libraries
 %bcond_with    default_db      # use this db as default system db
 
-%include       /usr/lib/rpm/macros.java
 
 %define                libver          4.8
 %define                ver             %{libver}.30
@@ -181,7 +180,6 @@ Group:              Libraries
 Requires:      jpackage-utils
 %if %{with default_db}
 Provides:      db-java = %{version}-%{release}
-# db.jar conflicts
 Obsoletes:     db-java
 %endif
 
@@ -299,11 +297,11 @@ LDFLAGS="%{rpmcflags} %{rpmldflags}"
 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
 ../dist/%configure \
-       --enable-compat185 \
        --disable-shared \
        --enable-static \
-       --enable-posixmutexes \
-       --enable-cxx
+       --enable-compat185 \
+       --enable-cxx \
+       --enable-posixmutexes
 
 # (temporarily?) disabled because of compilation errors:
 #      --enable-dump185 \
@@ -317,14 +315,13 @@ cd build_unix
 ../dist/%configure \
        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
+       --enable-shared \
+       --disable-static \
        --enable-compat185 \
-       --enable-posixmutexes \
        --enable-cxx \
-       %{?with_tcl:--enable-tcl} \
-       %{?with_tcl:--with-tcl=/usr/lib} \
+       --enable-posixmutexes \
        %{?with_java:--enable-java} \
-       --disable-static \
-       --enable-shared
+       %{?with_tcl:--enable-tcl --with-tcl=/usr/lib}
 
 %{__make} library_build \
        TCFLAGS='-I$(builddir) -I%{_includedir}' \
@@ -362,7 +359,7 @@ mv -f libdb.a libdb-%{libver}.a
 mv -f libdb_cxx.a libdb_cxx-%{libver}.a
 %endif
 %if %{with java}
-mv -f $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
+mv -f $RPM_BUILD_ROOT%{_libdir}/db.jar $RPM_BUILD_ROOT%{_javadir}/db-%{libver}.jar
 %endif
 %if %{with default_db}
 ln -sf /%{_lib}/libdb-%{libver}.so libdb.so
@@ -376,6 +373,7 @@ ln -sf libdb_cxx-%{libver}.so libdb_cxx.so
 ln -sf libdb_cxx-%{libver}.la libdb_cxx.la
 %if %{with java}
 ln -sf libdb_java-%{libver}.la libdb_java.la
+ln -sf db-%{libver}.jar $RPM_BUILD_ROOT%{_javadir}/db.jar
 %endif
 %if %{with tcl}
 ln -sf libdb_tcl-%{libver}.so libdb_tcl.so
@@ -392,6 +390,14 @@ ln -sf libdb_cxx-%{libver}.a libdb_cxx.a
 sed -i "s/old_library=''/old_library='libdb-%{libver}.a'/" libdb-%{libver}.la
 sed -i "s/old_library=''/old_library='libdb_cxx-%{libver}.a'/" libdb_cxx-%{libver}.la
 
+cd -
+
+cd $RPM_BUILD_ROOT%{_bindir}
+for F in db_*; do
+  Fver=$(echo $F|sed 's/db_/db%{libver}_/')
+  mv $F $Fver
+  %{?with_default_db:ln -sf $Fver $F}
+done
 cd -
 rm -f examples_c*/tags
 install -d $RPM_BUILD_ROOT%{_examplesdir}/db-%{version}
@@ -505,7 +511,10 @@ rm -rf $RPM_BUILD_ROOT
 %files java
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdb_java-%{libver}.so
+%{_javadir}/db-%{libver}.jar
+%if %{with default_db}
 %{_javadir}/db.jar
+%endif
 
 %files java-devel
 %defattr(644,root,root,755)
@@ -539,15 +548,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %files utils
 %defattr(644,root,root,755)
-%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*_hotbackup
-%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*_sql
-%attr(755,root,root) %{_bindir}/db*_stat
-%attr(755,root,root) %{_bindir}/db*_upgrade
-%attr(755,root,root) %{_bindir}/db*_verify
+%attr(755,root,root) %{_bindir}/db%{libver}_archive
+%attr(755,root,root) %{_bindir}/db%{libver}_checkpoint
+%attr(755,root,root) %{_bindir}/db%{libver}_deadlock
+%attr(755,root,root) %{_bindir}/db%{libver}_dump
+%attr(755,root,root) %{_bindir}/db%{libver}_hotbackup
+%attr(755,root,root) %{_bindir}/db%{libver}_load
+%attr(755,root,root) %{_bindir}/db%{libver}_printlog
+%attr(755,root,root) %{_bindir}/db%{libver}_recover
+%attr(755,root,root) %{_bindir}/db%{libver}_sql
+%attr(755,root,root) %{_bindir}/db%{libver}_stat
+%attr(755,root,root) %{_bindir}/db%{libver}_upgrade
+%attr(755,root,root) %{_bindir}/db%{libver}_verify
+%if %{with default_db}
+%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_hotbackup
+%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_sql
+%attr(755,root,root) %{_bindir}/db_stat
+%attr(755,root,root) %{_bindir}/db_upgrade
+%attr(755,root,root) %{_bindir}/db_verify
+%endif