Hello community,
here is the log from the commit of package libdb-4_8 for openSUSE:Factory
checked in at 2016-04-14 12:59:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libdb-4_8 (Old)
and /work/SRC/openSUSE:Factory/.libdb-4_8.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdb-4_8"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libdb-4_8/libdb-4_8.changes 2014-05-17
22:01:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libdb-4_8.new/libdb-4_8.changes 2016-04-14
12:59:43.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Mar 31 09:50:39 UTC 2016 - tchva...@suse.com
+
+- Use upstream tarball
+- Cleanup a bit with spec-cleaner
+- remove unused script check-build.sh
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/libdb-4_8/libdb_java-4_8.changes 2014-05-17
22:01:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libdb-4_8.new/libdb_java-4_8.changes
2016-04-14 12:59:43.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Mar 31 09:50:54 UTC 2016 - tchva...@suse.com
+
+- Use upstream tarball
+- Cleanup with spec-cleaner
+- remove unused script check-build.sh
+
+-------------------------------------------------------------------
Old:
----
check-build.sh
db-4.8.30.tar.bz2
New:
----
db-4.8.30.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libdb-4_8.spec ++++++
--- /var/tmp/diff_new_pack.lgV15r/_old 2016-04-14 12:59:45.000000000 +0200
+++ /var/tmp/diff_new_pack.lgV15r/_new 2016-04-14 12:59:45.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libdb-4_8
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +16,10 @@
#
+%define util_list archive checkpoint deadlock dump hotbackup load printlog
recover sql stat upgrade verify
%define generic_name db
-%define docdir %{_defaultdocdir}/%{name}
%define major 4
%define minor 8
-
Name: libdb-4_8
Version: %{major}.%{minor}.30
Release: 0
@@ -28,9 +27,9 @@
License: BSD-3-Clause
Group: System/Libraries
Url: http://oracle.com/technetwork/products/berkeleydb/
-
-Source: db-%{version}.tar.bz2
+Source: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
Source1: %{name}.changes
+Source2: baselibs.conf
Source9: getpatches
Patch0: db-%{version}.patch
BuildRequires: autoconf
@@ -38,10 +37,6 @@
BuildRequires: gcc-c++
Provides: db = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# bug437293
-%ifarch ppc64
-Obsoletes: db-64bit
-%endif
%description
The Berkeley DB Database is a programmatic toolkit that provides
@@ -52,9 +47,9 @@
%package -n db48-utils
Summary: Command Line tools for Managing Berkeley DB Databases
Group: Productivity/Databases/Tools
+Requires(post): update-alternatives
Provides: db-utils = %{version}
Obsoletes: db-utils < %{version}
-PreReq: update-alternatives
%description -n db48-utils
The Berkeley DB Database is a programmatic toolkit that provides
@@ -101,8 +96,8 @@
cd dist
# dist/RELEASE codes the build date into the binary.
# Use last change of changes file instead
-LAST_MOD=`stat --format="%Y" %SOURCE1`
-DIST_DATE=`date '+%B %e, %Y' --date="@$LAST_MOD"`
+LAST_MOD=`stat --format="%%Y" %{SOURCE1}`
+DIST_DATE=`date '+%%B %%e, %%Y' --date="@$LAST_MOD"`
sed -i -e "s/^DB_RELEASE_DATE=.*$/DB_RELEASE_DATE=\"$DIST_DATE\"/" RELEASE
./s_config
CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -148,50 +143,46 @@
rm -f examples_cxx/tags
rm -f examples_c/tags
# Move documentation to the right directory
-mkdir -p %{buildroot}%{docdir}
-mv %{buildroot}%{_prefix}/docs/* %{buildroot}/%{docdir}
-cp -a examples_cxx examples_c %{buildroot}/%{docdir}
-cp -a LICENSE README %{buildroot}/%{docdir}
-#
+mkdir -p %{buildroot}%{_docdir}/%{name}
+mv %{buildroot}%{_prefix}/docs/* %{buildroot}/%{_docdir}/%{name}
+cp -a examples_cxx examples_c %{buildroot}/%{_docdir}/%{name}
+cp -a LICENSE README %{buildroot}/%{_docdir}/%{name}
# Remove api documentation for C++, Java and TCL
-rm -rf %{buildroot}/%{docdir}/csharp
-rm -rf %{buildroot}/%{docdir}/java
-rm -rf %{buildroot}/%{docdir}/api_reference/CXX
-rm -rf %{buildroot}/%{docdir}/api_reference/STL
-rm -rf %{buildroot}/%{docdir}/api_reference/TCL
-rm -rf %{buildroot}/%{docdir}/gsg*/CXX
-rm -rf %{buildroot}/%{docdir}/gsg*/JAVA
-mv %{buildroot}/%{docdir}/collections/tutorial %{buildroot}/%{docdir}/
+rm -rf %{buildroot}/%{_docdir}/%{name}/csharp
+rm -rf %{buildroot}/%{_docdir}/%{name}/java
+rm -rf %{buildroot}/%{_docdir}/%{name}/api_reference/CXX
+rm -rf %{buildroot}/%{_docdir}/%{name}/api_reference/STL
+rm -rf %{buildroot}/%{_docdir}/%{name}/api_reference/TCL
+rm -rf %{buildroot}/%{_docdir}/%{name}/gsg*/CXX
+rm -rf %{buildroot}/%{_docdir}/%{name}/gsg*/JAVA
+mv %{buildroot}/%{_docdir}/%{name}/collections/tutorial
%{buildroot}/%{_docdir}/%{name}/
# Remove crappy *.la files
-rm -rf %{buildroot}%{_libdir}/*.la
-rm -rf %{buildroot}%{_libdir}/tls/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-%define util_list archive checkpoint deadlock dump hotbackup load printlog
recover sql stat upgrade verify
-for i in %util_list; do
+for i in %{util_list}; do
# dummy
+ mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
touch "%{buildroot}%{_sysconfdir}/alternatives/db_$i"
- mv "%buildroot/%_bindir/db_$i" "%buildroot/%_bindir/db48_$i"
- ln -s "%{_sysconfdir}/alternatives/db_$i" "%{buildroot}%_bindir/db_$i"
+ mv "%{buildroot}/%{_bindir}/db_$i" "%{buildroot}/%{_bindir}/db48_$i"
+ ln -s "%{_sysconfdir}/alternatives/db_$i" "%{buildroot}%{_bindir}/db_$i"
done
-%fdupes %{buildroot}%{_libdir}
-%fdupes %{buildroot}%{docdir}
+%fdupes -s %{buildroot}
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%post -n db48-utils
-for i in %util_list; do
- "%_sbindir/update-alternatives" --install "%_bindir/db_$i" \
- "db_$i" "%_bindir/db48_$i" 48
+for i in %{util_list}; do
+ update-alternatives --install "%{_bindir}/db_$i" \
+ "db_$i" "%{_bindir}/db48_$i" 48
done
%postun -n db48-utils
-for i in %util_list; do
- "%_sbindir/update-alternatives" --remove "db_$i" "%_bindir/db_$i"
+for i in %{util_list}; do
+ update-alternatives --remove "db_$i" "%{_bindir}/db_$i"
done
%files
@@ -201,23 +192,23 @@
%files -n db48-doc
%defattr(-,root,root)
-%dir %{docdir}
-%doc %{docdir}/LICENSE
-%doc %{docdir}/README
-%doc %{docdir}/index.html
-%doc %{docdir}/license
-%doc %{docdir}/articles
-%doc %{docdir}/api_reference
-%doc %{docdir}/examples_c
-%doc %{docdir}/examples_cxx
-%doc %{docdir}/gsg*
-%doc %{docdir}/porting
-%doc %{docdir}/programmer_reference
-%doc %{docdir}/tutorial
+%dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/LICENSE
+%doc %{_docdir}/%{name}/README
+%doc %{_docdir}/%{name}/index.html
+%doc %{_docdir}/%{name}/license
+%doc %{_docdir}/%{name}/articles
+%doc %{_docdir}/%{name}/api_reference
+%doc %{_docdir}/%{name}/examples_c
+%doc %{_docdir}/%{name}/examples_cxx
+%doc %{_docdir}/%{name}/gsg*
+%doc %{_docdir}/%{name}/porting
+%doc %{_docdir}/%{name}/programmer_reference
+%doc %{_docdir}/%{name}/tutorial
%files -n db48-utils
%defattr(-,root,root)
-%_bindir/db48_*
+%{_bindir}/db48_*
%ghost %{_sysconfdir}/alternatives/db_archive
%ghost %{_sysconfdir}/alternatives/db_checkpoint
%ghost %{_sysconfdir}/alternatives/db_deadlock
@@ -230,7 +221,7 @@
%ghost %{_sysconfdir}/alternatives/db_stat
%ghost %{_sysconfdir}/alternatives/db_upgrade
%ghost %{_sysconfdir}/alternatives/db_verify
-%_bindir/db_*
+%{_bindir}/db_*
%files devel
%defattr(-,root,root)
++++++ libdb_java-4_8.spec ++++++
--- /var/tmp/diff_new_pack.lgV15r/_old 2016-04-14 12:59:45.000000000 +0200
+++ /var/tmp/diff_new_pack.lgV15r/_new 2016-04-14 12:59:45.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libdb_java-4_8
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,10 +17,8 @@
%define generic_name db
-%define docdir %{_defaultdocdir}/%{name}
%define major 4
%define minor 8
-
Name: libdb_java-4_8
Version: %{major}.%{minor}.30
Release: 0
@@ -28,8 +26,7 @@
License: BSD-3-Clause
Group: Productivity/Databases/Servers
Url: http://oracle.com/technetwork/products/berkeleydb/
-
-Source: db-%{version}.tar.bz2
+Source: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
Source1: %{name}.changes
Source9: getpatches
Patch0: db-%{version}.patch
@@ -39,9 +36,9 @@
BuildRequires: unzip
BuildRequires: update-alternatives
Requires: libdb-%{major}_%{minor} = %{version}
+Conflicts: libdb_java-4_5
Provides: db-java = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Conflicts: libdb_java-4_5
%description
These are the Java bindings for the Berkeley DB. They are needed for
@@ -52,8 +49,8 @@
Group: Productivity/Databases/Servers
Requires: %{name} = %{version}
Requires: glibc-devel
-Provides: db-java-devel = %{version}
Conflicts: libdb_java-4_5-devel
+Provides: db-java-devel = %{version}
%description devel
These are the Java bindings for the Berkeley DB. They are needed for
@@ -69,8 +66,8 @@
cd dist
# dist/RELEASE codes the build date into the binary.
# Use last change of changes file instead
-LAST_MOD=`stat --format="%Y" %SOURCE1`
-DIST_DATE=`date '+%B %e, %Y' --date="@$LAST_MOD"`
+LAST_MOD=`stat --format="%%Y" %{SOURCE1}`
+DIST_DATE=`date '+%%B %%e, %%Y' --date="@$LAST_MOD"`
sed -i -e "s/^DB_RELEASE_DATE=.*$/DB_RELEASE_DATE=\"$DIST_DATE\"/" RELEASE
./s_config
CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -117,23 +114,21 @@
rm -f examples_cxx/tags
rm -f examples_c/tags
# Move documentation to the right directory
-mkdir -p %{buildroot}%{docdir}
-mv %{buildroot}%{_prefix}/docs/* %{buildroot}/%{docdir}
-cp -a examples_cxx examples_c %{buildroot}/%{docdir}
-cp -a LICENSE README %{buildroot}/%{docdir}
-#
+mkdir -p %{buildroot}%{_docdir}/%{name}
+mv %{buildroot}%{_prefix}/docs/* %{buildroot}/%{_docdir}/%{name}
+cp -a examples_cxx examples_c %{buildroot}/%{_docdir}/%{name}
+cp -a LICENSE README %{buildroot}/%{_docdir}/%{name}
# Remove api documentation for C++, Java and TCL
-rm -rf %{buildroot}/%{docdir}/csharp
-rm -rf %{buildroot}/%{docdir}/java
-rm -rf %{buildroot}/%{docdir}/api_reference/CXX
-rm -rf %{buildroot}/%{docdir}/api_reference/STL
-rm -rf %{buildroot}/%{docdir}/api_reference/TCL
-rm -rf %{buildroot}/%{docdir}/gsg*/CXX
-rm -rf %{buildroot}/%{docdir}/gsg*/JAVA
-mv %{buildroot}/%{docdir}/collections/tutorial %{buildroot}/%{docdir}/
+rm -rf %{buildroot}/%{_docdir}/%{name}/csharp
+rm -rf %{buildroot}/%{_docdir}/%{name}/java
+rm -rf %{buildroot}/%{_docdir}/%{name}/api_reference/CXX
+rm -rf %{buildroot}/%{_docdir}/%{name}/api_reference/STL
+rm -rf %{buildroot}/%{_docdir}/%{name}/api_reference/TCL
+rm -rf %{buildroot}/%{_docdir}/%{name}/gsg*/CXX
+rm -rf %{buildroot}/%{_docdir}/%{name}/gsg*/JAVA
+mv %{buildroot}/%{_docdir}/%{name}/collections/tutorial
%{buildroot}/%{_docdir}/%{name}/
# Remove crappy *.la files
-rm -rf %{buildroot}%{_libdir}/*.la
-rm -rf %{buildroot}%{_libdir}/tls/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
pushd %{buildroot}
for file in `find | grep -v "\(java\|jar\)"`
do
@@ -145,7 +140,6 @@
ln -sf %{_javadir}/db-%{version}.jar %{buildroot}/%{_javadir}/db.jar
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%files
