rpms/xalan-j2/devel .cvsignore, 1.9, 1.10 xalan-j2.spec, 1.61, 1.62 xalan-j2-noxsltcdeps.patch, 1.2, 1.3 sources, 1.7, 1.8
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Apr 7 11:26:11 UTC 2010
Author: akurtakov
Update of /cvs/pkgs/rpms/xalan-j2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28605/devel
Modified Files:
.cvsignore xalan-j2.spec xalan-j2-noxsltcdeps.patch sources
Log Message:
Update to 2.7.1.
Drop gcj support.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xalan-j2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore 20 Jul 2006 05:43:53 -0000 1.9
+++ .cvsignore 7 Apr 2010 11:26:10 -0000 1.10
@@ -1,2 +1,3 @@
xalan-j2-notarget.patch
xalan-j_2_7_0-src-RHsemiCLEAN.tar.gz
+xalan-j_2_7_1-src.tar.gz
Index: xalan-j2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- xalan-j2.spec 27 Jul 2009 07:33:42 -0000 1.61
+++ xalan-j2.spec 7 Apr 2010 11:26:11 -0000 1.62
@@ -28,23 +28,18 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
%define section free
-%define cvs_version 2_7_0
+%define cvs_version 2_7_1
Name: xalan-j2
-Version: 2.7.0
-Release: 9.5%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
Epoch: 0
Summary: Java XSLT processor
# samples/servlet/ApplyXSLTException.java is ASL 1.1
# src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C
License: ASL 1.1 and ASL 2.0 and W3C
-#Source0: http://www.apache.org/dist/xml/xalan-j/xalan-j_2_7_0-src.tar.gz
-Source0: xalan-j_%{cvs_version}-src-RHsemiCLEAN.tar.gz
+Source0: http://www.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz
Source1: %{name}-serializer-MANIFEST.MF
Patch0: %{name}-noxsltcdeps.patch
Patch1: %{name}-manifest.patch
@@ -55,9 +50,7 @@ URL: http://xalan.apache.org/
Group: Text Processing/Markup/XML
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-%if ! %{gcj_support}
BuildArch: noarch
-%endif
Provides: jaxp_transform_impl
Requires: jaxp_parser_impl
Requires(post): /usr/sbin/update-alternatives
@@ -70,15 +63,10 @@ BuildRequires: jlex
BuildRequires: java_cup
BuildRequires: regexp
BuildRequires: sed
-BuildRequires: servletapi5
+BuildRequires: servlet25
BuildRequires: xerces-j2 >= 0:2.7.1
BuildRequires: xml-commons-apis >= 0:1.3
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
+BuildRequires: xml-stylebook
%description
Xalan is an XSLT processor for transforming XML documents into HTML,
@@ -96,12 +84,6 @@ Requires: jlex
Requires: regexp
Requires: jaxp_parser_impl
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description xsltc
The XSLT Compiler is a Java-based tool for compiling XSLT stylesheets into
lightweight and portable Java byte codes called translets.
@@ -127,14 +109,7 @@ Javadoc for %{name}.
%package demo
Summary: Demo for %{name}
Group: Text Processing/Markup/XML
-Requires: %{name} = %{epoch}:%{version}-%{release}, servlet
-BuildRequires: servlet
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
+Requires: %{name} = %{epoch}:%{version}-%{release}, servlet25
%description demo
Demonstrations and samples for %{name}.
@@ -142,7 +117,7 @@ Demonstrations and samples for %{name}.
%prep
%setup -q -n xalan-j_%{cvs_version}
%patch0 -p0
-%patch3 -p0
+#%patch3 -p0
#%patch1 -p0
#%patch2 -p0
# Remove all binary libs, except ones needed to build docs and N/A elsewhere.
@@ -168,7 +143,7 @@ ln -sf $(build-classpath ant) ant.jar
ln -sf $(build-classpath jlex) JLex.jar
ln -sf $(build-classpath xml-stylebook) stylebook-1.0-b3_xalan-2.jar
popd
-export CLASSPATH=$(build-classpath servletapi5)
+export CLASSPATH=$(build-classpath servlet)
ant \
-Djava.awt.headless=true \
@@ -177,7 +152,6 @@ ant \
xalan-interpretive.jar\
xsltc.unbundledjar \
docs \
- xsltc.docs \
javadocs \
samples \
servlet
@@ -224,10 +198,6 @@ ln -s %{_sysconfdir}/alternatives \
$RPM_BUILD_ROOT%{_javadir}/jaxp_transform_impl.jar
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm --exclude %{_datadir}/%{name}/%{name}-servlet.war
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -236,21 +206,6 @@ rm -rf $RPM_BUILD_ROOT
update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
jaxp_transform_impl %{_javadir}/%{name}.jar 30
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%preun
{
[ $1 = 0 ] || exit 0
@@ -276,63 +231,21 @@ if [ "$1" = "0" ]; then
rm -f %{_javadocdir}/%{name}
fi
-%post xsltc
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun xsltc
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%post demo
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun demo
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%files
%defattr(0644,root,root,0755)
-%doc KEYS licenses/xalan.LICENSE.txt licenses/xalan.NOTICE.txt licenses/serializer.LICENSE.txt licenses/serializer.NOTICE.txt
+%doc KEYS LICENSE.txt NOTICE.txt readme.html
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-serializer-%{version}.jar
%{_javadir}/%{name}-serializer.jar
%ghost %{_javadir}/jaxp_transform_impl.jar
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-serializer-%{version}.jar.*
-%endif
-
%files xsltc
%defattr(0644,root,root,0755)
%{_javadir}/xsltc-%{version}.jar
%{_javadir}/xsltc.jar
#%ghost %{_javadir}/jaxp_transform_impl.jar
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xsltc-%{version}.jar.*
-%endif
-
%files manual
%defattr(0644,root,root,0755)
%doc build/docs/*
@@ -346,11 +259,11 @@ fi
%defattr(0644,root,root,0755)
%{_datadir}/%{name}
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-samples.jar.*
-%endif
-
%changelog
+* Wed Apr 7 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.7.1-1
+- Update to 2.7.1.
+- Drop gcj_support.
+
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.7.0-9.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
xalan-j2-noxsltcdeps.patch:
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: xalan-j2-noxsltcdeps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xalan-j2/devel/xalan-j2-noxsltcdeps.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xalan-j2-noxsltcdeps.patch 9 Sep 2004 14:31:12 -0000 1.2
+++ xalan-j2-noxsltcdeps.patch 7 Apr 2010 11:26:11 -0000 1.3
@@ -1,11 +1,11 @@
---- build.xml.orig 2004-02-27 20:45:31.000000000 +0100
-+++ build.xml 2004-03-21 15:46:37.000000000 +0100
-@@ -560,7 +560,7 @@
- <!-- =================================================================== -->
- <!-- Creates one big xalan jar (Xalan interpretive + XSLTC + support jars) -->
- <!-- =================================================================== -->
-- <target name="jar" depends="xalan-interpretive.compile,xsltc.compile,xsltc.copy-deps-jars"
-+ <target name="jar" depends="xalan-interpretive.compile,xsltc.compile"
- description="Jar up everything (Xalan, XSLTC and XSLTC dependencies)" >
-
- <!-- Copy over the manifest, with filtering (for version number) -->
+--- build.xml.orig 2007-11-22 23:44:01.000000000 +0200
++++ build.xml 2010-04-07 13:32:31.878542610 +0300
+@@ -683,7 +683,7 @@ $Id: build.xml 563656 2007-08-07 21:12:1
+ <!-- =================================================================== -->
+ <!-- Creates one big xalan jar (Xalan interpretive + XSLTC + support jars) -->
+ <!-- =================================================================== -->
+- <target name="jar" depends="xalan-interpretive.compile,xsltc.compile,xsltc.copy-deps-jars"
++ <target name="jar" depends="xalan-interpretive.compile,xsltc.compile"
+ description="Jar up everything (Xalan, XSLTC and XSLTC dependencies)" >
+
+ <!-- Copy over the manifest, with filtering (for version number) -->
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xalan-j2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 20 Jul 2006 05:43:53 -0000 1.7
+++ sources 7 Apr 2010 11:26:11 -0000 1.8
@@ -1,2 +1,2 @@
3461365d8636e454f73e14884c3f8692 xalan-j2-notarget.patch
-a03a7531cac901e9aa185b1dfc714126 xalan-j_2_7_0-src-RHsemiCLEAN.tar.gz
+fc805051f0fe505c7a4b1b5c8db9b9e3 xalan-j_2_7_1-src.tar.gz
More information about the scm-commits
mailing list