Hello community, here is the log from the commit of package Xerces-c checked in at Fri Aug 15 01:31:56 CEST 2008. -------- --- Xerces-c/Xerces-c.changes 2008-04-07 18:57:37.000000000 +0200 +++ Xerces-c/Xerces-c.changes 2008-08-14 16:15:44.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 14 16:14:35 CEST 2008 - prusnak@suse.cz + +- cleaned spec file (and renamed libXerces-c-28 to libXerces-c28) + +------------------------------------------------------------------- Old: ---- xerces-c-src_2_7_0-lib64.patch xerces-c-src_2_7_0-rpmoptflags.patch xerces-gcc34.patch New: ---- Xerces-c-2.8.0-gcc34.patch Xerces-c-2.8.0-lib64.patch Xerces-c-2.8.0-optflags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Xerces-c.spec ++++++ --- /var/tmp/diff_new_pack.D29303/_old 2008-08-15 01:18:24.000000000 +0200 +++ /var/tmp/diff_new_pack.D29303/_new 2008-08-15 01:18:24.000000000 +0200 @@ -2,32 +2,38 @@ # spec file for package Xerces-c (Version 2.8.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild - -Name: Xerces-c -BuildRequires: gcc-c++ libicu-devel %define tarversion 2_8_0 %define sversion 28 %define tarname xerces-c-src_%{tarversion} + +Name: Xerces-c +BuildRequires: gcc-c++ libicu-devel License: The Apache Software License Group: Productivity/Publishing/XML AutoReqProv: on Version: 2.8.0 -Release: 1 +Release: 24 Summary: A Validating XML Parser -Url: http://xml.apache.org/xerces-c/ -Source: xerces-c-src_%{tarversion}.tar.bz2 -Patch: xerces-c-src_2_7_0-lib64.patch -Patch1: xerces-gcc34.patch -Patch2: xerces-c-src_2_7_0-rpmoptflags.patch -#Patch3: xerces-c-src_%{tarversion}-endelementfix.patch +Url: http://xerces.apache.org/xerces-c/ +Source: %{tarname}.tar.bz2 +Patch0: %{name}-%{version}-lib64.patch +Patch1: %{name}-%{version}-gcc34.patch +Patch2: %{name}-%{version}-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,13 +50,15 @@ -------- The Apache Group <apache@apache.org> -%package -n libXerces-c-28 +%package -n libXerces-c28 License: The Apache Software License -#Requires: Xerces-c = %{version} +# Requires: Xerces-c = %{version} Group: Productivity/Publishing/XML Summary: Shared libraries for Xerces-c - a validating XML parser +Provides: libXerces-c-28 = %{version} +Obsoletes: libXerces-c-28 < %{version} -%description -n libXerces-c-28 +%description -n libXerces-c28 Xerces-C is a validating XML parser written in a portable subset of C++. Xerces-C makes it easy to give your application the ability to read and write XML data. A shared library is provided for parsing, @@ -68,7 +76,7 @@ %package -n libXerces-c-devel License: The Apache Software License -Requires: libXerces-c-28 = %{version} +Requires: libXerces-c28 = %{version} Provides: Xerces-c-devel = 2.6.0 Obsoletes: Xerces-c-devel <= 2.6.0 Group: Development/Libraries/C and C++ @@ -90,16 +98,15 @@ %prep %setup -q -n xerces-c-src_%{tarversion} -%patch0 -p1 -b .lib64 -%patch1 -p1 -b .gcc34 -%patch2 -b .rpmoptflags -#%patch3 +%patch0 +%patch1 +%patch2 %build DIRS=$(find -type d) %{?suse_update_config:%{suse_update_config -f $DIRS}} export XERCESCROOT=$RPM_BUILD_DIR/%{tarname} -export ICUROOT=/usr +export ICUROOT=%{_prefix} export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" cd $XERCESCROOT/src/xercesc autoreconf --install --force @@ -108,44 +115,44 @@ %else BITSTOBUILD=32 %endif -./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -ticu -b "$BITSTOBUILD" -P /usr -C --libdir=%_libdir -make +./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -ticu -b "$BITSTOBUILD" -P %{_prefix} -C --libdir=%{_libdir} +make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT export XERCESCROOT=$RPM_BUILD_DIR/%{tarname} -export ICUROOT=/usr +export ICUROOT=%{_prefix} cd $XERCESCROOT/src/xercesc make install PREFIX=$RPM_BUILD_ROOT PREFIX_INCLUDE=$RPM_BUILD_ROOT/%{_includedir}/xercesc -(cd $RPM_BUILD_ROOT%{_libdir} && rm -f libxerces-c.so.%{sversion} && ln -s libxerces-c.so.%{sversion}.0 libxerces-c.so.%{sversion}) -(cd $RPM_BUILD_ROOT%{_libdir} && rm -f libxerces-c.so && ln -s libxerces-c.so.%{sversion}.0 libxerces-c.so) -(cd $RPM_BUILD_ROOT%{_libdir} && rm -f libxerces-depdom.so.%{sversion} && ln -s libxerces-depdom.so.%{sversion}.0 libxerces-depdom.so.%{sversion}) -(cd $RPM_BUILD_ROOT%{_libdir} && rm -f libxerces-depdom.so && ln -s libxerces-depdom.so.%{sversion}.0 libxerces-depdom.so) +# fix libs +cd $RPM_BUILD_ROOT%{_libdir} +for lib in libxerces-c libxerces-depdom; do + ln -sf $lib.so.%{sversion}.0 $lib.so.%{sversion} + ln -sf $lib.so.%{sversion}.0 $lib.so +done %clean -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; -# --------------------------------------------------------------------------- +rm -rf $RPM_BUILD_ROOT -%post -n libXerces-c-28 -p /sbin/ldconfig +%post -n libXerces-c28 -p /sbin/ldconfig -%postun -n libXerces-c-28 -p /sbin/ldconfig +%postun -n libXerces-c28 -p /sbin/ldconfig %files %defattr(-, root, root) -%doc LICENSE.txt Readme.html +%doc LICENSE LICENSE.txt Readme.html credits.txt -%files -n libXerces-c-28 +%files -n libXerces-c28 %defattr(-, root, root) -%{_libdir}/libxerces-c.so.* -%{_libdir}/libxerces-depdom.so.* +%{_libdir}/*.so.* %files -n libXerces-c-devel %defattr(-,root,root) -%{_libdir}/libxerces-c.so -%{_libdir}/libxerces-depdom.so -%{_includedir}/xercesc/ +%{_includedir}/xercesc +%{_libdir}/*.so %changelog +* Thu Aug 14 2008 prusnak@suse.cz +- cleaned spec file (and renamed libXerces-c-28 to libXerces-c28) * Mon Apr 07 2008 zpetrova@suse.CZ - update to version 2.8.0 - this version should fix large number of bugs. ++++++ Xerces-c-2.8.0-gcc34.patch ++++++ --- src/xercesc/util/RefArrayOf.c +++ src/xercesc/util/RefArrayOf.c @@ -25,6 +25,7 @@ #if defined(XERCES_TMPLSINC) #include <xercesc/util/RefArrayOf.hpp> #endif +#include <xercesc/framework/MemoryManager.hpp> XERCES_CPP_NAMESPACE_BEGIN ++++++ Xerces-c-2.8.0-lib64.patch ++++++ --- obj/Makefile.in +++ obj/Makefile.in @@ -253,7 +253,7 @@ ifeq (${OS390BATCH},1) @echo "Nothing to do for OS390BATCH ..." else - -mkdir -p ${DESTDIR}${PREFIX}/lib + -mkdir -p ${DESTDIR}${PREFIX}/@libdir@ ifeq (${LIBTYPE},shared) ifeq (${PLATFORM}, CYGWIN) -mkdir -p ${DESTDIR}${PREFIX}/bin @@ -265,10 +265,10 @@ $(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_DEPDOM}.a; rm -f libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a) else - $(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib + $(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/@libdir@ (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME}) - $(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib + $(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/@libdir@ (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM}) endif ifeq (${PLATFORM},OS390) @@ -276,8 +276,8 @@ $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib endif else # shared - $(CP) ${FQ_A_NAME} ${DESTDIR}$(PREFIX)/lib - $(CP) ${FQ_A_DEPDOM} ${DESTDIR}$(PREFIX)/lib + $(CP) ${FQ_A_NAME} ${DESTDIR}$(PREFIX)/@libdir@ + $(CP) ${FQ_A_DEPDOM} ${DESTDIR}$(PREFIX)/@libdir@ endif endif --- samples/Makefile.incl +++ samples/Makefile.incl @@ -196,7 +196,7 @@ CMP= -c ${CXXFLAGS} -qnotempinc CC= ${COMPILER} -c -D${PLATFORM} LINK = ${COMPILER} ${LDFLAGS} - PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib + PLATFORM_LIB_LINK_OPTIONS=-L${LIB_DIR} EXTRA_LINK_OPTIONS=${EXTRA_LIBS} ifneq (${THREADS},none) @@ -206,7 +206,7 @@ CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -fpic LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS} - PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib + PLATFORM_LIB_LINK_OPTIONS=-L${LIB_DIR} EXTRA_LINK_OPTIONS=${EXTRA_LIBS} ifneq (${THREADS},none) ++++++ Xerces-c-2.8.0-optflags.patch ++++++ --- src/xercesc/runConfigure +++ src/xercesc/runConfigure @@ -297,9 +297,9 @@ elif test $platform = "os390"; then debugflag="-DNDEBUG"; elif test $platform = "linux"; then - debugflag="-w -O2 -DNDEBUG"; + debugflag="$RPM_OPT_FLAGS"; else - debugflag="-w -O -DNDEBUG"; + debugflag="$RPM_OPT_FLAGS"; fi else echo "OVERRIDE FOR OS400 ON AIX" ++++++ xerces-c-src_2_8_0.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org