From f9ff3d8052138f2cffc28870d4f48bccef5c0de4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 25 Mar 2015 12:45:28 +0100 Subject: [PATCH 1/6] Remove workarounds for RPM bug #646523 --- xpp2.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/xpp2.spec b/xpp2.spec index 2617504..8c35207 100644 --- a/xpp2.spec +++ b/xpp2.spec @@ -33,7 +33,7 @@ Summary: XML Pull Parser Name: xpp2 Version: 2.1.10 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 0 License: xpp and ASL 1.1 and Public Domain URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/ @@ -112,16 +112,6 @@ rm -rf doc/{build.txt,api,api_impl} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} -%pretrans javadoc -# workaround for rpm bug, can be removed in F-23 -[ -L %{_javadocdir}/%{name} ] && \ -rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - -%pretrans demo -# workaround for rpm bug, can be removed in F-23 -[ -L %{_datadir}/%{name} ] && \ -rm -rf $(readlink -f %{_datadir}/%{name}) %{_datadir}/%{name} || : - %files %doc LICENSE.txt README.html doc %{_javadir}/%{name}.jar @@ -137,6 +127,9 @@ rm -rf $(readlink -f %{_datadir}/%{name}) %{_datadir}/%{name} || : %{_datadir}/%{name} %changelog +* Wed Mar 25 2015 Mikolaj Izdebski - 0:2.1.10-20 +- Remove workarounds for RPM bug #646523 + * Sun Jun 08 2014 Fedora Release Engineering - 0:2.1.10-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 9701f980088ac15a4baf937a13cfe3847a5de2da Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:24:56 +0000 Subject: [PATCH 2/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xpp2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp2.spec b/xpp2.spec index 8c35207..a855711 100644 --- a/xpp2.spec +++ b/xpp2.spec @@ -33,7 +33,7 @@ Summary: XML Pull Parser Name: xpp2 Version: 2.1.10 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 0 License: xpp and ASL 1.1 and Public Domain URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/ @@ -127,6 +127,9 @@ cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} %{_datadir}/%{name} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0:2.1.10-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Mar 25 2015 Mikolaj Izdebski - 0:2.1.10-20 - Remove workarounds for RPM bug #646523 From c76956dffa5ec324ff38acc0db471b572b48b1cd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jul 2015 09:27:49 +0200 Subject: [PATCH 3/6] Add build-requires on javapackages-local --- xpp2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xpp2.spec b/xpp2.spec index a855711..bbcc728 100644 --- a/xpp2.spec +++ b/xpp2.spec @@ -33,7 +33,7 @@ Summary: XML Pull Parser Name: xpp2 Version: 2.1.10 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 0 License: xpp and ASL 1.1 and Public Domain URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/ @@ -42,7 +42,7 @@ Source0: http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParse Patch0: xpp2-build_xml.patch BuildRequires: ant >= 0:1.6 BuildRequires: ant-junit >= 0:1.6 -BuildRequires: jpackage-utils >= 0:1.6 +BuildRequires: javapackages-local BuildRequires: junit BuildRequires: xml-commons-apis Requires: xml-commons-apis @@ -127,6 +127,9 @@ cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} %{_datadir}/%{name} %changelog +* Tue Jul 14 2015 Mikolaj Izdebski - 0:2.1.10-22 +- Add build-requires on javapackages-local + * Fri Jun 19 2015 Fedora Release Engineering - 0:2.1.10-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 1b4f63bda1108685fb3acbacd024f9fe5b2af250 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:48:26 +0000 Subject: [PATCH 4/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xpp2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp2.spec b/xpp2.spec index bbcc728..23b01f5 100644 --- a/xpp2.spec +++ b/xpp2.spec @@ -33,7 +33,7 @@ Summary: XML Pull Parser Name: xpp2 Version: 2.1.10 -Release: 22%{?dist} +Release: 23%{?dist} Epoch: 0 License: xpp and ASL 1.1 and Public Domain URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/ @@ -127,6 +127,9 @@ cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} %{_datadir}/%{name} %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0:2.1.10-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jul 14 2015 Mikolaj Izdebski - 0:2.1.10-22 - Add build-requires on javapackages-local From 4cc21ec17551d87b3bc8d67911712e67c3b837ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:08:10 +0000 Subject: [PATCH 5/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xpp2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp2.spec b/xpp2.spec index 23b01f5..85ebbcb 100644 --- a/xpp2.spec +++ b/xpp2.spec @@ -33,7 +33,7 @@ Summary: XML Pull Parser Name: xpp2 Version: 2.1.10 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 0 License: xpp and ASL 1.1 and Public Domain URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/ @@ -127,6 +127,9 @@ cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} %{_datadir}/%{name} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0:2.1.10-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 0:2.1.10-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From ac59237cf6044a4b546e092ee3c6fe489f2d85f7 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 4 Apr 2017 17:30:19 +0200 Subject: [PATCH 6/6] xpp2 has been superseded by xpp3 and is not being developed since 2003 --- .gitignore | 1 - dead.package | 1 + sources | 1 - xpp2-build_xml.patch | 199 --------------------------------------- xpp2.spec | 216 ------------------------------------------- 5 files changed, 1 insertion(+), 417 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xpp2-build_xml.patch delete mode 100644 xpp2.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 47cb828..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -PullParser2.1.10.tgz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..50ca0c0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +xpp2 has been superseded by xpp3 and is not being developed since 2003 diff --git a/sources b/sources deleted file mode 100644 index d129abc..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -865ca4e2496c215d301b57450137626f PullParser2.1.10.tgz diff --git a/xpp2-build_xml.patch b/xpp2-build_xml.patch deleted file mode 100644 index 9df42aa..0000000 --- a/xpp2-build_xml.patch +++ /dev/null @@ -1,199 +0,0 @@ ---- build.xml.sav 2003-11-15 06:42:11.000000000 +0100 -+++ build.xml 2005-08-10 11:58:48.000000000 +0200 -@@ -9,7 +9,8 @@ - - - -- -+ -+ - - - -@@ -165,7 +166,7 @@ - - - -- -+ - - - -@@ -175,7 +176,7 @@ - - - -- - -@@ -185,7 +186,7 @@ - - - -- - -@@ -195,7 +196,7 @@ - - - -- - -@@ -205,7 +206,7 @@ - - - -- - -@@ -215,7 +216,7 @@ - - - -- - -@@ -247,7 +248,7 @@ - - - -- - -@@ -271,7 +272,7 @@ - - - -- - -@@ -279,7 +280,7 @@ - - - -- -@@ -304,7 +305,7 @@ - - - -- -@@ -319,7 +320,7 @@ - - - -- - -@@ -327,7 +328,7 @@ - - - -- -@@ -336,7 +337,7 @@ - - - -- -@@ -350,7 +351,7 @@ - -- -@@ -385,7 +386,7 @@ - - - -- - - -- -@@ -443,7 +444,7 @@ - - - -- - -- - - -@@ -537,7 +538,7 @@ - - - -- - - -@@ -580,6 +581,7 @@ - = 0:1.6 -BuildRequires: ant-junit >= 0:1.6 -BuildRequires: javapackages-local -BuildRequires: junit -BuildRequires: xml-commons-apis -Requires: xml-commons-apis -Requires: jpackage-utils -BuildArch: noarch -Provides: xpp2-doc = 0:%{version}-%{release} -Obsoletes: xpp2-doc < 0:2.1.10-18 - -%description -XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser. -NOTE: XPP2 is no longer developed and is on maintenance mode. -All active development concentrates on its successor XPP3/MXP1. - -%package javadoc -Summary: Javadoc for %{name} -Group: Documentation - -%description javadoc -%{summary}. - -%package demo -Summary: Samples for %{name} -Group: Documentation -Requires: %{name} = %{epoch}:%{version} - -%description demo -%{summary}. - -%prep -%setup -q -n %{originalname}%{version} -# remove all binary libs and prebuilt classes -find \( -name *.class -o -name *.jar \) -delete - -%patch0 -b .sav - -# Fix encoding of licence file -iconv -f ISO-8859-1 -t UTF-8 LICENSE.txt > LICENSE.txt.utf8 -mv LICENSE.txt.utf8 LICENSE.txt - -%build -export CLASSPATH=$(build-classpath xml-commons-apis) -ant all api api.impl -CLASSPATH=$CLASSPATH:$(build-classpath junit):build/tests:build/lib/PullParser-2.1.10.jar -java AllTests - -%install -# jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} - -cp -p build/lib/%{originalname}-intf-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-intf.jar -cp -p build/lib/%{originalname}-standard-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-standard.jar -cp -p build/lib/%{originalname}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -cp -p build/lib/%{originalname}-x2-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-x2.jar - -# javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api_impl -cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api -cp -pr doc/api_impl/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api_impl -rm -rf doc/{build.txt,api,api_impl} - -# demo -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} -cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} - -%files -%doc LICENSE.txt README.html doc -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-intf.jar -%{_javadir}/%{name}-standard.jar -%{_javadir}/%{name}-x2.jar - -%files javadoc -%doc LICENSE.txt -%{_javadocdir}/%{name} - -%files demo -%{_datadir}/%{name} - -%changelog -* Sat Feb 11 2017 Fedora Release Engineering - 0:2.1.10-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0:2.1.10-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jul 14 2015 Mikolaj Izdebski - 0:2.1.10-22 -- Add build-requires on javapackages-local - -* Fri Jun 19 2015 Fedora Release Engineering - 0:2.1.10-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Mar 25 2015 Mikolaj Izdebski - 0:2.1.10-20 -- Remove workarounds for RPM bug #646523 - -* Sun Jun 08 2014 Fedora Release Engineering - 0:2.1.10-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Aug 26 2013 Mat Booth - 0:2.1.10-18 -- Update for newer guidelines, drop versioned jars, duplicate docs -- Fixes rhbz #993885, rhbz #1001270 - -* Sun Aug 04 2013 Fedora Release Engineering - 0:2.1.10-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue May 14 2013 Mikolaj Izdebski - 0:2.1.10-16 -- Remove prebuilt classes -- Resolves: rhbz#959429 - -* Fri Feb 15 2013 Fedora Release Engineering - 0:2.1.10-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Aug 15 2012 Stanislav Ochotnicky - 0:2.1.10-14 -- The license is actually a mixture of ASL 1.1, xpp and Public Domain - -* Wed Aug 15 2012 Stanislav Ochotnicky - 0:2.1.10-13 -- Fix license from ASL to xpp (new license type) - -* Sun Jul 22 2012 Fedora Release Engineering - 0:2.1.10-11.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0:2.1.10-10.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 0:2.1.10-9.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Mar 10 2010 Peter Lemenkov - 0:2.1.10-8.3 -- Added missing requires - jpackage-utils - -* Mon Jul 27 2009 Fedora Release Engineering - 0:2.1.10-8.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0:2.1.10-7.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jul 10 2008 Tom "spot" Callaway - 0:2.1.10-6.2 -- drop repotag -- fix license tag - -* Tue Feb 13 2007 Permaine Cheung - 0:2.1.10-6jpp.1 -- Fix release, license, buildroot, typo, and other rpmlint issues. -- Got rid of Vendor and Distribution. -- Rename manual subpackage to doc. -- Move README and LICENSE file back into main package, and mark all docs. - -* Tue Apr 11 2006 Ralph Apel - 0:2.1.10-6jpp -- First JPP-1.7 release - -* Wed Aug 10 2005 Ralph Apel - 0:2.1.10-5jpp -- Fix Bug 17 installed but unpackaged symlinks -- Patch build.xml for source=1.4 and target=1.4 - -* Thu Aug 26 2004 Ralph Apel - 0:2.1.10-4jpp -- Build with ant-1.6.2 -- Relax some versioned dependencies - -* Tue Jun 01 2004 Randy Watler - 0:2.1.10-3jpp -- Upgrade to Ant 1.6.X - -* Mon Jan 19 2004 Ralph Apel - 0:2.1.10-2jpp -- Fix rpm var _originalname to originalname -- Include versionless symlinks for javadoc, manual and demo -- demo requires main package - -* Thu Jan 15 2004 Ralph Apel - 0:2.1.10-1jpp -- First JPackage build