rpms/db4/devel db4.spec,1.62,1.63
Jindrich Novy
jnovy at fedoraproject.org
Wed Sep 10 18:51:30 UTC 2008
Author: jnovy
Update of /cvs/pkgs/rpms/db4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7091
Modified Files:
db4.spec
Log Message:
* Wed Sep 10 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-4
- actually apply the .jni patch
- fix permissions in db4-utils package (#225675)
Index: db4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/db4/devel/db4.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- db4.spec 20 Aug 2008 12:33:23 -0000 1.62
+++ db4.spec 10 Sep 2008 18:50:59 -0000 1.63
@@ -5,7 +5,7 @@
Summary: The Berkeley DB database library (version 4) for C
Name: db4
Version: 4.7.25
-Release: 3%{?dist}
+Release: 4%{?dist}
Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
Patch1: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1
@@ -130,44 +130,44 @@
%patch14 -p1 -b .errno
popd
-#%patch22 -p1 -b .4.5.20.jni
+%patch22 -p1 -b .4.5.20.jni
# Remove tags files which we don't need.
find . -name tags | xargs rm -f
# Define a shell function for fixing HREF references in the docs, which
# would otherwise break when we split the docs up into subpackages.
fixup_href() {
- for doc in $@ ; do
- chmod u+w ${doc}
- sed -e 's,="../api_c/,="../../%{name}-devel-%{version}/api_c/,g' \
- -e 's,="api_c/,="../%{name}-devel-%{version}/api_c/,g' \
- -e 's,="../api_cxx/,="../../%{name}-devel-%{version}/api_cxx/,g' \
- -e 's,="api_cxx/,="../%{name}-devel-%{version}/api_cxx/,g' \
- -e 's,="../api_tcl/,="../../%{name}-devel-%{version}/api_tcl/,g' \
- -e 's,="api_tcl/,="../%{name}-devel-%{version}/api_tcl/,g' \
- -e 's,="../java/,="../../%{name}-devel-%{version}/java/,g' \
- -e 's,="java/,="../%{name}-devel-%{version}/java/,g' \
- -e 's,="../examples_c/,="../../%{name}-devel-%{version}/examples_c/,g' \
- -e 's,="examples_c/,="../%{name}-devel-%{version}/examples_c/,g' \
- -e 's,="../examples_cxx/,="../../%{name}-devel-%{version}/examples_cxx/,g' \
- -e 's,="examples_cxx/,="../%{name}-devel-%{version}/examples_cxx/,g' \
- -e 's,="../ref/,="../../%{name}-devel-%{version}/ref/,g' \
- -e 's,="ref/,="../%{name}-devel-%{version}/ref/,g' \
- -e 's,="../images/,="../../%{name}-devel-%{version}/images/,g' \
- -e 's,="images/,="../%{name}-devel-%{version}/images/,g' \
- -e 's,="../utility/,="../../%{name}-utils-%{version}/utility/,g' \
- -e 's,="utility/,="../%{name}-utils-%{version}/utility/,g' ${doc} > ${doc}.new
- touch -r ${doc} ${doc}.new
- cat ${doc}.new > ${doc}
- touch -r ${doc}.new ${doc}
- rm -f ${doc}.new
- done
+ for doc in $@ ; do
+ chmod u+w ${doc}
+ sed -e 's,="../api_c/,="../../%{name}-devel-%{version}/api_c/,g' \
+ -e 's,="api_c/,="../%{name}-devel-%{version}/api_c/,g' \
+ -e 's,="../api_cxx/,="../../%{name}-devel-%{version}/api_cxx/,g' \
+ -e 's,="api_cxx/,="../%{name}-devel-%{version}/api_cxx/,g' \
+ -e 's,="../api_tcl/,="../../%{name}-devel-%{version}/api_tcl/,g' \
+ -e 's,="api_tcl/,="../%{name}-devel-%{version}/api_tcl/,g' \
+ -e 's,="../java/,="../../%{name}-devel-%{version}/java/,g' \
+ -e 's,="java/,="../%{name}-devel-%{version}/java/,g' \
+ -e 's,="../examples_c/,="../../%{name}-devel-%{version}/examples_c/,g' \
+ -e 's,="examples_c/,="../%{name}-devel-%{version}/examples_c/,g' \
+ -e 's,="../examples_cxx/,="../../%{name}-devel-%{version}/examples_cxx/,g' \
+ -e 's,="examples_cxx/,="../%{name}-devel-%{version}/examples_cxx/,g' \
+ -e 's,="../ref/,="../../%{name}-devel-%{version}/ref/,g' \
+ -e 's,="ref/,="../%{name}-devel-%{version}/ref/,g' \
+ -e 's,="../images/,="../../%{name}-devel-%{version}/images/,g' \
+ -e 's,="images/,="../%{name}-devel-%{version}/images/,g' \
+ -e 's,="../utility/,="../../%{name}-utils-%{version}/utility/,g' \
+ -e 's,="utility/,="../%{name}-utils-%{version}/utility/,g' ${doc} > ${doc}.new
+ touch -r ${doc} ${doc}.new
+ cat ${doc}.new > ${doc}
+ touch -r ${doc}.new ${doc}
+ rm -f ${doc}.new
+ done
}
-set +x # XXX painful to watch
+set +x
# Fix all of the HTML files.
fixup_href `find . -name "*.html"`
-set -x # XXX painful to watch
+set -x
cd dist
./s_config
@@ -181,8 +181,8 @@
build() {
test -d dist/$1 || mkdir dist/$1
# Static link db_dump185 with old db-185 libraries.
- /bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS -Idb.1.85/PORT/%{_os}/include -D_REENTRANT -c db_dump185/db_dump185.c -o dist/$1/db_dump185.lo
- /bin/sh libtool --mode=link %{__cc} -o dist/$1/db_dump185 dist/$1/db_dump185.lo db.1.85/PORT/%{_os}/libdb.a
+ /bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS -Idb.1.85/PORT/%{_os}/include -D_REENTRANT -c db_dump185/db_dump185.c -o dist/$1/db_dump185.lo
+ /bin/sh libtool --mode=link %{__cc} -o dist/$1/db_dump185 dist/$1/db_dump185.lo db.1.85/PORT/%{_os}/libdb.a
pushd dist
popd
@@ -214,12 +214,12 @@
perl -pi -e 's/^postdep_objects=".*$/postdep_objects=""/' libtool
perl -pi -e 's/-shared -nostdlib/-shared/' libtool
- make %{?_smp_mflags}
+ make %{?_smp_mflags}
# XXX hack around libtool not creating ./libs/libdb_java-X.Y.lai
LDBJ=./.libs/libdb_java-%{__soversion}.la
if test -f ${LDBJ} -a ! -f ${LDBJ}i; then
- sed -e 's,^installed=no,installed=yes,' < ${LDBJ} > ${LDBJ}i
+ sed -e 's,^installed=no,installed=yes,' < ${LDBJ} > ${LDBJ}i
fi
popd
@@ -252,7 +252,7 @@
touch $RPM_BUILD_ROOT/rootfile
root=..
while [ ! -e $RPM_BUILD_ROOT/%{_libdir}/${root}/rootfile ] ; do
- root=${root}/..
+ root=${root}/..
done
rm $RPM_BUILD_ROOT/rootfile
@@ -281,7 +281,7 @@
rm -rf ${RPM_BUILD_ROOT}%{_prefix}/docs
# XXX Avoid Permission denied. strip when building as non-root.
-chmod u+w ${RPM_BUILD_ROOT}%{_bindir}
+chmod u+w ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_bindir}/*
# remove unneeded .la files (#225675)
rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
@@ -366,6 +366,10 @@
%endif
%changelog
+* Wed Sep 10 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-4
+- actually apply the .jni patch
+- fix permissions in db4-utils package (#225675)
+
* Tue Aug 19 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-3
- apply upstream patch to allow replication clients to
opena sequence
More information about the fedora-extras-commits
mailing list