From 1393f0c4b869d295b97a660bb5a2813a731d42d6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Jun 20 2013 11:40:40 +0000 Subject: Install NOTICE file with javadoc package - Update to current packaging guidelines --- diff --git a/woodstox-core-fsf-address.patch b/woodstox-core-fsf-address.patch deleted file mode 100644 index 1bf7430..0000000 --- a/woodstox-core-fsf-address.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur woodstox-4.1.2.orig/release-notes/lgpl/LGPL2.1 woodstox-4.1.2/release-notes/lgpl/LGPL2.1 ---- woodstox-4.1.2.orig/release-notes/lgpl/LGPL2.1 2011-08-26 18:14:26.000000000 +0200 -+++ woodstox-4.1.2/release-notes/lgpl/LGPL2.1 2011-10-06 18:04:10.741821908 +0200 -@@ -2,7 +2,7 @@ - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - diff --git a/woodstox-core-unbundling.patch b/woodstox-core-unbundling.patch deleted file mode 100644 index 53cbba0..0000000 --- a/woodstox-core-unbundling.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur woodstox-4.1.2.orig/pom.xml woodstox-4.1.2/pom.xml ---- woodstox-4.1.2.orig/pom.xml 2011-09-13 16:42:35.000000000 +0200 -+++ woodstox-4.1.2/pom.xml 2011-09-13 17:06:29.294138547 +0200 -@@ -32,6 +32,21 @@ - stax2-api - @REQ_STAX2_VERSION@ - -+ -+ net.java.dev.msv -+ msv-core -+ 2009.1 -+ -+ -+ org.apache.felix -+ org.osgi.core -+ 4.1.0 -+ -+ -+ net.java.dev.msv -+ xsdlib -+ 2009.1 -+ - - - -diff -Naur woodstox-4.1.2.orig/pom-lgpl.xml woodstox-4.1.2/pom-lgpl.xml ---- woodstox-4.1.2.orig/pom-lgpl.xml 2011-09-13 16:42:35.000000000 +0200 -+++ woodstox-4.1.2/pom-lgpl.xml 2011-09-13 17:06:29.294138547 +0200 -@@ -32,6 +32,21 @@ - stax2-api - @REQ_STAX2_VERSION@ - -+ -+ net.java.dev.msv -+ msv-core -+ 2009.1 -+ -+ -+ org.apache.felix -+ org.osgi.core -+ 4.1.0 -+ -+ -+ net.java.dev.msv -+ xsdlib -+ 2009.1 -+ - - - diff --git a/woodstox-core.spec b/woodstox-core.spec index 8f3df56..f0a6a06 100644 --- a/woodstox-core.spec +++ b/woodstox-core.spec @@ -2,37 +2,25 @@ %global core_name %{base_name}-core %global stax2_ver 3.1.1 -Name: %{core_name} -Version: 4.1.2 -Release: 5%{?dist} -Summary: High-performance XML processor -License: ASL 2.0 or LGPLv2+ -Group: Development/Libraries -URL: http://%{base_name}.codehaus.org/ - -Source0: http://%{base_name}.codehaus.org/%{version}/%{core_name}-src-%{version}.tar.gz - -Patch0: %{name}-unbundling.patch -Patch1: %{name}-fsf-address.patch - -BuildArch: noarch - -BuildRequires: felix-osgi-core -BuildRequires: relaxngDatatype -BuildRequires: msv-xsdlib -BuildRequires: msv-msv -BuildRequires: stax2-api -BuildRequires: java-devel -BuildRequires: maven-local -BuildRequires: jpackage-utils - -Requires: felix-osgi-core -Requires: relaxngDatatype -Requires: msv-xsdlib -Requires: msv-msv -Requires: stax2-api -Requires: jpackage-utils -Requires: java +Name: %{core_name} +Version: 4.1.2 +Release: 6%{?dist} +Summary: High-performance XML processor +License: ASL 2.0 or LGPLv2+ +URL: http://%{base_name}.codehaus.org/ +BuildArch: noarch + +Source0: http://%{base_name}.codehaus.org/%{version}/%{core_name}-src-%{version}.tar.gz + +BuildRequires: maven-local +BuildRequires: mvn(javax.xml.stream:stax-api) +BuildRequires: mvn(net.java.dev.msv:msv-core) +BuildRequires: mvn(net.java.dev.msv:xsdlib) +BuildRequires: mvn(org.apache.felix:org.osgi.core) +BuildRequires: mvn(org.codehaus.woodstox:stax2-api) +# Transitive devel dependencies needed because some packages don't +# install effective POMs: +BuildRequires: mvn(net.java:jvnet-parent) %description Woodstox is a high-performance validating namespace-aware StAX-compliant @@ -43,8 +31,6 @@ such as validation. %package javadoc Summary: API documentation for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. @@ -52,16 +38,11 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{base_name}-%{version} -cp src/maven/%{name}-asl.pom pom.xml -cp src/maven/%{name}-lgpl.pom pom-lgpl.xml +# Create POM from template +sed s/@VERSION@/%{version}/\;s/@REQ_STAX2_VERSION@/%{stax2_ver}/ \ + src/maven/%{name}-asl.pom >pom.xml -%patch0 -p1 -%patch1 -p1 - -sed -i "s/@VERSION@/%{version}/g" pom.xml pom-lgpl.xml -sed -i "s/@REQ_STAX2_VERSION@/%{stax2_ver}/g" pom.xml pom-lgpl.xml - -# removing bundled stuff +# Remove bundled libraries. rm -rf lib rm -rf src/maven rm -rf src/resources @@ -70,48 +51,40 @@ rm -rf src/java/org rm -rf src/test/org rm -rf src/test/stax2 -# fixing incomplete source directory structure -mkdir src/main -mv -f src/java src/main/ -mkdir src/test/java -mv -f src/test/wstxtest src/test/java/ +# Bundled libraries were removed, so dependencies on them need to be +# added. +%pom_add_dep net.java.dev.msv:msv-core +%pom_add_dep org.apache.felix:org.osgi.core +%pom_add_dep net.java.dev.msv:xsdlib + +# Upstream uses non-standard directory structure. +%pom_xpath_inject pom:project " + + src/java + src/test + " + +%mvn_alias ":{woodstox-core}-asl" @1-lgpl +%mvn_file : %{name}{,-asl,-lgpl} %build # stax2 missing -> cannot compile tests -> tests skipped -mvn-rpmbuild -Dmaven.test.skip=true \ - install javadoc:aggregate +%mvn_build -f %install -# jars -install -Dpm 644 target/%{name}-asl-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -ln -s %{name}.jar %{buildroot}%{_javadir}/%{name}-asl.jar -ln -s %{name}.jar %{buildroot}%{_javadir}/%{name}-lgpl.jar - -# pom -install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-asl.pom -install -Dpm 644 pom-lgpl.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-lgpl.pom +%mvn_install -# javadoc -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -%add_maven_depmap JPP-%{name}-asl.pom %{name}-asl.jar -%add_maven_depmap JPP-%{name}-lgpl.pom %{name}-lgpl.jar - -%files +%files -f .mfiles %doc release-notes/asl/ASL2.0 release-notes/lgpl/LGPL2.1 release-notes/asl/NOTICE -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-asl.jar -%{_javadir}/%{name}-lgpl.jar -%{_mavenpomdir}/JPP-%{name}-asl.pom -%{_mavenpomdir}/JPP-%{name}-lgpl.pom -%{_mavendepmapfragdir}/%{name} -%files javadoc -%doc release-notes/asl/ASL2.0 release-notes/lgpl/LGPL2.1 -%doc %{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc +%doc release-notes/asl/ASL2.0 release-notes/lgpl/LGPL2.1 release-notes/asl/NOTICE %changelog +* Thu Jun 20 2013 Mikolaj Izdebski - 4.1.2-6 +- Install NOTICE file with javadoc package +- Update to current packaging guidelines + * Fri Feb 15 2013 Fedora Release Engineering - 4.1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild