Mailinglist Archive: opensuse-commit (1929 mails)

< Previous Next >
commit libdb-4_5 for openSUSE:Factory

Hello community,

here is the log from the commit of package libdb-4_5 for openSUSE:Factory
checked in at Sun Oct 2 10:14:26 CEST 2011.



--------
--- openSUSE:Factory/libdb-4_5/libdb-4_5.changes 2011-09-23
02:08:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/libdb-4_5/libdb-4_5.changes 2011-09-29
15:38:19.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Sep 28 18:46:43 UTC 2011 - adrian@xxxxxxx
+
+- fix arm build
+
+-------------------------------------------------------------------
+Tue Sep 27 16:39:10 UTC 2011 - prusnak@xxxxxxxxxxxx
+
+- enable C++ bindings
+- spec cleanup
+
+-------------------------------------------------------------------
--- openSUSE:Factory/libdb-4_5/libdb_java-4_5.changes 2011-09-23
02:08:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/libdb-4_5/libdb_java-4_5.changes
2011-09-28 18:37:24.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 27 16:39:58 UTC 2011 - prusnak@xxxxxxxxxxxx
+
+- spec cleanup
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
db-4.5.20.dif
patch.4.5.20.1
patch.4.5.20.2

New:
----
db-4.5.20-rep.patch
db-4.5.20-sequence.patch
db-4.5.20.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libdb-4_5.spec ++++++
--- /var/tmp/diff_new_pack.Z625fU/_old 2011-10-02 10:14:22.000000000 +0200
+++ /var/tmp/diff_new_pack.Z625fU/_new 2011-10-02 10:14:22.000000000 +0200
@@ -15,32 +15,31 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

-# norootforbuild

-
-Name: libdb-4_5
%define generic_name db
%define docdir %{_defaultdocdir}/%{name}
-%define source_dir %{_datadir}/%{name}-source
-Version: 4.5.20
-Release: 107
%define major 4
%define minor 5
+
+Name: libdb-4_5
+Version: %{major}.%{minor}.20
+Release: 1
+License: BSD3c(or similar)
Summary: Berkeley DB Database Library Version 4.5
-Source: db-%{version}.tar.bz2
Url: http://www.sleepycat.com
-Patch0: patch.%{version}.1
-Patch1: patch.%{version}.2
-Patch2: db-%{version}.dif
-License: BSD3c(or similar)
Group: System/Libraries
+Source: db-%{version}.tar.bz2
+Source9: getpatches
+Patch0: db-%{version}-rep.patch
+Patch1: db-%{version}-sequence.patch
+Patch2: db-%{version}.patch
+BuildRequires: fdupes
+BuildRequires: gcc-c++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Prefix: %{_prefix}
# bug437293
%ifarch ppc64
Obsoletes: db-64bit
%endif
-#

%description
The Berkeley DB Database is a programmatic toolkit that provides
@@ -48,13 +47,10 @@

This package contains the necessary runtime libraries.

-
-
%package -n db45-utils-doc
License: BSD3c(or similar)
Summary: Documentation for the Command Line tools for Managing Berkeley
DB Databases
Group: Productivity/Databases/Tools
-Prefix: %{_prefix}
Requires: libdb-4_5 = %{version}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
@@ -67,14 +63,10 @@
This package contains the documentation for the command line tools for
managing Berkeley DB databases.

-
-
%package -n db45-utils
License: BSD3c(or similar)
Summary: Command Line tools for Managing Berkeley DB Databases
Group: Productivity/Databases/Tools
-Prefix: %{_prefix}
-Requires: libdb-4_5 = %{version}

%description -n db45-utils
The Berkeley DB Database is a programmatic toolkit that provides
@@ -83,13 +75,10 @@
This package contains the command line tools for managing Berkeley DB
databases.

-
-
%package -n db45-doc
License: BSD3c(or similar)
Summary: Documentation for Berkeley DB
Group: Development/Libraries/C and C++
-Prefix: %{_prefix}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
@@ -100,14 +89,12 @@

This package contains the documentation.

-
-
%package devel
License: BSD3c(or similar)
Summary: Development Files and Libraries for the old Berkeley DB
library Version 4.5
Group: Development/Libraries/C and C++
-Prefix: %{_prefix}
-Requires: libdb-4_5 = %{version} glibc-devel
+Requires: %{name} = %{version}
+Requires: glibc-devel

%description devel
The Berkeley DB Database is a programmatic toolkit that provides
@@ -115,8 +102,6 @@

This package contains the header files and libraries.

-
-
%prep
%setup -q -n %{generic_name}-%{version}
%patch0
@@ -128,7 +113,7 @@
%build
cd dist
./s_config
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+CFLAGS="%{optflags} -fno-strict-aliasing"
CC=gcc
export CFLAGS CXXFLAGS CC
#
@@ -138,90 +123,83 @@
cd ../build_nptl
../dist/configure --prefix=%{_prefix} \
--libdir=%{_libdir} --enable-compat185 --disable-dump185 \
- --enable-shared --enable-static --enable-rpc --disable-cxx \
+ --enable-shared --disable-static --enable-rpc --enable-cxx \
--with-mutex="POSIX/pthreads/library" \
+%ifarch %arm
+ %{_target_cpu}-suse-linux-gnueabi
+%else
%{_target_cpu}-suse-linux
+%endif
# Make sure O_DIRECT is really disabled (build host could have old kernel)
perl -pi -e 's/#define HAVE_O_DIRECT 1/#undef HAVE_O_DIRECT/' db_config.h
# Remove libtool predep_objects and postdep_objects wonkiness
perl -pi -e 's/^predep_objects=".*$/predep_objects=""/' libtool
perl -pi -e 's/^postdep_objects=".*$/postdep_objects=""/' libtool
perl -pi -e 's/-shared -nostdlib/-shared/' libtool
+
make %{?_smp_mflags} LIBSO_LIBS='$(LIBS)' LIBXSO_LIBS='$(LIBS)'" -L%{_libdir}
-lstdc++"

%install
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/db4
-#mkdir -p ${RPM_BUILD_ROOT}% {source_dir}/
-#
-#cp % {_builddir}/% {generic_name}-% {version}.tar.bz2 ${RPM_BUILD_ROOT}%
{source_dir}/
-#mkdir -p $RPM_BUILD_ROOT/% {_defaultdocdir}/% {name}-source
-#cat >>$RPM_BUILD_ROOT/% {_defaultdocdir}/% {name}-source/README<<EOF
-#The patches in this directory were applied to the sources.
-#The sources were installed to:
-#% {source_dir}/% {generic_name}-% {version}.tar.bz2
-#EOF
+mkdir -p %{buildroot}%{_includedir}/db4
CONFIG_ARGS=$(find . -name "config.log" -exec grep "\$ \.\./dist\/configure"
{} \; | sed 's/.*configure\( --.*\)/\1/g')
if [ -z "$CONFIG_ARGS" ]
then
echo "could not find configure arguments ... exiting"
exit 42
fi
-#echo $CONFIG_ARGS >> $RPM_BUILD_ROOT/% {_defaultdocdir}/%
{name}-source/configure_args.txt
-#cp % {_sourcedir}/*patch* $RPM_BUILD_ROOT/% {_defaultdocdir}/% {name}-source
|| true
-#cp % {_sourcedir}/*.dif* $RPM_BUILD_ROOT/% {_defaultdocdir}/% {name}-source
|| true
-#
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}
+mkdir -p %{buildroot}%{_libdir}
cd build_nptl
-make prefix=${RPM_BUILD_ROOT}%{_prefix} libdir=${RPM_BUILD_ROOT}%{_libdir}
strip=true install
+make prefix=%{buildroot}%{_prefix} libdir=%{buildroot}%{_libdir} strip=true
install
cd ..
# make ldd happy:
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libdb*.so
+chmod 755 %{buildroot}%{_libdir}/libdb*.so
# Fix header file installation
-mv ${RPM_BUILD_ROOT}%{_includedir}/*.h ${RPM_BUILD_ROOT}%{_includedir}/db4
-echo "#include <db4/db.h>" > ${RPM_BUILD_ROOT}%{_includedir}/db.h
-echo "#include <db4/db_185.h>" > ${RPM_BUILD_ROOT}%{_includedir}/db_185.h
-rm -f ${RPM_BUILD_ROOT}%{_includedir}/db4/db_cxx.h
+mv %{buildroot}%{_includedir}/*.h %{buildroot}%{_includedir}/db4
+echo "#include <db4/db.h>" > %{buildroot}%{_includedir}/db.h
+echo "#include <db4/db_185.h>" > %{buildroot}%{_includedir}/db_185.h
+echo "#include <db4/db_cxx.h>" > %{buildroot}%{_includedir}/db_cxx.h
# remove dangling tags symlink from examples.
rm -f examples_cxx/tags
rm -f examples_c/tags
# Move documentation to the right directory
-mkdir -p $RPM_BUILD_ROOT%{docdir}
-mv $RPM_BUILD_ROOT%{_prefix}/docs/* $RPM_BUILD_ROOT/%{docdir}
-cp -a examples_cxx examples_c $RPM_BUILD_ROOT/%{docdir}
-cp -a LICENSE README $RPM_BUILD_ROOT/%{docdir}
+mkdir -p %{buildroot}%{docdir}
+mv %{buildroot}%{_prefix}/docs/* %{buildroot}/%{docdir}
+cp -a examples_cxx examples_c %{buildroot}/%{docdir}
+cp -a LICENSE README %{buildroot}/%{docdir}
#
# Remove api documentation for Java and TCL
-rm -rf $RPM_BUILD_ROOT/%{docdir}/java
-rm -rf $RPM_BUILD_ROOT/%{docdir}/api_java
-rm -rf $RPM_BUILD_ROOT/%{docdir}/api_tcl
-mv $RPM_BUILD_ROOT/%{docdir}/collections/tutorial $RPM_BUILD_ROOT/%{docdir}/
+rm -rf %{buildroot}/%{docdir}/java
+rm -rf %{buildroot}/%{docdir}/api_java
+rm -rf %{buildroot}/%{docdir}/api_tcl
+mv %{buildroot}/%{docdir}/collections/tutorial %{buildroot}/%{docdir}/
# Remove crappy *.la files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/tls/*.la
+rm -rf %{buildroot}%{_libdir}/*.la
+rm -rf %{buildroot}%{_libdir}/tls/*.la

-mv $RPM_BUILD_ROOT/%{_bindir}/berkeley_db_svc
$RPM_BUILD_ROOT/%{_bindir}/berkeley_db45_svc
-mv $RPM_BUILD_ROOT/%{_bindir}/db_archive
$RPM_BUILD_ROOT/%{_bindir}/db45_archive
-mv $RPM_BUILD_ROOT/%{_bindir}/db_checkpoint
$RPM_BUILD_ROOT/%{_bindir}/db45_checkpoint
-mv $RPM_BUILD_ROOT/%{_bindir}/db_deadlock
$RPM_BUILD_ROOT/%{_bindir}/db45_deadlock
-mv $RPM_BUILD_ROOT/%{_bindir}/db_dump $RPM_BUILD_ROOT/%{_bindir}/db45_dump
-mv $RPM_BUILD_ROOT/%{_bindir}/db_load $RPM_BUILD_ROOT/%{_bindir}/db45_load
-mv $RPM_BUILD_ROOT/%{_bindir}/db_printlog
$RPM_BUILD_ROOT/%{_bindir}/db45_printlog
-mv $RPM_BUILD_ROOT/%{_bindir}/db_recover
$RPM_BUILD_ROOT/%{_bindir}/db45_recover
-mv $RPM_BUILD_ROOT/%{_bindir}/db_stat $RPM_BUILD_ROOT/%{_bindir}/db45_stat
-mv $RPM_BUILD_ROOT/%{_bindir}/db_upgrade
$RPM_BUILD_ROOT/%{_bindir}/db45_upgrade
-mv $RPM_BUILD_ROOT/%{_bindir}/db_verify $RPM_BUILD_ROOT/%{_bindir}/db45_verify
-mv $RPM_BUILD_ROOT/%{_bindir}/db_hotbackup
$RPM_BUILD_ROOT/%{_bindir}/db45_hotbackup
+mv %{buildroot}/%{_bindir}/berkeley_db_svc
%{buildroot}/%{_bindir}/berkeley_db45_svc
+mv %{buildroot}/%{_bindir}/db_archive %{buildroot}/%{_bindir}/db45_archive
+mv %{buildroot}/%{_bindir}/db_checkpoint
%{buildroot}/%{_bindir}/db45_checkpoint
+mv %{buildroot}/%{_bindir}/db_deadlock %{buildroot}/%{_bindir}/db45_deadlock
+mv %{buildroot}/%{_bindir}/db_dump %{buildroot}/%{_bindir}/db45_dump
+mv %{buildroot}/%{_bindir}/db_load %{buildroot}/%{_bindir}/db45_load
+mv %{buildroot}/%{_bindir}/db_printlog %{buildroot}/%{_bindir}/db45_printlog
+mv %{buildroot}/%{_bindir}/db_recover %{buildroot}/%{_bindir}/db45_recover
+mv %{buildroot}/%{_bindir}/db_stat %{buildroot}/%{_bindir}/db45_stat
+mv %{buildroot}/%{_bindir}/db_upgrade %{buildroot}/%{_bindir}/db45_upgrade
+mv %{buildroot}/%{_bindir}/db_verify %{buildroot}/%{_bindir}/db45_verify
+mv %{buildroot}/%{_bindir}/db_hotbackup %{buildroot}/%{_bindir}/db45_hotbackup

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}

%files
%defattr(-,root,root)
%{_libdir}/libdb-%{major}.%{minor}.so
+%{_libdir}/libdb_cxx-%{major}.%{minor}.so

%files -n db45-doc
%defattr(-,root,root)
@@ -263,16 +241,13 @@
%dir %{_includedir}/db4
%{_includedir}/db.h
%{_includedir}/db_185.h
+%{_includedir}/db_cxx.h
%{_includedir}/db4/db.h
%{_includedir}/db4/db_185.h
+%{_includedir}/db4/db_cxx.h
%{_libdir}/libdb.so
-%{_libdir}/libdb.a
-%{_libdir}/libdb-%{major}.%{minor}.a
%{_libdir}/libdb-%{major}.so
-#% files source
-#% defattr(-,root,root)
-#% {_defaultdocdir}/% {name}-source
-#% {source_dir}
-#
+%{_libdir}/libdb_cxx.so
+%{_libdir}/libdb_cxx-%{major}.so

%changelog

++++++ libdb_java-4_5.spec ++++++
--- /var/tmp/diff_new_pack.Z625fU/_old 2011-10-02 10:14:22.000000000 +0200
+++ /var/tmp/diff_new_pack.Z625fU/_new 2011-10-02 10:14:22.000000000 +0200
@@ -15,47 +15,41 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

-# norootforbuild

-
-Name: libdb_java-4_5
-BuildRequires: java-sdk >= 1.5 unzip update-alternatives
%define generic_name db
%define docdir %{_defaultdocdir}/%{name}
-%define source_dir %{_datadir}/%{name}-source
-Version: 4.5.20
-Release: 139
%define major 4
%define minor 5
-Summary: Java Bindings for the Berkeley DB
-Source: db-%{version}.tar.bz2
-Url: http://www.sleepycat.com/products/xml.shtml
-Patch0: patch.%{version}.1
-Patch1: patch.%{version}.2
-Patch2: db-%{version}.dif
+
+Name: libdb_java-4_5
+Version: %{major}.%{minor}.20
+Release: 1
License: BSD3c(or similar)
+Summary: Java Bindings for the Berkeley DB
+Url: http://www.sleepycat.com
Group: Productivity/Databases/Servers
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Prefix: %{_prefix}
+Source: db-%{version}.tar.bz2
+Source9: getpatches
+Patch0: db-%{version}-rep.patch
+Patch1: db-%{version}-sequence.patch
+Patch2: db-%{version}.patch
+BuildRequires: gcc-c++
+BuildRequires: java-sdk >= 1.5
+BuildRequires: unzip
+BuildRequires: update-alternatives
Requires: libdb-%{major}_%{minor} = %{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
These are the Java bindings for the Berkeley DB. They are needed for
the Java support of db and dbxml.

-
-
-Authors:
---------
- Sleepycat
-
%package devel
License: BSD3c(or similar)
Summary: Java Bindings for the Berkeley DB
Group: Productivity/Databases/Servers
-Prefix: %{_prefix}
-Requires: glibc-devel
Requires: %{name} = %{version}
+Requires: glibc-devel

%description devel
These are the Java bindings for the Berkeley DB. They are needed for
@@ -63,12 +57,6 @@

These are the development files.

-
-
-Authors:
---------
- Sleepycat
-
%prep
%setup -q -n %{generic_name}-%{version}
%patch0
@@ -80,7 +68,7 @@
%build
cd dist
./s_config
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+CFLAGS="%{optflags} -fno-strict-aliasing"
CC=gcc
export CFLAGS CXXFLAGS CC
#
@@ -88,88 +76,77 @@
#
mkdir ../build_nptl
cd ../build_nptl
-../dist/configure \
+../dist/configure --prefix=%{_prefix} \
--libdir=%{_libdir} --enable-compat185 --disable-dump185 \
- --enable-java --enable-shared --enable-static --enable-rpc
--disable-cxx \
- --with-mutex="POSIX/pthreads/library" JAVACFLAGS="-source 1.4
-target 1.4"\
+ --enable-shared --disable-static --enable-rpc --enable-cxx \
+ --with-mutex="POSIX/pthreads/library" \
+ --enable-java JAVACFLAGS="-source 1.4 -target 1.4" \
+%ifarch %arm
+ %{_target_cpu}-suse-linux-gnueabi
+%else
%{_target_cpu}-suse-linux
+%endif
# Make sure O_DIRECT is really disabled (build host could have old kernel)
perl -pi -e 's/#define HAVE_O_DIRECT 1/#undef HAVE_O_DIRECT/' db_config.h
# Remove libtool predep_objects and postdep_objects wonkiness
perl -pi -e 's/^predep_objects=".*$/predep_objects=""/' libtool
perl -pi -e 's/^postdep_objects=".*$/postdep_objects=""/' libtool
perl -pi -e 's/-shared -nostdlib/-shared/' libtool
-make LIBSO_LIBS='$(LIBS)' LIBXSO_LIBS='$(LIBS)'" -L%{_libdir} -lstdc++"
+
+make %{?_smp_mflags} LIBSO_LIBS='$(LIBS)' LIBXSO_LIBS='$(LIBS)'" -L%{_libdir}
-lstdc++"

%install
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/db4
-#mkdir -p ${RPM_BUILD_ROOT}% {source_dir}/
-#
-#cp % {_builddir}/% {generic_name}-% {version}.tar.bz2 ${RPM_BUILD_ROOT}%
{source_dir}/
-#mkdir -p $RPM_BUILD_ROOT/% {_defaultdocdir}/% {name}-source
-#cat >>$RPM_BUILD_ROOT/% {_defaultdocdir}/% {name}-source/README<<EOF
-#The patches in this directory were applied to the sources.
-#The sources were installed to:
-#% {source_dir}/% {generic_name}-% {version}.tar.bz2
-#EOF
+mkdir -p %{buildroot}%{_includedir}/db4
CONFIG_ARGS=$(find . -name "config.log" -exec grep "\$ \.\./dist\/configure"
{} \; | sed 's/.*configure\( --.*\)/\1/g')
if [ -z "$CONFIG_ARGS" ]
then
echo "could not find configure arguments ... exiting"
exit 42
fi
-#echo $CONFIG_ARGS >> $RPM_BUILD_ROOT/% {_defaultdocdir}/%
{name}-source/configure_args.txt
-#cp % {_sourcedir}/*patch* $RPM_BUILD_ROOT/% {_defaultdocdir}/% {name}-source
|| true
-#cp % {_sourcedir}/*.dif* $RPM_BUILD_ROOT/% {_defaultdocdir}/% {name}-source
|| true
-#
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}
+mkdir -p %{buildroot}%{_libdir}
cd build_nptl
-make prefix=${RPM_BUILD_ROOT}%{_prefix} libdir=${RPM_BUILD_ROOT}%{_libdir}
strip=true install
+make prefix=%{buildroot}%{_prefix} libdir=%{buildroot}%{_libdir} strip=true
install
cd ..
# make ldd happy:
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libdb*.so
+chmod 755 %{buildroot}%{_libdir}/libdb*.so
# Fix header file installation
-mv ${RPM_BUILD_ROOT}%{_includedir}/*.h ${RPM_BUILD_ROOT}%{_includedir}/db4
-echo "#include <db4/db.h>" > ${RPM_BUILD_ROOT}%{_includedir}/db.h
-echo "#include <db4/db_185.h>" > ${RPM_BUILD_ROOT}%{_includedir}/db_185.h
-rm -f ${RPM_BUILD_ROOT}%{_includedir}/db4/db_cxx.h
+mv %{buildroot}%{_includedir}/*.h %{buildroot}%{_includedir}/db4
+echo "#include <db4/db.h>" > %{buildroot}%{_includedir}/db.h
+echo "#include <db4/db_185.h>" > %{buildroot}%{_includedir}/db_185.h
+echo "#include <db4/db_cxx.h>" > %{buildroot}%{_includedir}/db_cxx.h
# remove dangling tags symlink from examples.
rm -f examples_cxx/tags
rm -f examples_c/tags
# Move documentation to the right directory
-mkdir -p $RPM_BUILD_ROOT%{docdir}
-mv $RPM_BUILD_ROOT%{_prefix}/docs/* $RPM_BUILD_ROOT/%{docdir}
-cp -a examples_cxx examples_c $RPM_BUILD_ROOT/%{docdir}
-cp -a LICENSE README $RPM_BUILD_ROOT/%{docdir}
+mkdir -p %{buildroot}%{docdir}
+mv %{buildroot}%{_prefix}/docs/* %{buildroot}/%{docdir}
+cp -a examples_cxx examples_c %{buildroot}/%{docdir}
+cp -a LICENSE README %{buildroot}/%{docdir}
#
# Remove api documentation for Java and TCL
-rm -rf $RPM_BUILD_ROOT/%{docdir}/java
-rm -rf $RPM_BUILD_ROOT/%{docdir}/api_java
-rm -rf $RPM_BUILD_ROOT/%{docdir}/api_tcl
-mv $RPM_BUILD_ROOT/%{docdir}/collections/tutorial $RPM_BUILD_ROOT/%{docdir}/
+rm -rf %{buildroot}/%{docdir}/java
+rm -rf %{buildroot}/%{docdir}/api_java
+rm -rf %{buildroot}/%{docdir}/api_tcl
+mv %{buildroot}/%{docdir}/collections/tutorial %{buildroot}/%{docdir}/
# Remove crappy *.la files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/tls/*.la
-pushd $RPM_BUILD_ROOT
-for file in `find | grep -v "\(java\|jar\)"`;
+rm -rf %{buildroot}%{_libdir}/*.la
+rm -rf %{buildroot}%{_libdir}/tls/*.la
+pushd %{buildroot}
+for file in `find | grep -v "\(java\|jar\)"`
do
- rm $file || true;
+ rm $file || true
done
-rm -rf $RPM_BUILD_ROOT/%{_defaultdocdir}
-mkdir -p $RPM_BUILD_ROOT/%{_javadir}
-mv $RPM_BUILD_ROOT/%{_libdir}/*.jar
$RPM_BUILD_ROOT/%{_javadir}/db-%{version}.jar
-ln -sf %{_javadir}/db-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/db.jar
-find . -type d -exec rmdir {} \; || true
-find . -type d -exec rmdir {} \; || true
-find . -type d -exec rmdir {} \; || true
-find . -type d -exec rmdir {} \; || true
+rm -rf %{buildroot}/%{_defaultdocdir}
+mkdir -p %{buildroot}/%{_javadir}
+mv %{buildroot}/%{_libdir}/*.jar %{buildroot}/%{_javadir}/db-%{version}.jar
+ln -sf %{_javadir}/db-%{version}.jar %{buildroot}/%{_javadir}/db.jar

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}

%files
%defattr(-,root,root)
@@ -179,8 +156,7 @@
%files devel
%defattr(-,root,root)
%{_libdir}/*_g.so
-%{_libdir}/*-%{major}.so
-%{_libdir}/*.a
%{_libdir}/libdb_java.so
+%{_libdir}/libdb_java-%{major}.so

%changelog

++++++ db-4.5.20-rep.patch ++++++
Index: rep/rep_method.c
===================================================================
--- rep/rep_method.c.orig
+++ rep/rep_method.c
@@ -526,10 +526,12 @@ __rep_start(dbenv, dbt, flags)
* will allow the client to either perform recovery or
* simply join in.
*/
- if (announce)
+ if (announce) {
+ if ((ret = __dbt_usercopy(dbenv, dbt)) != 0)
+ goto err;
(void)__rep_send_message(dbenv,
DB_EID_BROADCAST, REP_NEWCLIENT, NULL, dbt, 0, 0);
- else
+ } else
(void)__rep_send_message(dbenv,
DB_EID_BROADCAST, REP_ALIVE_REQ, NULL, NULL, 0, 0);
}
@@ -553,6 +555,7 @@ err: REP_SYSTEM_UNLOCK(dbenv);
}
if (pending_event != DB_EVENT_NO_SUCH_EVENT)
DB_EVENT(dbenv, pending_event, NULL);
+ __dbt_userfree(dbenv, dbt, NULL, NULL);
return (ret);
}

Index: rep/rep_record.c
===================================================================
--- rep/rep_record.c.orig
+++ rep/rep_record.c
@@ -163,6 +163,14 @@ __rep_process_message(dbenv, control, re
return (EINVAL);
}

+ if ((ret = __dbt_usercopy(dbenv, control)) != 0 ||
+ (ret = __dbt_usercopy(dbenv, rec)) != 0) {
+ __dbt_userfree(dbenv, control, rec, NULL);
+ __db_errx(dbenv,
+ "DB_ENV->rep_process_message: error retrieving DBT contents");
+ return ret;
+ }
+
ret = 0;
db_rep = dbenv->rep_handle;
rep = db_rep->region;
@@ -621,6 +629,7 @@ out:
*ret_lsnp = rp->lsn;
ret = DB_REP_NOTPERM;
}
+ __dbt_userfree(dbenv, control, rec, NULL);
return (ret);
}

++++++ db-4.5.20-sequence.patch ++++++
Index: sequence/sequence.c
===================================================================
--- sequence/sequence.c.orig
+++ sequence/sequence.c
@@ -228,6 +228,9 @@ __seq_open_pp(seq, txn, keyp, flags)
seq->seq_data.ulen = seq->seq_data.size = sizeof(seq->seq_record);
seq->seq_rp = &seq->seq_record;

+ if ((ret = __dbt_usercopy(dbenv, keyp)) != 0)
+ goto err;
+
memset(&seq->seq_key, 0, sizeof(DBT));
if ((ret = __os_malloc(dbenv, keyp->size, &seq->seq_key.data)) != 0)
goto err;
@@ -365,6 +368,7 @@ err: if (txn_local &&
ret = t_ret;

ENV_LEAVE(dbenv, ip);
+ __dbt_userfree(dbenv, keyp, NULL, NULL);
return (ret);
}

@@ -765,6 +769,10 @@ __seq_get_key(seq, key)
{
SEQ_ILLEGAL_BEFORE_OPEN(seq, "DB_SEQUENCE->get_key");

+ if (F_ISSET(key, DB_DBT_USERCOPY))
+ return (__db_retcopy(seq->seq_dbp->dbenv, key,
+ seq->seq_key.data, seq->seq_key.size, NULL, 0));
+
key->data = seq->seq_key.data;
key->size = key->ulen = seq->seq_key.size;
key->flags = seq->seq_key.flags;
++++++ db-4.5.20.dif -> db-4.5.20.patch ++++++
--- openSUSE:Factory/libdb-4_5/db-4.5.20.dif 2011-09-23 02:07:59.000000000
+0200
+++ /mounts/work_src_done/STABLE/libdb-4_5/db-4.5.20.patch 2011-09-28
18:37:23.000000000 +0200
@@ -1,4 +1,6 @@
---- btree/bt_compact.c
+Index: btree/bt_compact.c
+===================================================================
+--- btree/bt_compact.c.orig
+++ btree/bt_compact.c
@@ -388,7 +388,7 @@ __bam_compact_int(dbc, start, stop, fact
DB *dbp;
@@ -9,7 +11,9 @@
EPG *epg;
DB_MPOOLFILE *dbmp;
PAGE *pg, *ppg, *npg;
---- dist/Makefile.in
+Index: dist/Makefile.in
+===================================================================
+--- dist/Makefile.in.orig
+++ dist/Makefile.in
@@ -139,8 +139,8 @@ libtso_major= $(libtso_base)-$(LIBMAJOR)
# local libraries, for example. Do that by adding -I options to the DB185INC
@@ -22,7 +26,9 @@

##################################################
# NOTHING BELOW THIS LINE SHOULD EVER NEED TO BE MODIFIED.
---- dist/aclocal/libtool.ac
+Index: dist/aclocal/libtool.ac
+===================================================================
+--- dist/aclocal/libtool.ac.orig
+++ dist/aclocal/libtool.ac
@@ -2820,8 +2820,8 @@ if test "$GXX" = yes; then
# Check if GNU C++ uses GNU ld as the underlying linker, since the
@@ -35,7 +41,9 @@

_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
---- dist/configure.ac
+Index: dist/configure.ac
+===================================================================
+--- dist/configure.ac.orig
+++ dist/configure.ac
@@ -747,15 +747,15 @@ LTLIBOBJS=`echo "$LIB@&t@OBJS" |
AC_SUBST(LTLIBOBJS)

++++++ getpatches ++++++
--- /var/tmp/diff_new_pack.Z625fU/_old 2011-10-02 10:14:23.000000000 +0200
+++ /var/tmp/diff_new_pack.Z625fU/_new 2011-10-02 10:14:23.000000000 +0200
@@ -8,4 +8,3 @@

wget
http://www.oracle.com/technology/products/berkeley-db/db/update/$VERSION/patch.$VERSION.html
-r -l1
for file in `find www.oracle.com/ -name "patch\.*" | grep -v html`; do cp
$file .; done
-

continue with "q"...



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages