Hello community,
here is the log from the commit of package xalan-j2 for openSUSE:Factory
checked in at 2013-09-03 22:07:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xalan-j2 (Old)
and /work/SRC/openSUSE:Factory/.xalan-j2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xalan-j2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xalan-j2/xalan-j2.changes 2013-01-08
15:06:10.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xalan-j2.new/xalan-j2.changes 2013-09-03
22:07:16.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Aug 28 07:47:48 UTC 2013 - mvysko...@suse.com
+
+- mark all files related to update-alternatives as ghost
+- reformat header of spec a bit
+
+-------------------------------------------------------------------
+Fri Aug 23 11:55:26 UTC 2013 - mvysko...@suse.com
+
+- drop javadoc package
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xalan-j2.spec ++++++
--- /var/tmp/diff_new_pack.mKS1IT/_old 2013-09-03 22:07:17.000000000 +0200
+++ /var/tmp/diff_new_pack.mKS1IT/_new 2013-09-03 22:07:17.000000000 +0200
@@ -17,21 +17,9 @@
# icecream 0
-Name: xalan-j2
-BuildRequires: ant
-BuildRequires: bcel
-BuildRequires: java-1_5_0-gcj-compat-devel
-BuildRequires: jlex
-BuildRequires: servletapi5
-BuildRequires: xml-commons-apis-bootstrap
-#BuildRequires: xerces-j2-bootstrap
-#!BuildIgnore: xerces-j2-boostrap
-BuildRequires: java-cup-bootstrap
-#!BuildIgnore: xerces-j2 xml-commons xml-commons-resolver xml-commons-apis
java-cup java_cup
-#!BuildIgnore: xml-commons-jaxp-1.3-apis
-%define section free
-%define version 2.7.0
%define cvs_version 2_7_0
+
+Name: xalan-j2
Version: 2.7.0
Release: 0
Summary: Java XSLT processor
@@ -46,8 +34,22 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Provides: jaxp_transform_impl
+
Requires: jaxp_parser_impl
-PreReq: /usr/sbin/update-alternatives
+Requires(post): update-alternatives
+Requires(postun):update-alternatives
+
+BuildRequires: ant
+BuildRequires: bcel
+BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: jlex
+BuildRequires: servletapi5
+BuildRequires: xml-commons-apis-bootstrap
+#BuildRequires: xerces-j2-bootstrap
+#!BuildIgnore: xerces-j2-boostrap
+BuildRequires: java-cup-bootstrap
+#!BuildIgnore: xerces-j2 xml-commons xml-commons-resolver xml-commons-apis
java-cup java_cup
+#!BuildIgnore: xml-commons-jaxp-1.3-apis
%description
Xalan is an XSLT processor for transforming XML documents into HTML,
@@ -88,26 +90,8 @@
This package contains the manual for Xalan.
-
-
-%package javadoc
-PreReq: coreutils
-Summary: Javadoc for xalan-j2
-Group: Development/Libraries/Java
-
-%description javadoc
-Xalan is an XSLT processor for transforming XML documents into HTML,
-text, or other XML document types. It implements the W3C
-Recommendations for XSL Transformations (XSLT) and the XML Path
-Language (XPath). It can be used from the command line, in an applet or
-a servlet, or as a module in other program.
-
-This package contains the javadoc documentation for Xalan.
-
-
-
%package demo
-Summary: Demonstration and samples for xalan-j2.
+Summary: Demonstration and samples for xalan-j2
Group: Development/Libraries/Java
Requires: %{name} = %{version}-%{release}
Requires: servlet
@@ -168,43 +152,36 @@
xsltc.unbundledjar \
docs \
xsltc.docs \
- javadocs \
samples \
servlet
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 755 %{buildroot}%{_javadir}
install -p -m 644 build/xalan-interpretive.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ %{buildroot}%{_javadir}/%{name}-%{version}.jar
install -p -m 644 build/xsltc.jar \
- $RPM_BUILD_ROOT%{_javadir}/xsltc-%{version}.jar
+ %{buildroot}%{_javadir}/xsltc-%{version}.jar
install -p -m 644 build/serializer.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-serializer-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf
${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-rm -rf build/docs/apidocs
+ %{buildroot}%{_javadir}/%{name}-serializer-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
# demo
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d -m 755 %{buildroot}%{_datadir}/%{name}
install -p -m 644 build/xalansamples.jar \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-samples.jar
+ %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar
install -p -m 644 build/xalanservlet.war \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-servlet.war
-cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
-# fix link between manual and javadoc
-(cd build/docs; ln -sf %{_javadocdir}/%{name}-%{version} apidocs)
-# jaxp_transform_impl ghost symlink
-ln -s %{_sysconfdir}/alternatives \
- $RPM_BUILD_ROOT%{_javadir}/jaxp_transform_impl.jar
-# bnc#485299
-install -d -m 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/ant.d/
-echo xalan-j2-serializer > $RPM_BUILD_ROOT/%{_sysconfdir}/ant.d/serializer
+ %{buildroot}%{_datadir}/%{name}/%{name}-servlet.war
+cp -pr samples %{buildroot}%{_datadir}/%{name}
+
+# alternatives
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+touch %{buildroot}/%{_sysconfdir}/alternatives/jaxp_transform_impl.jar
+ln -sf %{_sysconfdir}/alternatives/jaxp_transform_impl.jar \
+ %{buildroot}%{_javadir}/jaxp_transform_impl.jar
-%clean
-rm -rf $RPM_BUILD_ROOT
+# bnc#485299
+install -d -m 0755 %{buildroot}/%{_sysconfdir}/ant.d/
+echo xalan-j2-serializer > %{buildroot}/%{_sysconfdir}/ant.d/serializer
%post
update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
@@ -224,10 +201,6 @@
# update-alternatives --remove jaxp_transform_impl %{_javadir}/xsltc.jar
#} >/dev/null 2>&1 || :
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
%files
%defattr(0644,root,root,0755)
%doc KEYS licenses/xalan.LICENSE.txt licenses/xalan.NOTICE.txt
licenses/serializer.LICENSE.txt licenses/serializer.NOTICE.txt
@@ -235,24 +208,19 @@
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-serializer-%{version}.jar
%{_javadir}/%{name}-serializer.jar
-%ghost %{_javadir}/jaxp_transform_impl.jar
%{_sysconfdir}/ant.d/
+%ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar
+%ghost %{_javadir}/jaxp_transform_impl.jar
%files xsltc
%defattr(0644,root,root,0755)
%{_javadir}/xsltc-%{version}.jar
%{_javadir}/xsltc.jar
-#%ghost %{_javadir}/jaxp_transform_impl.jar
%files manual
%defattr(0644,root,root,0755)
%doc build/docs/*
-%files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
-
%files demo
%defattr(0644,root,root,0755)
%{_datadir}/%{name}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
