From 1b822b42bc420a20ee2d30e7e7a13f14418870aa Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 2 Dec 2010 11:16:59 +0100 Subject: [PATCH 01/35] Fix pom filenames (Resolves rhbz#655829) - Changes according to new guidelines (versionless jars) - Fix few packaging problems (post/postun deps) --- xpp3.spec | 55 ++++++++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/xpp3.spec b/xpp3.spec index 13c8d72..3c4f70f 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -33,11 +33,11 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.3.8 -Release: 3.4%{?dist} +Release: 4%{?dist} Epoch: 0 License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html -Group: Text Processing/Markup/XML +Group: Development/Libraries Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz Source1: http://mirrors.ibiblio.org/pub/mirrors/maven2/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.pom Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/xpp3/xpp3_xpath/1.1.3.4.O/xpp3_xpath-1.1.3.4.O.pom @@ -54,8 +54,10 @@ Requires: jpackage-utils Requires: junit Requires: xml-commons-apis Requires: java +Requires(post): jpackage-utils +Requires(postun): jpackage-utils + BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Xml Pull Parser 3rd Edition (XPP3) MXP1 is a new XmlPull @@ -65,11 +67,13 @@ take best advantage of latest JIT JVMs such as Hotspot in JDK 1.4. %package minimal Summary: Minimal XML Pull Parser -Group: Text Processing/Markup/XML +Group: Development/Libraries Requires: jpackage-utils Requires: junit Requires: xml-commons-apis Requires: java +Requires(post): jpackage-utils +Requires(postun): jpackage-utils %description minimal Minimal XML pull parser implementation. @@ -94,43 +98,34 @@ export CLASSPATH=$(build-classpath xml-commons-apis junit) ant xpp3 junit apidoc %install -rm -rf $RPM_BUILD_ROOT # jars mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p build/%{name}-%{oversion}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -cp -p build/%{name}_min-%{oversion}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-minimal-%{version}.jar -cp -p build/%{name}_xpath-%{oversion}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-xpath-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; \ - do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +cp -p build/%{name}-%{oversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +cp -p build/%{name}_min-%{oversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-minimal.jar +cp -p build/%{name}_xpath-%{oversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xpath.jar # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} rm -rf doc/{build.txt,api} install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 %{SOURCE3} \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}_min.pom + %{buildroot}%{_mavenpomdir}/JPP-%{name}-minimal.pom %add_to_maven_depmap %{name} %{name}_min %{version} JPP %{name}-minimal -mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/%{name}-minimal +mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/%{name}-minimal install -pm 644 %{SOURCE1} \ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_to_maven_depmap %{name} %{name} %{version} JPP %{name} install -pm 644 %{SOURCE2} \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}_xpath.pom + %{buildroot}%{_mavenpomdir}/JPP-%{name}-xpath.pom %add_to_maven_depmap %{name} %{name}_xpath %{version} JPP %{name}-xpath -%clean -rm -rf $RPM_BUILD_ROOT - %post %update_maven_depmap @@ -144,29 +139,31 @@ rm -rf $RPM_BUILD_ROOT %update_maven_depmap %files -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %doc README.html LICENSE.txt doc/* %{_javadir}/%{name}.jar -%{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}-xpath.jar -%{_javadir}/%{name}-xpath-%{version}.jar -%{_mavenpomdir}/JPP-%{name}_xpath.pom +%{_mavenpomdir}/JPP-%{name}-xpath.pom %{_mavenpomdir}/JPP-%{name}.pom %{_mavendepmapfragdir}/%{name} %files minimal -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %doc LICENSE.txt %{_mavendepmapfragdir}/%{name}-minimal -%{_mavenpomdir}/JPP-%{name}_min* +%{_mavenpomdir}/JPP-%{name}-minimal.pom %{_javadir}/%{name}-minimal.jar -%{_javadir}/%{name}-minimal-%{version}.jar %files javadoc -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %doc %{_javadocdir}/* %changelog +* Thu Dec 2 2010 Stanislav Ochotnicky - 0:1.1.3.8-4 +- Fix pom filenames (Resolves rhbz#655829) +- Changes according to new guidelines (versionless jars) +- Fix few packaging problems (post/postun deps) + * Mon Jun 14 2010 Alexander Kurtakov 0:1.1.3.8-3.4 - Add maven poms and depmaps. From 86cde5c4f4f89ac5f5a36770a09bafffe83a4abb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 00:50:18 -0600 Subject: [PATCH 02/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 3c4f70f..e43292c 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -33,7 +33,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.3.8 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html @@ -159,6 +159,9 @@ install -pm 644 %{SOURCE2} \ %doc %{_javadocdir}/* %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0:1.1.3.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Dec 2 2010 Stanislav Ochotnicky - 0:1.1.3.8-4 - Fix pom filenames (Resolves rhbz#655829) - Changes according to new guidelines (versionless jars) From b0f79f54d45b79296b3e563ff87ffa3ce5ef54a0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:16:50 -0600 Subject: [PATCH 03/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index e43292c..5db7319 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -33,7 +33,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.3.8 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html @@ -159,6 +159,9 @@ install -pm 644 %{SOURCE2} \ %doc %{_javadocdir}/* %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.1.3.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 0:1.1.3.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 034d1cb4e02e55d04507fb33115ab16ffa5619b9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 02:10:00 -0500 Subject: [PATCH 04/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 5db7319..1585d8a 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -33,7 +33,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.3.8 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 0 License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html @@ -159,6 +159,9 @@ install -pm 644 %{SOURCE2} \ %doc %{_javadocdir}/* %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0:1.1.3.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 0:1.1.3.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 6d1c15aa89c7c0681918a857bf2194b9e01884fb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:02:51 -0600 Subject: [PATCH 05/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 1585d8a..6e19cc6 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -33,7 +33,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.3.8 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 0 License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html @@ -159,6 +159,9 @@ install -pm 644 %{SOURCE2} \ %doc %{_javadocdir}/* %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0:1.1.3.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 0:1.1.3.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 1d18deb9ecc3718ba656958fe41e456b1b4af365 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 21 Jun 2013 17:03:17 +0200 Subject: [PATCH 06/35] General specfile cleanup - Update to current packaging guidelines --- xpp3.spec | 128 ++++++++++++++---------------------------------------- 1 file changed, 32 insertions(+), 96 deletions(-) diff --git a/xpp3.spec b/xpp3.spec index 6e19cc6..5a47286 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -1,87 +1,45 @@ -# Copyright (c) 2000-2005, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - %define oversion 1.1.3_8 Summary: XML Pull Parser Name: xpp3 Version: 1.1.3.8 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 0 License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html -Group: Development/Libraries Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz Source1: http://mirrors.ibiblio.org/pub/mirrors/maven2/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.pom Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/xpp3/xpp3_xpath/1.1.3.4.O/xpp3_xpath-1.1.3.4.O.pom Source3: http://mirrors.ibiblio.org/pub/mirrors/maven2/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.pom Patch0: %{name}-link-docs-locally.patch -Requires: jpackage-utils >= 0:1.6 -Requires: java >= 0:1.4.2 -BuildRequires: jpackage-utils >= 0:1.6 -BuildRequires: ant >= 0:1.6 +Requires: java +BuildRequires: jpackage-utils +BuildRequires: ant BuildRequires: junit BuildRequires: xml-commons-apis -BuildRequires: /usr/bin/perl -Requires: jpackage-utils Requires: junit Requires: xml-commons-apis Requires: java -Requires(post): jpackage-utils -Requires(postun): jpackage-utils BuildArch: noarch %description -Xml Pull Parser 3rd Edition (XPP3) MXP1 is a new XmlPull +XML Pull Parser 3rd Edition (XPP3) MXP1 is an XmlPull parsing engine that is based on ideas from XPP and in particular XPP2 but completely revised and rewritten to take best advantage of latest JIT JVMs such as Hotspot in JDK 1.4. %package minimal Summary: Minimal XML Pull Parser -Group: Development/Libraries -Requires: jpackage-utils Requires: junit Requires: xml-commons-apis Requires: java -Requires(post): jpackage-utils -Requires(postun): jpackage-utils %description minimal Minimal XML pull parser implementation. %package javadoc Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc Javadoc for %{name}. @@ -89,7 +47,7 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{oversion} # remove all binary libs -find . -name "*.jar" -exec rm -f {} \; +find -name \*.jar -delete %patch0 @@ -98,67 +56,45 @@ export CLASSPATH=$(build-classpath xml-commons-apis junit) ant xpp3 junit apidoc %install - -# jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p build/%{name}-%{oversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -cp -p build/%{name}_min-%{oversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-minimal.jar -cp -p build/%{name}_xpath-%{oversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xpath.jar - -# javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -rm -rf doc/{build.txt,api} - +install -d -m 755 %{buildroot}%{_javadir} install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 %{SOURCE3} \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}-minimal.pom -%add_to_maven_depmap %{name} %{name}_min %{version} JPP %{name}-minimal +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/%{name}-minimal -install -pm 644 %{SOURCE1} \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap %{name} %{name} %{version} JPP %{name} +# JARs +install -p -m 644 build/%{name}-%{oversion}.jar \ + %{buildroot}%{_javadir}/%{name}.jar +install -p -m 644 build/%{name}_xpath-%{oversion}.jar \ + %{buildroot}%{_javadir}/%{name}-xpath.jar +install -p -m 644 build/%{name}_min-%{oversion}.jar \ + %{buildroot}%{_javadir}/%{name}-minimal.jar -install -pm 644 %{SOURCE2} \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}-xpath.pom -%add_to_maven_depmap %{name} %{name}_xpath %{version} JPP %{name}-xpath +# POMs +install -p -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +install -p -m 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}-xpath.pom +install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}-minimal.pom +# XMvn metadata +%add_maven_depmap +%add_maven_depmap JPP-%{name}-xpath.pom %{name}-xpath.jar +%add_maven_depmap JPP-%{name}-minimal.pom %{name}-minimal.jar -f minimal -%post -%update_maven_depmap +# Javadocs +cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} -%postun -%update_maven_depmap - -%post minimal -%update_maven_depmap - -%postun minimal -%update_maven_depmap - -%files -%defattr(-,root,root,-) +%files -f .mfiles %doc README.html LICENSE.txt doc/* -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-xpath.jar -%{_mavenpomdir}/JPP-%{name}-xpath.pom -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} -%files minimal -%defattr(-,root,root,-) +%files minimal -f .mfiles-minimal %doc LICENSE.txt -%{_mavendepmapfragdir}/%{name}-minimal -%{_mavenpomdir}/JPP-%{name}-minimal.pom -%{_javadir}/%{name}-minimal.jar %files javadoc -%defattr(-,root,root,-) -%doc %{_javadocdir}/* +%doc %{_javadocdir}/%{name} %changelog +* Fri Jun 21 2013 Mikolaj Izdebski - 0:1.1.3.8-9 +- General specfile cleanup +- Update to current packaging guidelines + * Fri Feb 15 2013 Fedora Release Engineering - 0:1.1.3.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 8c9a1a2fd75cb91599bdc74900ecee4df29f8346 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:10:40 -0500 Subject: [PATCH 07/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 5a47286..7878cce 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.3.8 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 0 License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html @@ -91,6 +91,9 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.1.3.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Jun 21 2013 Mikolaj Izdebski - 0:1.1.3.8-9 - General specfile cleanup - Update to current packaging guidelines From a9d7f8cc125ae93ffad0cd34dd54b22b0fd72c5c Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 19 Feb 2014 08:07:35 +0100 Subject: [PATCH 08/35] Update to upstream version 1.1.4c Signed-off-by: Mikolaj Izdebski --- .gitignore | 4 ++++ sources | 5 ++++- xpp3.spec | 21 +++++++++++++-------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 585e7da..70f393f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ xpp3-1.1.3_8_src.tgz +/xpp3-1.1.4c_src.tgz +/xpp3-1.1.4c.pom +/xpp3_min-1.1.4c.pom +/xpp3_xpath-1.1.4c.pom diff --git a/sources b/sources index 77287c1..366ca88 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ -c5264274ce0dc6dea642d6f88d2c22c2 xpp3-1.1.3_8_src.tgz +2eb712ad18d7de5d3bfab87ebb56173a xpp3-1.1.4c_src.tgz +490c04a30131e926c978f35913d1ad14 xpp3-1.1.4c.pom +d822fa0c9182ae670b78533bd5a5ed7b xpp3_min-1.1.4c.pom +0f514fb9c61b81158b301a78140b5f8e xpp3_xpath-1.1.4c.pom diff --git a/xpp3.spec b/xpp3.spec index 7878cce..98f9cdd 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -1,19 +1,18 @@ -%define oversion 1.1.3_8 +%define oversion 1.1.4c Summary: XML Pull Parser Name: xpp3 -Version: 1.1.3.8 -Release: 10%{?dist} -Epoch: 0 +Version: 1.1.4 +Release: 1.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz -Source1: http://mirrors.ibiblio.org/pub/mirrors/maven2/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.pom -Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/xpp3/xpp3_xpath/1.1.3.4.O/xpp3_xpath-1.1.3.4.O.pom -Source3: http://mirrors.ibiblio.org/pub/mirrors/maven2/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.pom +Source1: http://repo1.maven.org/maven2/xpp3/xpp3/%{oversion}/xpp3-%{oversion}.pom +Source2: http://repo1.maven.org/maven2/xpp3/xpp3_xpath/%{oversion}/xpp3_xpath-%{oversion}.pom +Source3: http://repo1.maven.org/maven2/xpp3/xpp3_min/%{oversion}/xpp3_min-%{oversion}.pom Patch0: %{name}-link-docs-locally.patch Requires: java -BuildRequires: jpackage-utils +BuildRequires: javapackages-tools BuildRequires: ant BuildRequires: junit BuildRequires: xml-commons-apis @@ -51,6 +50,9 @@ find -name \*.jar -delete %patch0 +# "src/java/addons_tests" does not exist +sed -i 's|depends="junit_main,junit_addons"|depends="junit_main"|' build.xml + %build export CLASSPATH=$(build-classpath xml-commons-apis junit) ant xpp3 junit apidoc @@ -91,6 +93,9 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Wed Feb 19 2014 Michal Srb - 1.1.4-1.c +- Update to upstream version 1.1.4c + * Sun Aug 04 2013 Fedora Release Engineering - 0:1.1.3.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 13bc51e077a34360ec25e22aa5ceb91374aa7084 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 4 Mar 2014 09:05:34 +0100 Subject: [PATCH 09/35] Use Requires: java-headless rebuild (#1067528) --- xpp3.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xpp3.spec b/xpp3.spec index 98f9cdd..5ee42bb 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 1.c%{?dist} +Release: 2.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -11,14 +11,14 @@ Source1: http://repo1.maven.org/maven2/xpp3/xpp3/%{oversion}/xpp3-%{overs Source2: http://repo1.maven.org/maven2/xpp3/xpp3_xpath/%{oversion}/xpp3_xpath-%{oversion}.pom Source3: http://repo1.maven.org/maven2/xpp3/xpp3_min/%{oversion}/xpp3_min-%{oversion}.pom Patch0: %{name}-link-docs-locally.patch -Requires: java +Requires: java-headless BuildRequires: javapackages-tools BuildRequires: ant BuildRequires: junit BuildRequires: xml-commons-apis Requires: junit Requires: xml-commons-apis -Requires: java +Requires: java-headless BuildArch: noarch @@ -32,7 +32,7 @@ take best advantage of latest JIT JVMs such as Hotspot in JDK 1.4. Summary: Minimal XML Pull Parser Requires: junit Requires: xml-commons-apis -Requires: java +Requires: java-headless %description minimal Minimal XML pull parser implementation. @@ -93,6 +93,9 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.1.4-2.c +- Use Requires: java-headless rebuild (#1067528) + * Wed Feb 19 2014 Michal Srb - 1.1.4-1.c - Update to upstream version 1.1.4c From 7044e4d681e5a5caefa3a1ba14683f8978b0d70f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:46:31 -0500 Subject: [PATCH 10/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 5ee42bb..1f91403 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 2.c%{?dist} +Release: 3.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -93,6 +93,9 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.1.4-3.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue Mar 04 2014 Stanislav Ochotnicky - 1.1.4-2.c - Use Requires: java-headless rebuild (#1067528) From 9dd1dac4fafd9c42e6fdff6be23c8d63b3dfcf1f Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 9 Dec 2014 11:50:06 +0200 Subject: [PATCH 11/35] Drop useless Requires. --- xpp3.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xpp3.spec b/xpp3.spec index 1f91403..55365b1 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 3.c%{?dist} +Release: 4.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -16,7 +16,6 @@ BuildRequires: javapackages-tools BuildRequires: ant BuildRequires: junit BuildRequires: xml-commons-apis -Requires: junit Requires: xml-commons-apis Requires: java-headless @@ -30,8 +29,6 @@ take best advantage of latest JIT JVMs such as Hotspot in JDK 1.4. %package minimal Summary: Minimal XML Pull Parser -Requires: junit -Requires: xml-commons-apis Requires: java-headless %description minimal @@ -93,6 +90,9 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Tue Dec 9 2014 Alexander Kurtakov 1.1.4-4.c +- Drop useless Requires. + * Sun Jun 08 2014 Fedora Release Engineering - 1.1.4-3.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 3a553b78a11f214219209e2f6405ddf48b6ca723 Mon Sep 17 00:00:00 2001 From: gil Date: Sat, 14 Feb 2015 00:24:03 +0100 Subject: [PATCH 12/35] introduce license macro --- xpp3.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xpp3.spec b/xpp3.spec index 55365b1..e841b18 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 4.c%{?dist} +Release: 5.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -81,15 +81,20 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}-minimal.pom cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %files -f .mfiles -%doc README.html LICENSE.txt doc/* +%doc README.html doc/* +%license LICENSE.txt %files minimal -f .mfiles-minimal -%doc LICENSE.txt +%license LICENSE.txt %files javadoc %doc %{_javadocdir}/%{name} +%license LICENSE.txt %changelog +* Fri Feb 13 2015 gil cattaneo 1.1.4-5.c +- introduce license macro + * Tue Dec 9 2014 Alexander Kurtakov 1.1.4-4.c - Drop useless Requires. From be00bdb1716175c01072e69af3d2ef488c4881a6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:25:05 +0000 Subject: [PATCH 13/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index e841b18..3d00e00 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 5.c%{?dist} +Release: 6.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -92,6 +92,9 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %license LICENSE.txt %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.1.4-6.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Feb 13 2015 gil cattaneo 1.1.4-5.c - introduce license macro From f91ddcd2ab6d81f4bcd3f5ae5d605a4cc2a62121 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jul 2015 09:21:08 +0200 Subject: [PATCH 14/35] Add build-requires on javapackages-local --- xpp3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xpp3.spec b/xpp3.spec index 3d00e00..42f9632 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 6.c%{?dist} +Release: 7.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -12,7 +12,7 @@ Source2: http://repo1.maven.org/maven2/xpp3/xpp3_xpath/%{oversion}/xpp3_x Source3: http://repo1.maven.org/maven2/xpp3/xpp3_min/%{oversion}/xpp3_min-%{oversion}.pom Patch0: %{name}-link-docs-locally.patch Requires: java-headless -BuildRequires: javapackages-tools +BuildRequires: javapackages-local BuildRequires: ant BuildRequires: junit BuildRequires: xml-commons-apis @@ -92,6 +92,9 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %license LICENSE.txt %changelog +* Tue Jul 14 2015 Mikolaj Izdebski - 1.1.4-7.c +- Add build-requires on javapackages-local + * Fri Jun 19 2015 Fedora Release Engineering - 1.1.4-6.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 721ce0f852a9cf52c27c2c31bd399baf9e3a0c2d Mon Sep 17 00:00:00 2001 From: gil Date: Thu, 24 Dec 2015 23:27:19 +0100 Subject: [PATCH 15/35] convert %%defines to %%global --- xpp3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xpp3.spec b/xpp3.spec index 42f9632..175fb98 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -1,9 +1,9 @@ -%define oversion 1.1.4c +%global oversion 1.1.4c Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 7.c%{?dist} +Release: 8.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -92,6 +92,9 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %license LICENSE.txt %changelog +* Thu Dec 24 2015 gil cattaneo 1.1.4-8.c +- convert %%defines to %%global + * Tue Jul 14 2015 Mikolaj Izdebski - 1.1.4-7.c - Add build-requires on javapackages-local From d898408a54b0df34df0835a4f635e13413130f42 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 19 Jan 2016 10:00:47 +0100 Subject: [PATCH 16/35] Remove bundled javax.xml.namespace.QName class - Resolves: rhbz#1299679 --- xpp3.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 175fb98..9f27f47 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 8.c%{?dist} +Release: 9.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -44,6 +44,8 @@ Javadoc for %{name}. %setup -q -n %{name}-%{oversion} # remove all binary libs find -name \*.jar -delete +# Remove class bundled from Axis (now it's bundled in JRE) +rm -rf src/java/builder/javax %patch0 @@ -92,6 +94,10 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %license LICENSE.txt %changelog +* Tue Jan 19 2016 Mikolaj Izdebski - 1.1.4-9.c +- Remove bundled javax.xml.namespace.QName class +- Resolves: rhbz#1299679 + * Thu Dec 24 2015 gil cattaneo 1.1.4-8.c - convert %%defines to %%global From c1f315713146d16f5d0e0e71c212d97a2b23890a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:48:33 +0000 Subject: [PATCH 17/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 9f27f47..9358f44 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 9.c%{?dist} +Release: 10.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -94,6 +94,9 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %license LICENSE.txt %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.1.4-10.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jan 19 2016 Mikolaj Izdebski - 1.1.4-9.c - Remove bundled javax.xml.namespace.QName class - Resolves: rhbz#1299679 From 81a5715016be2aac121e2c5adb6a2a04195e98ca Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Wed, 23 Mar 2016 16:44:12 +0100 Subject: [PATCH 18/35] Add OSGi metadata. Signed-off-by: Mikolaj Izdebski --- xpp3-1.1.4c-OSGI-MANIFEST.MF | 19 +++++++++++++++++++ xpp3.spec | 16 +++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 xpp3-1.1.4c-OSGI-MANIFEST.MF diff --git a/xpp3-1.1.4c-OSGI-MANIFEST.MF b/xpp3-1.1.4c-OSGI-MANIFEST.MF new file mode 100644 index 0000000..0a2d251 --- /dev/null +++ b/xpp3-1.1.4c-OSGI-MANIFEST.MF @@ -0,0 +1,19 @@ +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.xmlpull +Bundle-Version: 1.1.4 +Export-Package: org.xmlpull.mxp1, + org.xmlpull.mxp1_serializer, + org.xmlpull.v1, + org.xmlpull.v1.builder, + org.xmlpull.v1.builder.adapter, + org.xmlpull.v1.builder.impl, + org.xmlpull.v1.dom2_builder, + org.xmlpull.v1.parser_pool, + org.xmlpull.v1.sax2, + org.xmlpull.v1.util, + org.xmlpull.v1.wrapper, + org.xmlpull.v1.wrapper.classic +Import-Package: javax.xml.parsers;resolution:=optional, + org.w3c.dom;resolution:=optional, + org.xml.sax;resolution:=optional, + org.xml.sax.helpers;resolution:=optional diff --git a/xpp3.spec b/xpp3.spec index 9358f44..6a94bd2 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,16 +3,18 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 10.c%{?dist} +Release: 11.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz Source1: http://repo1.maven.org/maven2/xpp3/xpp3/%{oversion}/xpp3-%{oversion}.pom Source2: http://repo1.maven.org/maven2/xpp3/xpp3_xpath/%{oversion}/xpp3_xpath-%{oversion}.pom Source3: http://repo1.maven.org/maven2/xpp3/xpp3_min/%{oversion}/xpp3_min-%{oversion}.pom +Source4: %{name}-%{oversion}-OSGI-MANIFEST.MF Patch0: %{name}-link-docs-locally.patch Requires: java-headless BuildRequires: javapackages-local +BuildRequires: zip BuildRequires: ant BuildRequires: junit BuildRequires: xml-commons-apis @@ -56,6 +58,15 @@ sed -i 's|depends="junit_main,junit_addons"|depends="junit_main"|' build.xml export CLASSPATH=$(build-classpath xml-commons-apis junit) ant xpp3 junit apidoc +# Add OSGi metadata +pushd build +mkdir META-INF +unzip -o %{name}-%{oversion}.jar META-INF/MANIFEST.MF +cat %{SOURCE4} >> META-INF/MANIFEST.MF +sed -i '/^\r$/d' META-INF/MANIFEST.MF +zip -u %{name}-%{oversion}.jar META-INF/MANIFEST.MF +popd + %install install -d -m 755 %{buildroot}%{_javadir} install -d -m 755 %{buildroot}%{_mavenpomdir} @@ -94,6 +105,9 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %license LICENSE.txt %changelog +* Wed Mar 23 2016 Severin Gehwolf - 1.1.4-11.c +- Add OSGi metadata. + * Fri Feb 05 2016 Fedora Release Engineering - 1.1.4-10.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From b52cc136b2b788a53888d048860e61a97d797c54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:08:17 +0000 Subject: [PATCH 19/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 6a94bd2..1a2b030 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 11.c%{?dist} +Release: 12.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -105,6 +105,9 @@ cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} %license LICENSE.txt %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.1.4-12.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Mar 23 2016 Severin Gehwolf - 1.1.4-11.c - Add OSGi metadata. From 6578df809b986e35a20fbd2ce9e052dbbaf2d4cd Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 22 Mar 2017 13:23:28 +0100 Subject: [PATCH 20/35] Install with XMvn --- xpp3.spec | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/xpp3.spec b/xpp3.spec index 1a2b030..6540970 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 12.c%{?dist} +Release: 13.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -19,7 +19,6 @@ BuildRequires: ant BuildRequires: junit BuildRequires: xml-commons-apis Requires: xml-commons-apis -Requires: java-headless BuildArch: noarch @@ -31,7 +30,6 @@ take best advantage of latest JIT JVMs such as Hotspot in JDK 1.4. %package minimal Summary: Minimal XML Pull Parser -Requires: java-headless %description minimal Minimal XML pull parser implementation. @@ -68,43 +66,29 @@ zip -u %{name}-%{oversion}.jar META-INF/MANIFEST.MF popd %install -install -d -m 755 %{buildroot}%{_javadir} -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +%mvn_package :xpp3_min minimal -# JARs -install -p -m 644 build/%{name}-%{oversion}.jar \ - %{buildroot}%{_javadir}/%{name}.jar -install -p -m 644 build/%{name}_xpath-%{oversion}.jar \ - %{buildroot}%{_javadir}/%{name}-xpath.jar -install -p -m 644 build/%{name}_min-%{oversion}.jar \ - %{buildroot}%{_javadir}/%{name}-minimal.jar - -# POMs -install -p -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -install -p -m 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}-xpath.pom -install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}-minimal.pom - -# XMvn metadata -%add_maven_depmap -%add_maven_depmap JPP-%{name}-xpath.pom %{name}-xpath.jar -%add_maven_depmap JPP-%{name}-minimal.pom %{name}-minimal.jar -f minimal +%mvn_artifact %{SOURCE1} build/%{name}-%{oversion}.jar +%mvn_artifact %{SOURCE2} build/%{name}_xpath-%{oversion}.jar +%mvn_artifact %{SOURCE3} build/%{name}_min-%{oversion}.jar # Javadocs -cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} +%mvn_install -J doc/api %files -f .mfiles -%doc README.html doc/* +%doc README.html doc/*.txt doc/*.html %license LICENSE.txt %files minimal -f .mfiles-minimal %license LICENSE.txt -%files javadoc -%doc %{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %license LICENSE.txt %changelog +* Wed Mar 22 2017 Michael Simacek - 1.1.4-13.c +- Install with XMvn + * Sat Feb 11 2017 Fedora Release Engineering - 1.1.4-12.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b90155c7d4ef4f441289836d9f00b1a7f401a575 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 22 Mar 2017 14:44:37 +0100 Subject: [PATCH 21/35] Install jars directly into javadir --- xpp3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 6540970..8b7c481 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 13.c%{?dist} +Release: 14.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -66,6 +66,7 @@ zip -u %{name}-%{oversion}.jar META-INF/MANIFEST.MF popd %install +%mvn_file ':{*}' @1 %mvn_package :xpp3_min minimal %mvn_artifact %{SOURCE1} build/%{name}-%{oversion}.jar @@ -86,6 +87,9 @@ popd %license LICENSE.txt %changelog +* Wed Mar 22 2017 Michael Simacek - 1.1.4-14.c +- Install jars directly into javadir + * Wed Mar 22 2017 Michael Simacek - 1.1.4-13.c - Install with XMvn From cc05187528c9fa20fdf4204cac21195ffa76e28e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 16 May 2017 15:10:26 +0100 Subject: [PATCH 22/35] Remove unnecessary dep on xml-commons-apis Fix errors in javadoc generation --- xpp3.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xpp3.spec b/xpp3.spec index 8b7c481..cc07020 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 14.c%{?dist} +Release: 15.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -12,13 +12,12 @@ Source2: http://repo1.maven.org/maven2/xpp3/xpp3_xpath/%{oversion}/xpp3_x Source3: http://repo1.maven.org/maven2/xpp3/xpp3_min/%{oversion}/xpp3_min-%{oversion}.pom Source4: %{name}-%{oversion}-OSGI-MANIFEST.MF Patch0: %{name}-link-docs-locally.patch -Requires: java-headless + BuildRequires: javapackages-local +BuildRequires: java-javadoc BuildRequires: zip BuildRequires: ant BuildRequires: junit -BuildRequires: xml-commons-apis -Requires: xml-commons-apis BuildArch: noarch @@ -36,6 +35,7 @@ Minimal XML pull parser implementation. %package javadoc Summary: Javadoc for %{name} +Requires: java-javadoc %description javadoc Javadoc for %{name}. @@ -52,8 +52,11 @@ rm -rf src/java/builder/javax # "src/java/addons_tests" does not exist sed -i 's|depends="junit_main,junit_addons"|depends="junit_main"|' build.xml +# relax javadoc linting +sed -i '/ - 1.1.4-15.c +- Remove unnecessary dep on xml-commons-apis +- Fix errors in javadoc generation + * Wed Mar 22 2017 Michael Simacek - 1.1.4-14.c - Install jars directly into javadir From 061be431338a0b136501dfd6051f8c3564b95238 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:25:25 +0000 Subject: [PATCH 23/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index cc07020..1f35597 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 15.c%{?dist} +Release: 16.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -90,6 +90,9 @@ popd %license LICENSE.txt %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.1.4-16.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue May 16 2017 Mat Booth - 1.1.4-15.c - Remove unnecessary dep on xml-commons-apis - Fix errors in javadoc generation From 2e4c1ff907426a2d91f3753f5b802d1187a92731 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 25 Sep 2017 17:39:01 +0200 Subject: [PATCH 24/35] Elimitate race condition when injecting JAR manifest Resolves: rhbz#1495247 --- xpp3.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/xpp3.spec b/xpp3.spec index 1f35597..45808db 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 16.c%{?dist} +Release: 17.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -15,7 +15,6 @@ Patch0: %{name}-link-docs-locally.patch BuildRequires: javapackages-local BuildRequires: java-javadoc -BuildRequires: zip BuildRequires: ant BuildRequires: junit @@ -60,13 +59,7 @@ export CLASSPATH=$(build-classpath junit) ant xpp3 junit apidoc # Add OSGi metadata -pushd build -mkdir META-INF -unzip -o %{name}-%{oversion}.jar META-INF/MANIFEST.MF -cat %{SOURCE4} >> META-INF/MANIFEST.MF -sed -i '/^\r$/d' META-INF/MANIFEST.MF -zip -u %{name}-%{oversion}.jar META-INF/MANIFEST.MF -popd +jar ufm build/%{name}-%{oversion}.jar %{SOURCE4} %install %mvn_file ':{*}' @1 @@ -90,6 +83,10 @@ popd %license LICENSE.txt %changelog +* Mon Sep 25 2017 Mikolaj Izdebski - 1.1.4-17.c +- Elimitate race condition when injecting JAR manifest +- Resolves: rhbz#1495247 + * Thu Jul 27 2017 Fedora Release Engineering - 1.1.4-16.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 458dbefcac80f72ee49807dffa6d69122c235918 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:03:31 +0000 Subject: [PATCH 25/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 45808db..c906566 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 17.c%{?dist} +Release: 18.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -83,6 +83,9 @@ jar ufm build/%{name}-%{oversion}.jar %{SOURCE4} %license LICENSE.txt %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.1.4-18.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Sep 25 2017 Mikolaj Izdebski - 1.1.4-17.c - Elimitate race condition when injecting JAR manifest - Resolves: rhbz#1495247 From 55b1bde003f7baa789371d31ce891be0e0d75cac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:33:43 +0000 Subject: [PATCH 26/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index c906566..0fb4144 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 18.c%{?dist} +Release: 19.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -83,6 +83,9 @@ jar ufm build/%{name}-%{oversion}.jar %{SOURCE4} %license LICENSE.txt %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.4-19.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.1.4-18.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From cb386294c51db845a3fa801ea2b591daf7abac71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:47:23 +0000 Subject: [PATCH 27/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 0fb4144..60cf0c1 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 19.c%{?dist} +Release: 20.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -83,6 +83,9 @@ jar ufm build/%{name}-%{oversion}.jar %{SOURCE4} %license LICENSE.txt %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.1.4-20.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1.1.4-19.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a704e8ad209fbab390b6252d75d468c4e9ea72f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:36:28 +0000 Subject: [PATCH 28/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 60cf0c1..b52c832 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 20.c%{?dist} +Release: 21.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -83,6 +83,9 @@ jar ufm build/%{name}-%{oversion}.jar %{SOURCE4} %license LICENSE.txt %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.1.4-21.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.1.4-20.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 94ec4c98bc15f09f368329667001362f0b7ad876 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:52:36 +0000 Subject: [PATCH 29/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index b52c832..e2e9887 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 21.c%{?dist} +Release: 22.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -83,6 +83,9 @@ jar ufm build/%{name}-%{oversion}.jar %{SOURCE4} %license LICENSE.txt %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.1.4-22.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.1.4-21.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 407779e3383a2ea1e28119c8816e8a4f83152f7f Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 09:04:00 +0200 Subject: [PATCH 30/35] Rebuilt for JDK-11 --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index e2e9887..992c5ac 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 22.c%{?dist} +Release: 23.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -83,6 +83,9 @@ jar ufm build/%{name}-%{oversion}.jar %{SOURCE4} %license LICENSE.txt %changelog +* Sat Jul 11 2020 Jiri Vanek - 1.1.4-23.c +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Fri Jan 31 2020 Fedora Release Engineering - 1.1.4-22.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e47b88a5fa933c50a867137ef169650adc23d1fb Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 13 Jul 2020 12:11:42 +0100 Subject: [PATCH 31/35] Allow building on Java 11 --- xpp3.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 992c5ac..85ac809 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 23.c%{?dist} +Release: 24.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -54,8 +54,12 @@ sed -i 's|depends="junit_main,junit_addons"|depends="junit_main"|' build.xml # relax javadoc linting sed -i '/ - 1.1.4-24.c +- Allow building on Java 11 + * Sat Jul 11 2020 Jiri Vanek - 1.1.4-23.c - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From c9ebd237cb9d13ef794954921662283ea2d78ca0 Mon Sep 17 00:00:00 2001 From: Jiri Date: Tue, 14 Jul 2020 04:31:18 +0200 Subject: [PATCH 32/35] Rebuilt for JDK-11 --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 85ac809..8be9f54 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 24.c%{?dist} +Release: 25.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -87,6 +87,9 @@ jar ufm build/%{name}-%{oversion}.jar %{SOURCE4} %license LICENSE.txt %changelog +* Tue Jul 14 2020 Jiri Vanek - 1.1.4-25.c +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Mon Jul 13 2020 Mat Booth - 1.1.4-24.c - Allow building on Java 11 From 08edf584939e555fc35a55f0630f3fa73022b934 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:03:10 +0000 Subject: [PATCH 33/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index 8be9f54..a217db6 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 25.c%{?dist} +Release: 26.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -87,6 +87,9 @@ jar ufm build/%{name}-%{oversion}.jar %{SOURCE4} %license LICENSE.txt %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.4-26.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Jiri Vanek - 1.1.4-25.c - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 34551979dbccb9eec897dcff89bb458aa515f3a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:21:48 +0000 Subject: [PATCH 34/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpp3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp3.spec b/xpp3.spec index a217db6..ee68dbd 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -3,7 +3,7 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.4 -Release: 26.c%{?dist} +Release: 27.c%{?dist} License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -87,6 +87,9 @@ jar ufm build/%{name}-%{oversion}.jar %{SOURCE4} %license LICENSE.txt %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 1.1.4-27.c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.1.4-26.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From eb3a52689ea4956861148791bd4b9f978d50f365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 8 Jun 2021 21:25:59 +0200 Subject: [PATCH 35/35] Orphaned for 6+ weeks --- .gitignore | 5 - dead.package | 1 + sources | 4 - xpp3-1.1.3.4.O.pom | 13 -- xpp3-1.1.4c-OSGI-MANIFEST.MF | 19 --- xpp3-link-docs-locally.patch | 11 -- xpp3.spec | 242 ----------------------------------- xpp3_min-1.1.3.4.O.pom | 13 -- xpp3_xpath-1.1.3.4.O.pom | 13 -- 9 files changed, 1 insertion(+), 320 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xpp3-1.1.3.4.O.pom delete mode 100644 xpp3-1.1.4c-OSGI-MANIFEST.MF delete mode 100644 xpp3-link-docs-locally.patch delete mode 100644 xpp3.spec delete mode 100644 xpp3_min-1.1.3.4.O.pom delete mode 100644 xpp3_xpath-1.1.3.4.O.pom diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 70f393f..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -xpp3-1.1.3_8_src.tgz -/xpp3-1.1.4c_src.tgz -/xpp3-1.1.4c.pom -/xpp3_min-1.1.4c.pom -/xpp3_xpath-1.1.4c.pom diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 366ca88..0000000 --- a/sources +++ /dev/null @@ -1,4 +0,0 @@ -2eb712ad18d7de5d3bfab87ebb56173a xpp3-1.1.4c_src.tgz -490c04a30131e926c978f35913d1ad14 xpp3-1.1.4c.pom -d822fa0c9182ae670b78533bd5a5ed7b xpp3_min-1.1.4c.pom -0f514fb9c61b81158b301a78140b5f8e xpp3_xpath-1.1.4c.pom diff --git a/xpp3-1.1.3.4.O.pom b/xpp3-1.1.3.4.O.pom deleted file mode 100644 index e823b67..0000000 --- a/xpp3-1.1.3.4.O.pom +++ /dev/null @@ -1,13 +0,0 @@ - - - 4.0.0 - xpp3 - xpp3 - 1.1.3.4.O - jar - http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/ - MXP1 is a stable XmlPull parsing engine that is based on ideas from XPP and in particular XPP2 but completely revised and rewritten to take the best advantage of latest JIT JVMs such as Hotspot in JDK 1.4+. - - scm:cvs:pserver:anonymous@cvs.extreme.indiana.edu:/l/extreme/cvspub/XPP3 - - \ No newline at end of file diff --git a/xpp3-1.1.4c-OSGI-MANIFEST.MF b/xpp3-1.1.4c-OSGI-MANIFEST.MF deleted file mode 100644 index 0a2d251..0000000 --- a/xpp3-1.1.4c-OSGI-MANIFEST.MF +++ /dev/null @@ -1,19 +0,0 @@ -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.xmlpull -Bundle-Version: 1.1.4 -Export-Package: org.xmlpull.mxp1, - org.xmlpull.mxp1_serializer, - org.xmlpull.v1, - org.xmlpull.v1.builder, - org.xmlpull.v1.builder.adapter, - org.xmlpull.v1.builder.impl, - org.xmlpull.v1.dom2_builder, - org.xmlpull.v1.parser_pool, - org.xmlpull.v1.sax2, - org.xmlpull.v1.util, - org.xmlpull.v1.wrapper, - org.xmlpull.v1.wrapper.classic -Import-Package: javax.xml.parsers;resolution:=optional, - org.w3c.dom;resolution:=optional, - org.xml.sax;resolution:=optional, - org.xml.sax.helpers;resolution:=optional diff --git a/xpp3-link-docs-locally.patch b/xpp3-link-docs-locally.patch deleted file mode 100644 index 81a9650..0000000 --- a/xpp3-link-docs-locally.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./build.xml.sav 2007-02-14 20:50:19.000000000 -0500 -+++ ./build.xml 2007-02-14 20:50:41.000000000 -0500 -@@ -479,7 +479,7 @@ - windowtitle="${name} ${version} API" - doctitle="${name}" - bottom="${copyright}" -- link="http://java.sun.com/j2se/1.4/docs/api/" -+ link="file:///usr/share/javadoc/java" - /> - - diff --git a/xpp3.spec b/xpp3.spec deleted file mode 100644 index ee68dbd..0000000 --- a/xpp3.spec +++ /dev/null @@ -1,242 +0,0 @@ -%global oversion 1.1.4c - -Summary: XML Pull Parser -Name: xpp3 -Version: 1.1.4 -Release: 27.c%{?dist} -License: ASL 1.1 -URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html -Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz -Source1: http://repo1.maven.org/maven2/xpp3/xpp3/%{oversion}/xpp3-%{oversion}.pom -Source2: http://repo1.maven.org/maven2/xpp3/xpp3_xpath/%{oversion}/xpp3_xpath-%{oversion}.pom -Source3: http://repo1.maven.org/maven2/xpp3/xpp3_min/%{oversion}/xpp3_min-%{oversion}.pom -Source4: %{name}-%{oversion}-OSGI-MANIFEST.MF -Patch0: %{name}-link-docs-locally.patch - -BuildRequires: javapackages-local -BuildRequires: java-javadoc -BuildRequires: ant -BuildRequires: junit - -BuildArch: noarch - -%description -XML Pull Parser 3rd Edition (XPP3) MXP1 is an XmlPull -parsing engine that is based on ideas from XPP and in -particular XPP2 but completely revised and rewritten to -take best advantage of latest JIT JVMs such as Hotspot in JDK 1.4. - -%package minimal -Summary: Minimal XML Pull Parser - -%description minimal -Minimal XML pull parser implementation. - -%package javadoc -Summary: Javadoc for %{name} -Requires: java-javadoc - -%description javadoc -Javadoc for %{name}. - -%prep -%setup -q -n %{name}-%{oversion} -# remove all binary libs -find -name \*.jar -delete -# Remove class bundled from Axis (now it's bundled in JRE) -rm -rf src/java/builder/javax - -%patch0 - -# "src/java/addons_tests" does not exist -sed -i 's|depends="junit_main,junit_addons"|depends="junit_main"|' build.xml - -# relax javadoc linting -sed -i '/ - 1.1.4-27.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.1.4-26.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Jiri Vanek - 1.1.4-25.c -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Mon Jul 13 2020 Mat Booth - 1.1.4-24.c -- Allow building on Java 11 - -* Sat Jul 11 2020 Jiri Vanek - 1.1.4-23.c -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.1.4-22.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.1.4-21.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.1.4-20.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.1.4-19.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.1.4-18.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 25 2017 Mikolaj Izdebski - 1.1.4-17.c -- Elimitate race condition when injecting JAR manifest -- Resolves: rhbz#1495247 - -* Thu Jul 27 2017 Fedora Release Engineering - 1.1.4-16.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue May 16 2017 Mat Booth - 1.1.4-15.c -- Remove unnecessary dep on xml-commons-apis -- Fix errors in javadoc generation - -* Wed Mar 22 2017 Michael Simacek - 1.1.4-14.c -- Install jars directly into javadir - -* Wed Mar 22 2017 Michael Simacek - 1.1.4-13.c -- Install with XMvn - -* Sat Feb 11 2017 Fedora Release Engineering - 1.1.4-12.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Mar 23 2016 Severin Gehwolf - 1.1.4-11.c -- Add OSGi metadata. - -* Fri Feb 05 2016 Fedora Release Engineering - 1.1.4-10.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 19 2016 Mikolaj Izdebski - 1.1.4-9.c -- Remove bundled javax.xml.namespace.QName class -- Resolves: rhbz#1299679 - -* Thu Dec 24 2015 gil cattaneo 1.1.4-8.c -- convert %%defines to %%global - -* Tue Jul 14 2015 Mikolaj Izdebski - 1.1.4-7.c -- Add build-requires on javapackages-local - -* Fri Jun 19 2015 Fedora Release Engineering - 1.1.4-6.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Feb 13 2015 gil cattaneo 1.1.4-5.c -- introduce license macro - -* Tue Dec 9 2014 Alexander Kurtakov 1.1.4-4.c -- Drop useless Requires. - -* Sun Jun 08 2014 Fedora Release Engineering - 1.1.4-3.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1.1.4-2.c -- Use Requires: java-headless rebuild (#1067528) - -* Wed Feb 19 2014 Michal Srb - 1.1.4-1.c -- Update to upstream version 1.1.4c - -* Sun Aug 04 2013 Fedora Release Engineering - 0:1.1.3.8-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Jun 21 2013 Mikolaj Izdebski - 0:1.1.3.8-9 -- General specfile cleanup -- Update to current packaging guidelines - -* Fri Feb 15 2013 Fedora Release Engineering - 0:1.1.3.8-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0:1.1.3.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0:1.1.3.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 0:1.1.3.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Dec 2 2010 Stanislav Ochotnicky - 0:1.1.3.8-4 -- Fix pom filenames (Resolves rhbz#655829) -- Changes according to new guidelines (versionless jars) -- Fix few packaging problems (post/postun deps) - -* Mon Jun 14 2010 Alexander Kurtakov 0:1.1.3.8-3.4 -- Add maven poms and depmaps. - -* Wed Mar 10 2010 Peter Lemenkov - 0:1.1.3.8-3.3 -- *-javadoc must also require jpackage-utils (for %%{_javadocdir}) - -* Mon Jul 27 2009 Fedora Release Engineering - 0:1.1.3.8-3.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0:1.1.3.8-2.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Sep 6 2008 Tom "spot" Callaway - 0:1.1.3.8-1.2 -- fix license tag -- drop jpp tag - -* Mon Feb 12 2007 Fernando Nasser - 0:1.1.3.8-1jpp.1 -- Import -- Fix per Fedora spec - -* Mon Feb 12 2007 Fernando Nasser - 0:1.1.3.8-1jpp -- Upgrade to 1.1.3.8 -- Remove vendor and distribution tags - -* Mon Feb 27 2006 Fernando Nasser - 0:1.1.3.4-1.o.2jpp -- First JPP 1.7 build - -* Tue Dec 20 2005 Ralph Apel - 0:1.1.3.4-1.o.1jpp -- Upgrade to 1.1.3.4-O -- Now includes xpath support - -* Thu Aug 26 2004 Ralph Apel - 0:1.1.3.4-1.d.2jpp -- Build with ant-1.6.2 - -* Tue Jun 01 2004 Ralph Apel - 0:1.1.3.4-1.d.1jpp -- Update to 1.1.3.4 - -* Mon May 5 2003 Ville Skyttä - 0:1.1.2-1.a.3jpp -- Fix non-versioned javadoc symlinking. - -* Mon Apr 21 2003 Ville Skyttä - 0:1.1.2-1.a.2jpp -- Include non-versioned javadoc symlink. - -* Tue Apr 1 2003 Ville Skyttä - 0:1.1.2-1.a.1jpp -- First JPackage release. diff --git a/xpp3_min-1.1.3.4.O.pom b/xpp3_min-1.1.3.4.O.pom deleted file mode 100644 index befa0d5..0000000 --- a/xpp3_min-1.1.3.4.O.pom +++ /dev/null @@ -1,13 +0,0 @@ - - - 4.0.0 - xpp3 - xpp3_min - 1.1.3.4.O - jar - http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/ - MXP1 is a stable XmlPull parsing engine that is based on ideas from XPP and in particular XPP2 but completely revised and rewritten to take the best advantage of latest JIT JVMs such as Hotspot in JDK 1.4+. - - scm:cvs:pserver:anonymous@cvs.extreme.indiana.edu:/l/extreme/cvspub/XPP3 - - \ No newline at end of file diff --git a/xpp3_xpath-1.1.3.4.O.pom b/xpp3_xpath-1.1.3.4.O.pom deleted file mode 100644 index 50ff42c..0000000 --- a/xpp3_xpath-1.1.3.4.O.pom +++ /dev/null @@ -1,13 +0,0 @@ - - - 4.0.0 - xpp3 - xpp3_xpath - 1.1.3.4.O - jar - http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/ - MXP1 is a stable XmlPull parsing engine that is based on ideas from XPP and in particular XPP2 but completely revised and rewritten to take the best advantage of latest JIT JVMs such as Hotspot in JDK 1.4+. - - scm:cvs:pserver:anonymous@cvs.extreme.indiana.edu:/l/extreme/cvspub/XPP3 - - \ No newline at end of file