Hello community, here is the log from the commit of package xalan-c for openSUSE:Factory checked in at 2016-05-14 12:23:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xalan-c (Old) and /work/SRC/openSUSE:Factory/.xalan-c.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xalan-c" Changes: -------- --- /work/SRC/openSUSE:Factory/xalan-c/xalan-c.changes 2015-03-12 16:38:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xalan-c.new/xalan-c.changes 2016-05-14 12:23:49.000000000 +0200 @@ -1,0 +2,19 @@ +Fri May 13 11:48:06 UTC 2016 - tchva...@suse.com + +- Cleanup a bit with spec-cleaner +- Disable ICU as no other distro does build with it +- Add patches to build with paralel make and respect ldflags +- Remove test/sample binaries instalation, not needed on resulting + systems +- Add condition for aarch64 build +- Added patches: + * fix-ftbfs-ld-as-needed.diff + * fix-testxslt-segfault.diff + * xalan-c-parallel-build.patch +- Removed patches, no longer needed: + * xalan-c-1.11-fix_build.patch + * xalan-c-1.11-fixes.patch + * xalan-c-1.11-gcc4.patch + * xalan-c-1.11-lib64.patch + +------------------------------------------------------------------- @@ -13 +31,0 @@ - Old: ---- xalan-c-1.11-fix_build.patch xalan-c-1.11-fixes.patch xalan-c-1.11-gcc4.patch xalan-c-1.11-lib64.patch New: ---- fix-ftbfs-ld-as-needed.diff fix-testxslt-segfault.diff xalan-c-parallel-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xalan-c.spec ++++++ --- /var/tmp/diff_new_pack.WFL5b8/_old 2016-05-14 12:23:50.000000000 +0200 +++ /var/tmp/diff_new_pack.WFL5b8/_new 2016-05-14 12:23:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xalan-c # -# Copyright (c) 2015 SUSE LINUX 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,26 +16,31 @@ # +%define _libname libxalan-c111 Name: xalan-c -BuildRequires: Xerces-c-devel -BuildRequires: gcc-c++ -BuildRequires: libicu-devel Version: 1.11 Release: 0 -%define tarver %{version} Summary: An XSLT Transformation Engine in C++ License: Apache-2.0 Group: Productivity/Publishing/XML Url: http://xml.apache.org/xalan-c/ -Source: http://www.eu.apache.org/dist/xalan/xalan-c/sources/xalan_c-%{tarver}-src.tar.gz -Patch1: %{name}-%{version}-lib64.patch -Patch2: %{name}-%{version}-fixes.patch -Patch3: %{name}-%{version}-optflags.patch -Patch4: %{name}-%{version}-gcc4.patch -Patch5: %{name}-%{version}-fix_build.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: http://www.eu.apache.org/dist/xalan/xalan-c/sources/xalan_c-%{version}-src.tar.gz +# PATCH-FIX-SUSE: respect suse passed cflags +Patch1: %{name}-1.11-optflags.patch +# PATCH-FIX-UPSTREAM: respect ldflags +Patch2: fix-ftbfs-ld-as-needed.diff +# PATCH-FIX-UPSTREAM: fix segfault +Patch3: fix-testxslt-segfault.diff +# PATCH-FIX-UPSTREAM: fix paralel build +Patch4: xalan-c-parallel-build.patch +BuildRequires: Xerces-c-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: libtool Provides: Xalan-C = 1.11 -Obsoletes: Xalan-C <= 1.11 +Obsoletes: Xalan-C < 1.11 +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Xalan is an XSL processor for transforming XML documents into HTML, @@ -44,14 +49,13 @@ Recommendations for XSL Transformations (XSLT) and the XML Path Language (XPath). -%package -n libxalan-c111 -# Requires: Xalan-c = %{version} +%package -n %{_libname} Summary: An XSLT Transformation Engine in C++ Group: System/Libraries Provides: libXalan-c111 = 1.11 -Obsoletes: libXalan-c111 <= 1.11 +Obsoletes: libXalan-c111 < 1.11 -%description -n libxalan-c111 +%description -n %{_libname} Xalan is an XSL processor for transforming XML documents into HTML, text, or other XML document types. Xalan-C++ represents an almost complete and robust C++ reference implementation of the W3C @@ -59,13 +63,13 @@ Language (XPath). %package -n libxalan-c-devel -Requires: libxalan-c111 = %{version} -Provides: Xalan-c-devel = 1.9 -Obsoletes: Xalan-c-devel <= 1.9 -Provides: libXalan-c-devel = 1.11 -Obsoletes: libXalan-c-devel <= 1.11 Summary: An XSLT Transformation Engine in C++ - Development Files Group: Development/Libraries/C and C++ +Requires: %{_libname} = %{version} +Provides: Xalan-c-devel = %{version} +Obsoletes: Xalan-c-devel < %{version} +Provides: libXalan-c-devel = %{version} +Obsoletes: libXalan-c-devel < %{version} %description -n libxalan-c-devel Xalan is an XSL processor for transforming XML documents into HTML, @@ -77,71 +81,47 @@ This package contains files needed for development with Xalanc %prep -%setup -q -n xalan-c-%{version} -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 +%setup -q -n %{name}-%{version}/c +%patch1 -p1 +%patch2 -p1 +%patch3 -p2 +%patch4 -p2 %build -# This package failed when testing with -Wl,-as-needed being default. -# So we disable it here, if you want to retest, just delete this comment and the line below. -export SUSE_ASNEEDED=0 -DIRS=$(find -type d) -[ -f configure.in ] && autoreconf -f -i # libtoolize --copy --force -export XERCESCROOT=%{_prefix} -export XALANCROOT=$RPM_BUILD_DIR/xalan-c-%{version}/c -export ICUROOT=%{_prefix} +autoreconf -fvi +export XALANCROOT="${PWD}" +export XERCESROOT=%{_includedir}/xercesc/ export RPM_OPT_FLAGS -cd c chmod a+x runConfigure chmod a+x conf* -%ifarch alpha ppc64 s390x sparc64 x86_64 +%ifarch alpha %{power64} s390x sparc64 x86_64 aarch64 BITSTOBUILD=64 %else BITSTOBUILD=32 %endif -./runConfigure -p linux -c gcc -x g++ -t icu -m inmem -b "$BITSTOBUILD" -P %{_prefix} -C --libdir -C %{_libdir} -# Parallel build is broken, disable it for now -make -make samples -make tests +./runConfigure -p linux -c gcc -x g++ -t default -m inmem -b "$BITSTOBUILD" -P %{_prefix} -C --libdir="%{_libdir}" +make %{?_smp_mflags} %install -export XERCESCROOT=%{_prefix} -export XALANCROOT=$RPM_BUILD_DIR/xalan-c-%{version}/c -export ICUROOT=%{_prefix} -pushd c -mkdir -p $RPM_BUILD_ROOT%{_bindir} -install -m 755 bin/* $RPM_BUILD_ROOT%{_bindir} -ln -s testXSLT $RPM_BUILD_ROOT%{_bindir}/xsl-c -ln -s testXPath $RPM_BUILD_ROOT%{_bindir}/xpath-c -echo PREFIX=$RPM_BUILD_ROOT%{_prefix} >> Makefile.incl -echo prefix=$RPM_BUILD_ROOT%{_prefix} >> Makefile.incl -echo libdir=$RPM_BUILD_ROOT%{_libdir} >> Makefile.incl -echo "XSL_LIB_DIR=\${OUTDIR}/%{_lib}" >> Makefile.incl -echo "ICULIB_LOC=\${ICUROOT}/%{_lib}" >> Makefile.incl -make install -rm -f $RPM_BUILD_ROOT%{_libdir}/libicu* -popd - -%post -n libxalan-c111 -p /sbin/ldconfig +export XALANCROOT="${PWD}" +export XERCESROOT=%{_includedir}/xercesc/ +%make_install -%postun -n libxalan-c111 -p /sbin/ldconfig +%post -n %{_libname} -p /sbin/ldconfig +%postun -n %{_libname} -p /sbin/ldconfig %files %defattr(-, root, root) -%doc c/LICENSE -%{_bindir}/* +%doc LICENSE KEYS NOTICE +%{_bindir}/Xalan -%files -n libxalan-c111 +%files -n %{_libname} %defattr(-, root, root) -%{_libdir}/*.so.* +%{_libdir}/libxalan*.so.* %files -n libxalan-c-devel %defattr(-,root,root) %{_includedir}/xalanc/ -%{_libdir}/*.so +%{_libdir}/libxalan*.so %changelog ++++++ fix-ftbfs-ld-as-needed.diff ++++++ Index: b/src/xalanc/Makefile.in =================================================================== --- a/src/xalanc/Makefile.in +++ b/src/xalanc/Makefile.in @@ -174,7 +174,7 @@ XalanExe: lib "//'$(LOADSAMP)(${BATCH_X "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ - ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) + ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< @@ -192,7 +192,7 @@ XalanExe: lib $(XSL_BIN_DIR)/Xalan $(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ - ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(OTHER_LINK_PARAMETERS) + ${EXTRA_LINK_OPTIONS} $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< endif @@ -201,7 +201,7 @@ testXSLT: lib $(XSL_BIN_DIR)/testXSLT $(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ - ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(OTHER_LINK_PARAMETERS) + ${EXTRA_LINK_OPTIONS} $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< @@ -209,7 +209,7 @@ testXPath: lib $(XSL_BIN_DIR)/testXPath $(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ - ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $(OTHER_LINK_PARAMETERS) + ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< @@ -232,7 +232,7 @@ locale: $(MAKE) -C Utils $@ $(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS) - $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $^ -o $@ $(ALLLIBS) $(OTHER_LINK_LIB_PARAMERES) + $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $^ -o $@ $(OTHER_LINK_LIB_PARAMETERS) $(ALLLIBS) ifeq ($(PLATFORM), OS390) mv *.x ${XSL_LIB_DIR} else Index: b/src/xalanc/Utils/MsgCreator/Makefile.in =================================================================== --- a/src/xalanc/Utils/MsgCreator/Makefile.in +++ b/src/xalanc/Utils/MsgCreator/Makefile.in @@ -29,7 +29,7 @@ MSG_CREATOR_SRC=$(XALANCROOT)/src/xalanc $(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS) ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \ - ${EXTRA_LINK_OPTIONS} $(LIBS) $^ -o $@ $(XERCES_LIB) $(LOC_OTHER_LINK_PARAMETERS) + ${EXTRA_LINK_OPTIONS} $^ -o $@ $(LIBS) $(XERCES_LIB) $(LOC_OTHER_LINK_PARAMETERS) $(XSL_OBJ_DIR)/%.o : $(MSG_CREATOR_SRC)/%.cpp $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< Index: b/Tests/Makefile.in =================================================================== --- a/Tests/Makefile.in +++ b/Tests/Makefile.in @@ -62,7 +62,7 @@ ThreadTest: prepare $(XSL_BIN_DIR)/Thre $(XSL_BIN_DIR)/ThreadTest: ${XSL_OBJ_DIR}/ThreadTest.o ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ - ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) + ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< @@ -70,7 +70,7 @@ Conf: prepare $(XSL_BIN_DIR)/Conf $(XSL_BIN_DIR)/Conf: ${XSL_OBJ_DIR}/conf.o ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ - ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) + ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Conf/%.cpp $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< @@ -92,7 +92,7 @@ Perf: prepare $(XSL_BIN_DIR)/Perf $(XSL_BIN_DIR)/Perf: $(PERF_OBJECTS) ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ - ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) + ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Performance/%.cpp $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< ++++++ fix-testxslt-segfault.diff ++++++ Description: Fix segfault in xalan (testXSLT). Author: William Blough <de...@blough.us> Bug-Debian: http://bugs.debian.org/718303 Forwarded: https://issues.apache.org/jira/browse/XALANC-751 Last-Update: 2013-10-14 diff --git a/c/src/xalanc/PlatformSupport/XalanLocator.hpp b/c/src/xalanc/PlatformSupport/XalanLocator.hpp index 34a7f1e..b026a40 100644 --- a/c/src/xalanc/PlatformSupport/XalanLocator.hpp +++ b/c/src/xalanc/PlatformSupport/XalanLocator.hpp @@ -91,7 +91,7 @@ public: const XalanDOMChar* theAlternateId = getEmptyPtr()) { return theLocator == 0 ? theAlternateId : (theLocator->getSystemId() ? - theLocator->getPublicId() : theAlternateId); + theLocator->getSystemId() : theAlternateId); } /** ++++++ xalan-c-parallel-build.patch ++++++ diff -urN xml-xalan.orig//c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in --- xml-xalan.orig//c/src/xalanc/Makefile.in 2010-02-23 10:51:30.058353490 +0100 +++ xml-xalan/c/src/xalanc/Makefile.in 2010-02-23 10:52:53.251679288 +0100 @@ -84,6 +84,10 @@ SAMPLES_DIR = ${XALANCROOT}/samples TESTS_DIR = ${XALANCROOT}/Tests +TESTXSLT_OBJS = ${XSL_OBJ_DIR}/process.o +XALANEXE_OBJS = ${XSL_OBJ_DIR}/XalanExe.o +TESTXPATH_OBJS = ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o + ALL_VPATH_CPP = \ $(XALANDOM_DIR):$(PLATFORMSUPPORT_DIR):$(DOMSUPPORT_DIR):$(XMLSUPPORT_DIR): \ $(XPATH_DIR):$(XERCESPARSERLIAISON_DIR):$(DEPRECATED_XERCESPARSERLIAISON_DIR):$(XALANSOURCETREE_DIR):$(XPATHCAPI_DIR): \ @@ -169,6 +173,9 @@ compile: $(ALL_OBJECTS) +$(ALL_OBJECTS) $(TESTXSLT_OBJS) $(XALANEXE_OBJS) $(TESTXPATH_OBJS): locale +locale: prepare + ifeq (${OS390BATCH},1) XalanExe: lib "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'" @@ -188,28 +195,28 @@ else # Not OS390BATCH -XalanExe: lib $(XSL_BIN_DIR)/Xalan +XalanExe: $(XSL_BIN_DIR)/Xalan -$(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o +$(XSL_BIN_DIR)/Xalan: lib ${XALANEXE_OBJS} ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ - ${EXTRA_LINK_OPTIONS} $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) + ${EXTRA_LINK_OPTIONS} ${XALANEXE_OBJS} -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< endif -testXSLT: lib $(XSL_BIN_DIR)/testXSLT +testXSLT: $(XSL_BIN_DIR)/testXSLT -$(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o +$(XSL_BIN_DIR)/testXSLT: lib ${TESTXSLT_OBJS} ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ - ${EXTRA_LINK_OPTIONS} $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) + ${EXTRA_LINK_OPTIONS} ${TESTXSLT_OBJS} -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< -testXPath: lib $(XSL_BIN_DIR)/testXPath +testXPath: $(XSL_BIN_DIR)/testXPath -$(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o +$(XSL_BIN_DIR)/testXPath: lib ${TESTXPATH_OBJS} ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ - ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) + ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${TESTXPATH_OBJS} -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS) ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<