Author: glen Date: Tue Sep 22 22:41:34 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fix build with icu 4.2; rel 6
---- Files affected:
packages/xalan-c:
xalan-c.spec (1.46 -> 1.47) , icu-4.2.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/xalan-c/xalan-c.spec
diff -u packages/xalan-c/xalan-c.spec:1.46 packages/xalan-c/xalan-c.spec:1.47
--- packages/xalan-c/xalan-c.spec:1.46 Mon Sep 29 21:23:57 2008
+++ packages/xalan-c/xalan-c.spec Wed Sep 23 00:41:29 2009
@@ -1,20 +1,21 @@
# $Revision$, $Date$
-%define _ver %(echo %{version} | tr . _)
+%define ver %(echo %{version} | tr . _)
Summary: C++ xslt library
Summary(pl.UTF-8): Biblioteka xslt dla C++
Name: xalan-c
Version: 1.10.0
-Release: 5
+Release: 6
License: Apache v2.0
Group: Applications/Publishing/XML
-Source0:
http://www.apache.org/dist/xml/xalan-c/Xalan-C_%{_ver}-src.tar.gz
+Source0: http://www.apache.org/dist/xml/xalan-c/Xalan-C_%{ver}-src.tar.gz
# Source0-md5: 0a3fbb535885531cc544b07a2060bfb1
Patch0: %{name}-getopt.patch
Patch1: %{name}-soname.patch
Patch2: %{name}-include.patch
-URL: http://xalan.apache.org/
+Patch3: icu-4.2.patch
+URL: http://xml.apache.org/xalan-c/
BuildRequires: icu
-BuildRequires: libicu-devel
+BuildRequires: libicu-devel >= 4.2
BuildRequires: util-linux
BuildRequires: xerces-c-devel >= 2.7.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -71,24 +72,29 @@
Przykłady dla xalan-c.
%prep
-%setup -q -n xml-xalan
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -qc
+mv xml-xalan/c/* .
+%patch0 -p2
+%patch1 -p2
+%patch2 -p2
+%patch3 -p1
%if "%{_lib}" != "lib"
-sed -i s#/lib/icu/Makefile.inc#/%{_lib}/icu/Makefile.inc# \
- c/src/xalanc/Utils/Makefile.in
+sed -i -e 's#/lib/icu/pkgdata.inc#/%{_lib}/icu/pkgdata.inc#' \
+ src/xalanc/Utils/Makefile.in
%endif
-find c/{xdocs,samples} -name CVS | xargs rm -rf
+find xdocs samples -name CVS | xargs rm -rf
%build
-cd c
+# create env.sh for easier debug from console
+cat << EOF > env.sh
export XALANCROOT=$(pwd)
export XERCESROOT=%{_prefix}
export ICUROOT=%{_prefix}
-export XALAN_USE_ICU=true
+EOF
+
+. ./env.sh
./runConfigure \
-P %{_prefix} \
@@ -103,15 +109,15 @@
-t icu \
-m icu
-# tries to link testXSLT before libxalan-c.so symlink is created
-%{__make} -j1
+# force 1 jobserver: tries to link testXSLT before libxalan-c.so symlink is
created.
+# having XALAN_USE_ICU set on install will copy libicu libs to xalan install
+# root, so set it on build only.
+%{__make} -j1 \
+ XALAN_USE_ICU=true
%install
rm -rf $RPM_BUILD_ROOT
-cd c
-export XALANCROOT=$(pwd)
-export XERCESROOT=%{_prefix}
-export ICUROOT=%{_prefix}
+. ./env.sh
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -136,12 +142,12 @@
%files
%defattr(644,root,root,755)
+%doc commits.xml KEYS NOTICE
%attr(755,root,root) %{_bindir}/Xalan
%attr(755,root,root) %{_libdir}/libxalan-c.so.*.*
%attr(755,root,root) %{_libdir}/libxalanMsg.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libxalan-c.so.110
%attr(755,root,root) %ghost %{_libdir}/libxalanMsg.so.110
-%doc c/commits.xml c/KEYS c/NOTICE
%files devel
%defattr(644,root,root,755)
@@ -163,6 +169,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2009/09/22 22:41:29 glen
+- fix build with icu 4.2; rel 6
+
Revision 1.46 2008/09/29 19:23:57 qboosh
- no extra nl
================================================================
Index: packages/xalan-c/icu-4.2.patch
diff -u /dev/null packages/xalan-c/icu-4.2.patch:1.1
--- /dev/null Wed Sep 23 00:41:34 2009
+++ packages/xalan-c/icu-4.2.patch Wed Sep 23 00:41:29 2009
@@ -0,0 +1,15 @@
+--- xml-xalan/src/xalanc/Utils/Makefile.in~ 2009-09-23 00:58:28.000000000
+0300
++++ xml-xalan/src/xalanc/Utils/Makefile.in 2009-09-23 00:58:31.692161855
+0300
+@@ -99,9 +99,9 @@
+ locale: $(XSL_NLS_DIR)/icu/$(LOCALE).txt $(MESSAGELIB)
+
+ $(MESSAGELIB) : $(XSL_NLS_DIR)/icu/$(LOCALE).txt
+- $(GENRB) -p $(LOC_PROJECT_NAME) -d $(XSL_NLS_DIR)/icu -i
$(XSL_NLS_DIR)/icu $(XSL_NLS_DIR)/icu/$(LOCALE).txt
+- echo $(XSL_NLS_DIR)/icu/$(LOC_PROJECT_NAME)_$(LOCALE).res >
$(XSL_NLS_DIR)/icu/res-file-list.txt
+- $(PKGDATA) --name $(LOC_PROJECT_NAME) -T $(XSL_NLS_DIR)/icu -v -O
$(ICUROOT)/lib/icu/Makefile.inc --mode dll -d $(XSL_LIB_DIR)
$(XSL_NLS_DIR)/icu/res-file-list.txt -M "prefix=$(ICUROOT) TARGET=$(LOC_LIB)
BIR_LDFLAGS=\"-Bsymbolic
-Wl,-soname,$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)\""
++ $(GENRB) -d $(XSL_NLS_DIR)/icu -i $(XSL_NLS_DIR)/icu
$(XSL_NLS_DIR)/icu/$(LOCALE).txt
++ echo $(XSL_NLS_DIR)/icu/$(LOCALE).res >
$(XSL_NLS_DIR)/icu/res-file-list.txt
++ $(PKGDATA) --name $(LOC_PROJECT_NAME) -T $(XSL_NLS_DIR)/icu -v -O
$(ICUROOT)/lib/icu/pkgdata.inc --mode dll -d $(XSL_LIB_DIR)
$(XSL_NLS_DIR)/icu/res-file-list.txt -r $(LIB_MAJOR_VER).0
+ $(LN) -fs $(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
+ ifeq ($(PLATFORM), AIX)
+ $(LN) -fs $(LOC_LIB)
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(LIB_MAJOR_VER)$(SHLIBSUFFIX)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xalan-c/xalan-c.spec?r1=1.46&r2=1.47&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
