packages: xalan-c/xalan-c.spec, xalan-c/icu-4.2.patch (REMOVED), xalan-c/xa...

[arekm]

Author: arekm                        Date: Sun Nov 14 12:46:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.11.0 snap

---- Files affected:
packages/xalan-c:
   xalan-c.spec (1.49 -> 1.50) , icu-4.2.patch (1.1 -> NONE)  (REMOVED), xalan-c-getopt.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xalan-c/xalan-c.spec
diff -u packages/xalan-c/xalan-c.spec:1.49 packages/xalan-c/xalan-c.spec:1.50
--- packages/xalan-c/xalan-c.spec:1.49	Sun Nov 14 11:12:13 2010
+++ packages/xalan-c/xalan-c.spec	Sun Nov 14 13:46:29 2010
@@ -1,21 +1,19 @@
 # $Revision$, $Date$
-%define		ver	%(echo %{version} | tr . _)
+%define	snap	20101114
 Summary:	C++ xslt library
 Summary(pl.UTF-8):	Biblioteka xslt dla C++
 Name:		xalan-c
-Version:	1.10.0
-Release:	8
+Version:	1.11.0
+# snap due to http://article.gmane.org/gmane.text.xml.xalan.c%2B%2B.user/3900
+Release:	0.%{snap}.1
 License:	Apache v2.0
 Group:		Applications/Publishing/XML
-Source0:	http://www.apache.org/dist/xml/xalan-c/Xalan-C_%{ver}-src.tar.gz
-# Source0-md5:	0a3fbb535885531cc544b07a2060bfb1
-Patch0:		%{name}-getopt.patch
+# http://svn.apache.org/repos/asf/xerces/c/trunk/
+Source0:	%{name}-%{snap}.tar.bz2
+# Source0-md5:	ccf7777cfb2d48652ea2e929de65a907
 Patch1:		%{name}-soname.patch
 Patch2:		%{name}-include.patch
-Patch3:		icu-4.2.patch
 URL:		http://xml.apache.org/xalan-c/
-BuildRequires:	icu
-BuildRequires:	libicu-devel >= 4.2
 BuildRequires:	util-linux
 BuildRequires:	xerces-c-devel >= 2.7.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -72,17 +70,11 @@
 Przykłady dla xalan-c.
 
 %prep
-%setup -qc
-mv xml-xalan/c/* .
-%patch0 -p2
+%setup -q -n %{name}
 %patch1 -p2
 %patch2 -p2
-%patch3 -p1
 
-%if "%{_lib}" != "lib"
-sed -i -e 's#/lib/icu/pkgdata.inc#/%{_lib}/icu/pkgdata.inc#' \
-	src/xalanc/Utils/Makefile.in
-%endif
+sed -i -e 's#debugflag=".*";#debugflag="%{rpmcflags} %{rpmcppflags}";#g' runConfigure
 
 find xdocs samples -name CVS | xargs rm -rf
 
@@ -97,6 +89,7 @@
 . ./env.sh
 
 ./runConfigure \
+	-C "--libdir=%{_libdir}" \
 	-P %{_prefix} \
 	-p linux \
 	-c "%{__cc}" \
@@ -106,20 +99,16 @@
 %else
 	-b 32 \
 %endif
-	-t icu \
-	-m icu
+	-t default \
+	-m inmem
 
-# 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
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 . ./env.sh
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_libdir}
@@ -130,10 +119,6 @@
 cp -a samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a xdocs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-docs-%{version}
 
-%if "%{_lib}" != "lib"
-mv $RPM_BUILD_ROOT%{_prefix}/lib/* $RPM_BUILD_ROOT%{_libdir}
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -146,8 +131,8 @@
 %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
+%attr(755,root,root) %ghost %{_libdir}/libxalan-c.so.111
+%attr(755,root,root) %ghost %{_libdir}/libxalanMsg.so.111
 
 %files devel
 %defattr(644,root,root,755)
@@ -169,6 +154,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2010/11/14 12:46:29  arekm
+- up to 1.11.0 snap
+
 Revision 1.49  2010/11/14 10:12:13  arekm
 - release 8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xalan-c/xalan-c.spec?r1=1.49&r2=1.50&f=u