From fcbe3995f70dc9719a564718baa4e92476414d3a Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Jan 09 2010 13:40:02 +0000 Subject: Update to 1.4.01. --- diff --git a/.cvsignore b/.cvsignore index ad010ec..fef0e62 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ xml-commons-external-1.3.04-src.tar.gz +xml-commons-external-1.4.01-src.tar.gz diff --git a/sources b/sources index c39fb00..da68411 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -639be783e71e05689b12399ea3d2f625 xml-commons-external-1.3.04-src.tar.gz +bfce20df4df9b7cd97b1d6f626b84d88 xml-commons-external-1.4.01-src.tar.gz diff --git a/xml-commons-apis.spec b/xml-commons-apis.spec index 0f06a58..25af928 100644 --- a/xml-commons-apis.spec +++ b/xml-commons-apis.spec @@ -28,20 +28,16 @@ # 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}}} - Name: xml-commons-apis Summary: APIs for DOM, SAX, and JAXP -Version: 1.3.04 -Release: 3.5%{?dist} +Version: 1.4.01 +Release: 1%{?dist} Epoch: 0 License: ASL 2.0 and W3C and Public Domain URL: http://xml.apache.org/commons/ -Source0: xml-commons-external-1.3.04-src.tar.gz -# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04/java/external/ -# tar czf xml-commons-external-1.3.04-src.tar.gz external +Source0: xml-commons-external-%{version}-src.tar.gz +# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_4_01/java/external/ +# tar czf xml-commons-external-1.4.01-src.tar.gz external Source1: %{name}-MANIFEST.MF Source2: %{name}-ext-MANIFEST.MF Requires: jpackage-utils >= 0:1.5 @@ -49,9 +45,7 @@ BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: ant Group: Text Processing/Markup/XML BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if ! %{gcj_support} BuildArch: noarch -%endif Obsoletes: xml-commons <= 0:1.3.02 Provides: xml-commons = %{epoch}:%{version}-%{release} @@ -59,12 +53,6 @@ Provides: xml-commons = %{epoch}:%{version}-%{release} Provides: jaxp = 1.3 Provides: xml-commons-jaxp-1.3-apis = %{epoch}:%{version}-%{release} -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif - %description xml-commons-apis is designed to organize and have common packaging for the various externally-defined standard interfaces for XML. This @@ -80,9 +68,6 @@ Manual for %{name}. %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -# for /bin/rm and /bin/ln -Requires(post): coreutils -Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -143,56 +128,33 @@ rm -rf docs/javadoc # ----------------------------------------------------------------------------- -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - %clean rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- -%if %{gcj_support} -%post -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 - %files -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %doc LICENSE NOTICE %doc LICENSE.dom-documentation.txt README.dom.txt %doc LICENSE.dom-software.txt %doc LICENSE.sax.txt README-sax README.sax.txt %{_javadir}/* -%if %{gcj_support} -%dir %attr(-,root,root) %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-ext-%{version}.jar.* -%endif - %files manual -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %doc build/docs/* %files javadoc -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadocdir}/* # ----------------------------------------------------------------------------- %changelog +* Sat Jan 9 2010 Alexander Kurtakov 0:1.4.01-1 +- Update to 1.4.01. + * Mon Jul 27 2009 Fedora Release Engineering - 0:1.3.04-3.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild