Mailinglist Archive: opensuse-commit (1262 mails)

< Previous

Hello community,

here is the log from the commit of package dbxml
checked in at Wed Sep 13 11:47:52 CEST 2006.

--------
--- dbxml/dbxml.changes 2006-06-15 00:38:20.000000000 +0200
+++ dbxml/dbxml.changes 2006-09-13 11:34:25.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Sep 13 11:33:48 CEST 2006 - dbornkessel@xxxxxxx
+
+- added missing dependency on xerces-c-devel
+- don't package *.la files anymore
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ dbxml.spec ++++++
--- /var/tmp/diff_new_pack.zKWhoa/_old 2006-09-13 11:47:39.000000000 +0200
+++ /var/tmp/diff_new_pack.zKWhoa/_new 2006-09-13 11:47:39.000000000 +0200
@@ -11,7 +11,7 @@
# norootforbuild

Name: dbxml
-BuildRequires: db-devel db-java ed gcc-c++ java2-devel-packages libicu-devel libpathan-devel libxquery-devel
+BuildRequires: Xerces-c-devel db-devel db-java ed gcc-c++ java2-devel-packages libicu-devel libpathan-devel libxquery-devel
##### NOTE: Versions for each packages have to be inserted as numbers ... macros forbidden!
%define db_version 4.3.29
%define dbxml_version 2.2.13
@@ -21,7 +21,7 @@
%define xerces_cvs_version 2_7_0
Summary: Berkeley DB XML
Version: 2.2.13
-Release: 16
+Release: 20
Source0: dbxml-%{dbxml_version}.tar.bz2
Source1: db-%{db_version}.tar.bz2
Source2: xerces-c-src_%{xerces_cvs_version}.tar.bz2
@@ -105,7 +105,7 @@
%package -n db-java
Summary: Java Bindings for the Berkeley DB
Version: 4.3.29
-Release: 18
+Release: 22
URL: http://www.sleepycat.com/products/xml.shtml
License: BSD
Group: Productivity/Databases/Servers
@@ -128,7 +128,7 @@
%package -n libpathan
Summary: Pathan Provides an XPath Parsing and Evaluation API
Version: 2_2.2.13.dbxml
-Release: 16
+Release: 20
URL: http://software.decisionsoft.com/pathan1Info.html
License: BSD
Group: Development/Languages/C and C++
@@ -150,7 +150,7 @@
%package -n libpathan-devel
Summary: Include Files and Libraries mandatory for Development
Version: 2_2.2.13.dbxml
-Release: 16
+Release: 20
Group: Development/Languages/C and C++
Requires: Xerces-c-devel >= %{xerces_c_version}
Requires: libpathan = %{version}
@@ -171,7 +171,7 @@
%package -n libxquery
Summary: Library Conforming with XQuery
Version: 1.2.0
-Release: 17
+Release: 21
Url: http://www.sleepycat.com/products/xml.shtml
License: BSD
Group: Development/Libraries/C and C++
@@ -187,7 +187,7 @@
Summary: Library Conforming with XQuery
Group: Development/Libraries/C and C++
Version: 1.2.0
-Release: 17
+Release: 21
Requires: libpathan-devel >= %{pathan_version}
Requires: libpathan >= %{pathan_version}
Requires: Xerces-c-devel >= %{xerces_c_version}
@@ -224,9 +224,12 @@
#% patch300
popd
%define build_dir $RPM_BUILD_DIR/%{name}-%{dbxml_version}/
+#<<< prep
+#>>> build

%build
%define installdirs $RPM_BUILD_ROOT/installdirs/
+#>>> xerces
################# first: build xerces (code stolen from Xerces-c package:
set +x
echo
@@ -256,7 +259,8 @@
popd
ln -sf lib lib64
popd
-#################
+#<<< xerces
+#>>> pathan
################# build pathan
set +x
echo
@@ -283,8 +287,8 @@
make CXXFLAGS="%{optflags} -fno-strict-aliasing"
ln -sf lib lib64
popd
-################# pathan end
-################# libxquery
+#<<< pathan
+#>>> libxquery
set +x
echo
echo ******************************************************************
@@ -333,8 +337,8 @@
perl -pi -e 's/-shared -nostdlib/-shared/' libtool
make
popd
-################# pathan end
-################# db part with Java
+#<<< libxquery
+#>>> db part with Java
set +x
echo
echo ******************************************************************
@@ -377,8 +381,8 @@
perl -pi -e 's/-shared -nostdlib/-shared/' libtool
make LIBSO_LIBS='$(LIBS)' LIBXSO_LIBS='$(LIBS)'" -L%{_libdir} -lstdc++"
popd
-################# db part with Java ends
-################# dbxml part with Java
+#<<< db part with java
+#>>> dbxml part with Java
set +x
echo
echo ******************************************************************
@@ -428,10 +432,13 @@
make
popd
popd
+#<<< dbxml part with java
+#<<< build
+#>>> install

%install
export INSTALL_DIR=`pwd`
-############################### db-java (has to be first)
+#>>> db-java (has to be first)
pushd %{DBROOT}
mkdir -p %{db_build_root}%{_includedir}/db4
mkdir -p %{db_build_root}%{_prefix}/%{_lib}
@@ -453,8 +460,8 @@
mkdir -p $RPM_BUILD_ROOT/%{_javadir}
mv $RPM_BUILD_ROOT//%{_libdir}/db.jar $RPM_BUILD_ROOT/%{_javadir}
popd
-############################### db-java end
-############################### pathan
+#<<< db-java
+#>>> pathan
pushd %{PATHANROOT}
make install prefix=%{pathan_prefix} libdir=%{pathan_build_root}/%{_libdir}
# replace path names
@@ -471,8 +478,8 @@
# move to the right directory:
cp -a %{pathan_prefix}/* $RPM_BUILD_ROOT/%{_prefix}
popd
-############################### pathan end
-############################### xquery
+#<<< pathan
+#>>> xquery
pushd %{XQUERYROOT}
cd build_unix
make install prefix=%{xquery_prefix} libdir=%{xquery_build_root}/%{_libdir} \
@@ -491,8 +498,8 @@
# move to the right directory:
cp -a %{xquery_build_root}/* $RPM_BUILD_ROOT/
popd
-############################### xquery end
-############################### dbxml
+#<<< xquery end
+#>>> dbxml
pushd %{DBXMLROOT}
cd build_unix
make install prefix=%{dbxml_build_root}/%{prefix} libdir=%{dbxml_build_root}/%{_libdir} \
@@ -504,7 +511,8 @@
mv %{dbxml_build_root}/%{_libdir}/dbxml.jar %{dbxml_build_root}/%{_javadir}
rm -f %{dbxml_build_root}/%{_libdir}/libdbxml_java-2.2_g.so
#sed -i -e "s|%{dbxml_build_root}||g" %{dbxml_build_root}/%{_libdir}/*.la
-# file list
+#<<< dbxml end
+#>>> file list
find %{dbxml_build_root}/%{prefix}/bin -type f | sed "s#%{dbxml_build_root}##g" > $INSTALL_DIR/dbxml-utils.files
find %{dbxml_build_root}/%{_libdir}/ -name "*.*a" | sed "s#%{dbxml_build_root}##g" > $INSTALL_DIR/dbxml-devel.files
# move to the right directory:
@@ -512,13 +520,21 @@
find $RPM_BUILD_ROOT/%{_defaultdocdir}/dbxml -name "*.cmd" -exec rm -rf {} \;
popd
rm -rf %{installdirs}
-############################### dbxml end
-############################### finally correct paths in *.la files
+#<<<
+# finally delete *.la files
pushd $RPM_BUILD_ROOT/%{_prefix}
-find . -name "*.la" -exec sed -i -e "s|%{installdirs}[^ ]* |%{_libdir} |g" -e "s|$RPM_BUILD_DIR[^ ]* |%{_libdir} |g" {} \;
+# old: correct la paths # find . -name "*.la" -exec sed -i -e "s|%{installdirs}[^ ]* |%{_libdir} |g" -e "s|$RPM_BUILD_DIR[^ ]* |%{_libdir} |g" {} \;
+# new
+find . -name "*.la" -delete
+# delete *.la files from file list
+sed -i -e 's/.*\.la$//g' $INSTALL_DIR/dbxml-devel.files
+sed -i -e 's/.*\.la$//g' $INSTALL_DIR/xquery-devel.files
+sed -i -e 's/.*\.la$//g' $INSTALL_DIR/pathan-devel.files
+# new end
popd
-# fix owners
rm -rf %{installdirs}
+#<<< install
+#>>> post

%post -n libpathan
/sbin/ldconfig
@@ -537,6 +553,9 @@

%postun -n libxquery
/sbin/ldconfig
+#<<< post
+#>>> files
+#>>> dbxml

%files
%defattr(-,root,root)
@@ -549,10 +568,14 @@
%{_libdir}/libdbxml-2.2.so
%{_libdir}/libdbxml_java-2.2.so
%{_javadir}/dbxml.jar
+#<<< dbxml
+#>>> dbxml-utils

%files utils -f dbxml-utils.files
%defattr(0755,root,root)
%attr(-,root,root) %doc %{_defaultdocdir}/dbxml/utility
+#<<< dbxml-utils
+#>>> dbxml-devel

%files devel -f dbxml-devel.files
%defattr(-,root,root)
@@ -578,6 +601,8 @@
%{_libdir}/libdbxml_java-2.so
%{_libdir}/libdbxml.so
%{_libdir}/libdbxml_java.so
+#<<< dbxml-devel
+#>>> libxquery / libxquery-devel / libpathan / libpathan-devel / db-java

%files -n libxquery -f xquery.files
%defattr(-,root,root)
@@ -597,11 +622,19 @@
%defattr(-,root,root)
%{_libdir}/libdb_java*
%{_javadir}/db.jar
+#<<< libxquery / libxquery-devel / libpathan / libpathan-devel / db-java
+#<<< files

%clean
rm -rf $RPM_BUILD_ROOT
+#>>> changelog
+#<<< changelog
+# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:

%changelog -n dbxml
+* Wed Sep 13 2006 - dbornkessel@xxxxxxx
+- added missing dependency on xerces-c-devel
+- don't package *.la files anymore
* Thu Jun 15 2006 - dmueller@xxxxxxx
- build parallel
* Wed May 17 2006 - schwab@xxxxxxx

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

Remember to have fun...

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

< Previous

Next >

Mailinglist Archive: opensuse-commit (1262 mails)

commit dbxml

Search this list

List Navigation

This Thread