From 725fa803ed2bdcceb4c7725e29db2918891cb8a3 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 30 Jan 2009 16:38:05 +0000 Subject: [PATCH 001/100] Install osgi manifest for eclipse-dtp --- xml-commons-resolver-MANIFEST.MF | 13 +++++++++++++ xml-commons-resolver.spec | 15 ++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 xml-commons-resolver-MANIFEST.MF diff --git a/xml-commons-resolver-MANIFEST.MF b/xml-commons-resolver-MANIFEST.MF new file mode 100644 index 0000000..7580de8 --- /dev/null +++ b/xml-commons-resolver-MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Bundle-RequiredExecutionEnvironment: J2SE-1.2 +Main-Class: org.apache.xml.resolver.apps.resolver +Bundle-SymbolicName: org.apache.xml.resolver +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-Localization: plugin +Bundle-Version: 1.2.0.v200806030312 +Bundle-Vendor: %Bundle-Vendor.0 +Require-Bundle: system.bundle +Export-Package: org.apache.env,org.apache.xml.resolver,org.apache.xml. + resolver.apps,org.apache.xml.resolver.etc,org.apache.xml.resolver.hel + pers,org.apache.xml.resolver.readers,org.apache.xml.resolver.tools diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index d7bf3c0..4810f6e 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -7,7 +7,7 @@ Name: xml-commons-resolver Version: 1.1 -Release: 2.14%{?dist} +Release: 2.15%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons. License: ASL 1.1 @@ -16,6 +16,7 @@ Source0: xml-commons-resolver-1.1-RHCLEAN.tar.bz2 Source1: xml-commons-resolver-resolver.sh Source2: xml-commons-resolver-xread.sh Source3: xml-commons-resolver-xparse.sh +Source4: %{name}-MANIFEST.MF Patch0: %{name}-src-version.patch @@ -78,6 +79,12 @@ ant -f resolver.xml jar javadocs %install rm -rf $RPM_BUILD_ROOT +# inject OSGi manifests +mkdir -p META-INF +cp -p %{SOURCE4} META-INF/MANIFEST.MF +touch META-INF/MANIFEST.MF +zip -u build/resolver.jar META-INF/MANIFEST.MF + # Jars mkdir -p $RPM_BUILD_ROOT%{_javadir} cp build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar @@ -142,6 +149,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Fri Jan 30 2009 Alexander Kurtakov 0:1.1-2.15 +- Install osgi manifest for eclipse-dtp + * Fri Sep 05 2008 Deepak Bhole 1.1-2.14 - Build with IcedTea to escape sinjdoc issues @@ -196,6 +206,5 @@ fi * Tue May 06 2003 David Walluck 0:1.0-2jpp - update for JPackage 1.5 -* Wed Nov 13 2002 Ville Skyttä - 1.0-1jpp +* Wed Nov 13 2002 Ville Skytt� - 1.0-1jpp - Follow upstream changes, split out of xml-commons. - From 4c9cf729bef1d48934605150eb0fc3dfe59ac180 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 09:56:46 +0000 Subject: [PATCH 002/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 4810f6e..0402157 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -7,7 +7,7 @@ Name: xml-commons-resolver Version: 1.1 -Release: 2.15%{?dist} +Release: 3.15%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons. License: ASL 1.1 @@ -149,6 +149,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 0:1.1-3.15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Jan 30 2009 Alexander Kurtakov 0:1.1-2.15 - Install osgi manifest for eclipse-dtp From 7ef923b1e676589042d8c47d4493b6120ce7afa9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:10:00 +0000 Subject: [PATCH 003/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 0402157..0f295f8 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -7,7 +7,7 @@ Name: xml-commons-resolver Version: 1.1 -Release: 3.15%{?dist} +Release: 4.15%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons. License: ASL 1.1 @@ -149,6 +149,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-4.15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 0:1.1-3.15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From f5a29c7be37c4c39949a1ca3716835c47074eb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 8 Aug 2009 13:18:05 +0000 Subject: [PATCH 004/100] - Fix specfile UTF-8 encoding. --- xml-commons-resolver.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 0f295f8..ce88597 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -7,7 +7,7 @@ Name: xml-commons-resolver Version: 1.1 -Release: 4.15%{?dist} +Release: 4.16%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons. License: ASL 1.1 @@ -149,6 +149,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Sat Aug 8 2009 Ville Skyttä - 0:1.1-4.16 +- Fix specfile UTF-8 encoding. + * Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-4.15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -212,5 +215,5 @@ fi * Tue May 06 2003 David Walluck 0:1.0-2jpp - update for JPackage 1.5 -* Wed Nov 13 2002 Ville Skytt� - 1.0-1jpp +* Wed Nov 13 2002 Ville Skyttä - 1.0-1jpp - Follow upstream changes, split out of xml-commons. From f73c744374d18e7d6613a6c6dbdba69fdb50e5e5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:00 +0000 Subject: [PATCH 005/100] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7e04885..1977090 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xml-commons-resolver -# $Id: Makefile,v 1.1 2004/09/09 14:51:11 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:32:14 notting Exp $ NAME := xml-commons-resolver SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From d374ae37f65c1025186f1eddbb1279723e454b38 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 11 Jan 2010 15:24:31 +0000 Subject: [PATCH 006/100] - Fix Group tags - Remove '.' at end of Summary - Add dos2unix BR and fix line endings - Use upstream tarball --- .cvsignore | 1 + sources | 1 + xml-commons-resolver.spec | 35 +++++++++++++++++++---------------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index 20b210c..b2586b6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ xml-commons-resolver-1.1-RHCLEAN.tar.bz2 xml-commons-resolver-1.1 noarch *.src.rpm +xml-commons-resolver-1.1.tar.gz diff --git a/sources b/sources index f639b6a..893d8d5 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ e72bd3cbc4e5972d15f6a8f9842482e0 xml-commons-resolver-1.1-RHCLEAN.tar.bz2 +deb95bdf88687430445d34e8c11d475e xml-commons-resolver-1.1.tar.gz diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index ce88597..09e7644 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,42 +1,38 @@ - -%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}}} - -%define section free +%define gcj_support 1 Name: xml-commons-resolver Version: 1.1 -Release: 4.16%{?dist} +Release: 4.17%{?dist} Epoch: 0 -Summary: Resolver subproject of xml-commons. +Summary: Resolver subproject of xml-commons License: ASL 1.1 URL: http://xml.apache.org/commons/ -Source0: xml-commons-resolver-1.1-RHCLEAN.tar.bz2 +Source0: http://www.apache.org/dist/xml/commons/xml-commons-resolver-1.1.tar.gz Source1: xml-commons-resolver-resolver.sh Source2: xml-commons-resolver-xread.sh Source3: xml-commons-resolver-xparse.sh Source4: %{name}-MANIFEST.MF -Patch0: %{name}-src-version.patch +Patch0: %{name}-src-version.patch Requires: jaxp_parser_impl -Requires: xml-commons-apis +Requires: xml-commons-apis BuildRequires: java-devel >= 1.6.0 BuildRequires: ant BuildRequires: jpackage-utils >= 0:1.5 +BuildRequires: dos2unix #BuildRequires: %{_bindir}/xsltproc #BuildRequires: docbook-style-xsl -Group: Text Processing/Markup/XML +Group: Development/Libraries %if ! %{gcj_support} BuildArch: noarch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat %endif %description @@ -44,7 +40,7 @@ Resolver subproject of xml-commons. %package javadoc Summary: Javadoc for %{name} -Group: Development/Documentation +Group: Documentation # for /bin/rm and /bin/ln Requires(post): coreutils Requires(postun): coreutils @@ -60,6 +56,7 @@ Javadoc for %{name}. # remove all binary libs and prebuilt javadocs find . -name "*.jar" -exec rm -f {} \; rm -rf docs +dos2unix KEYS LICENSE.resolver.txt %build perl -p -i -e 's|call Resolver|call resolver|g' resolver.xml @@ -149,6 +146,12 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Mon Jan 11 2010 Andrew Overholt 0:1.1-4.17 +- Fix Group tags +- Remove '.' at end of Summary +- Add dos2unix BR and fix line endings +- Use upstream tarball + * Sat Aug 8 2009 Ville Skyttä - 0:1.1-4.16 - Fix specfile UTF-8 encoding. From 8bac9ac5ffdcbbb2023eb34eb18e9ed0d54bb7f7 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 5 Mar 2010 10:40:32 +0000 Subject: [PATCH 007/100] - Update to 1.2. - Drop gcj_support. --- .cvsignore | 1 + sources | 3 +- xml-commons-resolver-src-version.patch | 22 ------------ xml-commons-resolver.spec | 48 ++++---------------------- 4 files changed, 9 insertions(+), 65 deletions(-) delete mode 100644 xml-commons-resolver-src-version.patch diff --git a/.cvsignore b/.cvsignore index b2586b6..62e6d70 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ xml-commons-resolver-1.1 noarch *.src.rpm xml-commons-resolver-1.1.tar.gz +xml-commons-resolver-1.2.tar.gz diff --git a/sources b/sources index 893d8d5..1c2025d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -e72bd3cbc4e5972d15f6a8f9842482e0 xml-commons-resolver-1.1-RHCLEAN.tar.bz2 -deb95bdf88687430445d34e8c11d475e xml-commons-resolver-1.1.tar.gz +46d52acdb67ba60f0156043f30108766 xml-commons-resolver-1.2.tar.gz diff --git a/xml-commons-resolver-src-version.patch b/xml-commons-resolver-src-version.patch deleted file mode 100644 index f8b2c3c..0000000 --- a/xml-commons-resolver-src-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up ./resolver.xml.sav ./resolver.xml ---- ./resolver.xml.sav 2008-09-05 16:06:29.000000000 -0400 -+++ ./resolver.xml 2008-09-05 16:08:16.000000000 -0400 -@@ -83,7 +83,7 @@ Also, you may need to adjust src/documen - - - -- -+ - - - -@@ -143,7 +143,8 @@ Also, you may need to adjust src/documen - use="true" - windowtitle="${name.resolver} API" - doctitle="${name.resolver}" -- bottom="${copyright.message}"> -+ bottom="${copyright.message}" -+ source="1.4"> - - - diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 09e7644..35b66d3 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,20 +1,16 @@ -%define gcj_support 1 - Name: xml-commons-resolver -Version: 1.1 -Release: 4.17%{?dist} +Version: 1.2 +Release: 1%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 1.1 URL: http://xml.apache.org/commons/ -Source0: http://www.apache.org/dist/xml/commons/xml-commons-resolver-1.1.tar.gz +Source0: http://www.apache.org/dist/xml/commons/xml-commons-resolver-%{version}.tar.gz Source1: xml-commons-resolver-resolver.sh Source2: xml-commons-resolver-xread.sh Source3: xml-commons-resolver-xparse.sh Source4: %{name}-MANIFEST.MF -Patch0: %{name}-src-version.patch - Requires: jaxp_parser_impl Requires: xml-commons-apis BuildRequires: java-devel >= 1.6.0 @@ -24,17 +20,9 @@ BuildRequires: dos2unix #BuildRequires: %{_bindir}/xsltproc #BuildRequires: docbook-style-xsl Group: Development/Libraries -%if ! %{gcj_support} BuildArch: noarch -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif - %description Resolver subproject of xml-commons. @@ -51,8 +39,6 @@ Javadoc for %{name}. %prep %setup -q -%patch0 - # remove all binary libs and prebuilt javadocs find . -name "*.jar" -exec rm -f {} \; rm -rf docs @@ -99,10 +85,6 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xml-resolver cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/xml-xread cp %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xml-xparse -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - %clean rm -rf $RPM_BUILD_ROOT @@ -115,37 +97,21 @@ if [ "$1" = "0" ]; then rm -f %{_javadocdir}/%{name} fi -%post -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%postun -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - %files %defattr(0644,root,root,0755) %doc KEYS LICENSE.resolver.txt %{_javadir}/* %attr(0755,root,root) %{_bindir}/* -%if %{gcj_support} -%attr(-,root,root) %{_libdir}/gcj/%{name} -%endif - %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version} %changelog +* Fri Mar 5 2010 Alexander Kurtakov 0:1.2-1 +- Update to 1.2. +- Drop gcj_support. + * Mon Jan 11 2010 Andrew Overholt 0:1.1-4.17 - Fix Group tags - Remove '.' at end of Summary From 128fa603c2c166301b0baf1ef1d76d4c55563113 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 7 Apr 2010 07:58:41 +0000 Subject: [PATCH 008/100] No need to require jaxp_parser_impl now that we require java 1.5 or newer. --- xml-commons-resolver.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 35b66d3..c00808f 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 1.1 @@ -11,9 +11,8 @@ Source2: xml-commons-resolver-xread.sh Source3: xml-commons-resolver-xparse.sh Source4: %{name}-MANIFEST.MF -Requires: jaxp_parser_impl Requires: xml-commons-apis -BuildRequires: java-devel >= 1.6.0 +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: dos2unix @@ -108,6 +107,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Wed Apr 7 2010 Alexander Kurtakov 0:1.2-2 +- No need to require jaxp_parser_impl now that we require java 1.5 or newer. + * Fri Mar 5 2010 Alexander Kurtakov 0:1.2-1 - Update to 1.2. - Drop gcj_support. From 7d0f74ae3f810bfb02a6e7c1291c26c8ecbaa85f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:55:29 +0000 Subject: [PATCH 009/100] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 1977090..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xml-commons-resolver -# $Id: Makefile,v 1.2 2007/10/15 19:32:14 notting Exp $ -NAME := xml-commons-resolver -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From b3a208ae38f7f0f4c64ef513b33c40365b47b61d Mon Sep 17 00:00:00 2001 From: mbooth Date: Sun, 19 Sep 2010 19:38:02 +0100 Subject: [PATCH 010/100] - Install a maven pom and depmap. --- xml-commons-resolver-MANIFEST.MF | 4 ++-- xml-commons-resolver-pom.xml | 38 ++++++++++++++++++++++++++++++++ xml-commons-resolver.spec | 24 ++++++++++++++++++-- 3 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 xml-commons-resolver-pom.xml diff --git a/xml-commons-resolver-MANIFEST.MF b/xml-commons-resolver-MANIFEST.MF index 7580de8..6eaee2a 100644 --- a/xml-commons-resolver-MANIFEST.MF +++ b/xml-commons-resolver-MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.2 Main-Class: org.apache.xml.resolver.apps.resolver Bundle-SymbolicName: org.apache.xml.resolver Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 +Bundle-Name: XML Commons Resolver Bundle-Localization: plugin Bundle-Version: 1.2.0.v200806030312 -Bundle-Vendor: %Bundle-Vendor.0 +Bundle-Vendor: Apache Software Foundation Require-Bundle: system.bundle Export-Package: org.apache.env,org.apache.xml.resolver,org.apache.xml. resolver.apps,org.apache.xml.resolver.etc,org.apache.xml.resolver.hel diff --git a/xml-commons-resolver-pom.xml b/xml-commons-resolver-pom.xml new file mode 100644 index 0000000..c6093a4 --- /dev/null +++ b/xml-commons-resolver-pom.xml @@ -0,0 +1,38 @@ + + + apache + org.apache + 3 + + 4.0.0 + xml-resolver + xml-resolver + XML Commons Resolver Component + 1.2 + xml-commons provides an Apache-hosted set of DOM, SAX, and + JAXP interfaces for use in other xml-based projects. Our hope is that we + can standardize on both a common version and packaging scheme for these + critical XML standards interfaces to make the lives of both our developers + and users easier. + http://xml.apache.org/commons/components/resolver/ + + bugzilla + http://issues.apache.org/bugzilla/ + + + + XML Commons Developer's List + commons-dev-subscribe@xml.apache.org + commons-dev-unsubscribe@xml.apache.org + commons-dev@xml.apache.org + http://mail-archives.apache.org/mod_mbox/xml-commons-dev/ + + + + scm:svn:http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-resolver-1_2/ + http://svn.apache.org/viewvc/xml/commons/tags/xml-commons-resolver-1_2/ + + + deployed + + \ No newline at end of file diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index c00808f..7047f1d 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 1.1 @@ -10,11 +10,15 @@ Source1: xml-commons-resolver-resolver.sh Source2: xml-commons-resolver-xread.sh Source3: xml-commons-resolver-xparse.sh Source4: %{name}-MANIFEST.MF +Source5: %{name}-pom.xml Requires: xml-commons-apis +Requires: jpackage-utils +Requires(post): jpackage-utils +Requires(postun): jpackage-utils BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant -BuildRequires: jpackage-utils >= 0:1.5 +BuildRequires: jpackage-utils BuildRequires: dos2unix #BuildRequires: %{_bindir}/xsltproc #BuildRequires: docbook-style-xsl @@ -28,6 +32,7 @@ Resolver subproject of xml-commons. %package javadoc Summary: Javadoc for %{name} Group: Documentation +Requires: jpackage-utils # for /bin/rm and /bin/ln Requires(post): coreutils Requires(postun): coreutils @@ -84,9 +89,19 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xml-resolver cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/xml-xread cp %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xml-xparse +# Pom +install -pD -T -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-xml-resolver.pom +%add_to_maven_depmap xml-resolver xml-resolver %{version} JPP xml-resolver + %clean rm -rf $RPM_BUILD_ROOT +%post +%update_maven_depmap + +%postun +%update_maven_depmap + %post javadoc rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} @@ -99,6 +114,8 @@ fi %files %defattr(0644,root,root,0755) %doc KEYS LICENSE.resolver.txt +%{_mavendepmapfragdir}/* +%{_mavenpomdir}/* %{_javadir}/* %attr(0755,root,root) %{_bindir}/* @@ -107,6 +124,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Sun Sep 19 2010 Mat Booth 0:1.2-3 +- Install a maven pom and depmap. + * Wed Apr 7 2010 Alexander Kurtakov 0:1.2-2 - No need to require jaxp_parser_impl now that we require java 1.5 or newer. From af4b50530509a10e84071c12e7397029cb1df643 Mon Sep 17 00:00:00 2001 From: mbooth Date: Fri, 24 Sep 2010 18:57:38 +0100 Subject: [PATCH 011/100] Actually install a jar with a name that maven users expect. --- xml-commons-resolver.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 7047f1d..e5e78ce 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 1.1 @@ -73,8 +73,8 @@ touch META-INF/MANIFEST.MF zip -u build/resolver.jar META-INF/MANIFEST.MF # Jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +install -pD -T build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-resolver-%{version}.jar # Jar versioning (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) @@ -124,6 +124,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Fri Sep 24 2010 Mat Booth 0:1.2-4 +- Forgot to actually install a jar with a name that maven users expect. + * Sun Sep 19 2010 Mat Booth 0:1.2-3 - Install a maven pom and depmap. From e0d639696e1a3545fb7595b532b50429680a9b50 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 3 Nov 2010 22:14:05 +0200 Subject: [PATCH 012/100] - Add missing zip BR. - Remove perl and dos2unix usage. - Fix license - ASL 2.0 now. --- xml-commons-resolver.spec | 51 +++++++++++++-------------------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index e5e78ce..89fda55 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,9 +1,9 @@ Name: xml-commons-resolver Version: 1.2 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons -License: ASL 1.1 +License: ASL 2.0 URL: http://xml.apache.org/commons/ Source0: http://www.apache.org/dist/xml/commons/xml-commons-resolver-%{version}.tar.gz Source1: xml-commons-resolver-resolver.sh @@ -19,9 +19,7 @@ Requires(postun): jpackage-utils BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant BuildRequires: jpackage-utils -BuildRequires: dos2unix -#BuildRequires: %{_bindir}/xsltproc -#BuildRequires: docbook-style-xsl +BuildRequires: zip Group: Development/Libraries BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot @@ -33,9 +31,6 @@ Resolver subproject of xml-commons. Summary: Javadoc for %{name} Group: Documentation Requires: jpackage-utils -# for /bin/rm and /bin/ln -Requires(post): coreutils -Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -46,21 +41,13 @@ Javadoc for %{name}. # remove all binary libs and prebuilt javadocs find . -name "*.jar" -exec rm -f {} \; rm -rf docs -dos2unix KEYS LICENSE.resolver.txt +sed -i 's/\r//' KEYS LICENSE.resolver.txt %build -perl -p -i -e 's|call Resolver|call resolver|g' resolver.xml -perl -p -i -e 's|classname="org.apache.xml.resolver.Catalog"|fork="yes" classname="org.apache.xml.resolver.apps.resolver"|g' resolver.xml -perl -p -i -e 's|org.apache.xml.resolver.Catalog|org.apache.xml.resolver.apps.resolver|g' src/manifest.resolver -#DOCBOOK_XSL=`rpm -ql docbook-style-xsl | grep /html/docbook.xsl \ -#| sed 's#html/docbook.xsl##'` -# -#if [ -z $DOCBOOK_XSL ]; then -# echo "Unable to find docbook xsl directory" -# exit 1 -#fi +sed -i -e 's|call Resolver|call resolver|g' resolver.xml +sed -i -e 's|classname="org.apache.xml.resolver.Catalog"|fork="yes" classname="org.apache.xml.resolver.apps.resolver"|g' resolver.xml +sed -i -e 's|org.apache.xml.resolver.Catalog|org.apache.xml.resolver.apps.resolver|g' src/manifest.resolver -#ant -Ddocbook.dir=$DOCBOOK_XSL -f resolver.xml main ant -f resolver.xml jar javadocs %install @@ -80,8 +67,8 @@ ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-resolver-%{version}. (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # Javadocs -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/apidocs/resolver/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr build/apidocs/resolver/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # Scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} @@ -102,17 +89,8 @@ rm -rf $RPM_BUILD_ROOT %postun %update_maven_depmap -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi - %files -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %doc KEYS LICENSE.resolver.txt %{_mavendepmapfragdir}/* %{_mavenpomdir}/* @@ -120,10 +98,15 @@ fi %attr(0755,root,root) %{_bindir}/* %files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} +%defattr(-,root,root,-) +%{_javadocdir}/%{name} %changelog +* Wed Nov 3 2010 Alexander Kurtakov 0:1.2-5 +- Add missing zip BR. +- Remove perl and dos2unix usage. +- Fix license - ASL 2.0 now. + * Fri Sep 24 2010 Mat Booth 0:1.2-4 - Forgot to actually install a jar with a name that maven users expect. From d2e69e9129e086319bb26c16f67353daef5ed92c Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 3 Nov 2010 22:43:31 +0200 Subject: [PATCH 013/100] - Fix merge review comments (bug#226564). --- xml-commons-resolver.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 89fda55..597af84 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -22,7 +22,6 @@ BuildRequires: jpackage-utils BuildRequires: zip Group: Development/Libraries BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description Resolver subproject of xml-commons. @@ -100,8 +99,12 @@ rm -rf $RPM_BUILD_ROOT %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} +%doc LICENSE.resolver.txt %changelog +* Wed Nov 3 2010 Alexander Kurtakov 0:1.2-6 +- Fix merge review comments (bug#226564). + * Wed Nov 3 2010 Alexander Kurtakov 0:1.2-5 - Add missing zip BR. - Remove perl and dos2unix usage. From 00e951dd5d8622e15aaa3d111e8a5850f423e1c0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:25:58 -0600 Subject: [PATCH 014/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 597af84..aa492c1 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE.resolver.txt %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0:1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Nov 3 2010 Alexander Kurtakov 0:1.2-6 - Fix merge review comments (bug#226564). From 3dbca75b1f061bc90a47b28dac2c7cdbc7ae75f7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:02:03 -0600 Subject: [PATCH 015/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index aa492c1..9c681d4 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE.resolver.txt %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 0:1.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 35bfc694a872b32dcfcbd38bb309e19f862c5e7d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 00:45:41 -0500 Subject: [PATCH 016/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 9c681d4..2754613 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE.resolver.txt %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0:1.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 0:1.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From f785079a34cc1d93e7cec7fc1be345aac29ec6b1 Mon Sep 17 00:00:00 2001 From: Andy Grimm Date: Fri, 17 Aug 2012 15:46:44 -0400 Subject: [PATCH 017/100] Remove osgi(system.bundle) requirement --- xml-commons-resolver-MANIFEST.MF | 1 - xml-commons-resolver.spec | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver-MANIFEST.MF b/xml-commons-resolver-MANIFEST.MF index 6eaee2a..c96dee4 100644 --- a/xml-commons-resolver-MANIFEST.MF +++ b/xml-commons-resolver-MANIFEST.MF @@ -7,7 +7,6 @@ Bundle-Name: XML Commons Resolver Bundle-Localization: plugin Bundle-Version: 1.2.0.v200806030312 Bundle-Vendor: Apache Software Foundation -Require-Bundle: system.bundle Export-Package: org.apache.env,org.apache.xml.resolver,org.apache.xml. resolver.apps,org.apache.xml.resolver.etc,org.apache.xml.resolver.hel pers,org.apache.xml.resolver.readers,org.apache.xml.resolver.tools diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 2754613..cadfc5d 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE.resolver.txt %changelog +* Fri Aug 17 2012 Andy Grimm - 0:1.2-10 +- Remove osgi(system.bundle) requirement + * Sun Jul 22 2012 Fedora Release Engineering - 0:1.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 09facf5dbdc72b9fa5e91fa78a1452ba3f1e86fe Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:48:23 -0600 Subject: [PATCH 018/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index cadfc5d..409cb26 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE.resolver.txt %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0:1.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Aug 17 2012 Andy Grimm - 0:1.2-10 - Remove osgi(system.bundle) requirement From 6f20bd9deba206b7a1c7b79b20a0e68fddd256a2 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 11 Apr 2013 13:22:25 +0200 Subject: [PATCH 019/100] Add man pages (Resolves: rhbz#949424) Signed-off-by: Mikolaj Izdebski --- xml-commons-resolver-resolver.1 | 66 ++++++++++++++++++++++++++++++++ xml-commons-resolver-xparse.1 | 62 ++++++++++++++++++++++++++++++ xml-commons-resolver-xread.1 | 67 +++++++++++++++++++++++++++++++++ xml-commons-resolver.spec | 15 +++++++- 4 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 xml-commons-resolver-resolver.1 create mode 100644 xml-commons-resolver-xparse.1 create mode 100644 xml-commons-resolver-xread.1 diff --git a/xml-commons-resolver-resolver.1 b/xml-commons-resolver-resolver.1 new file mode 100644 index 0000000..831e590 --- /dev/null +++ b/xml-commons-resolver-resolver.1 @@ -0,0 +1,66 @@ +.TH XML-RESOLVER 1 "11 April 2013" "xml-commons-resolver" "User commands" + +.SH NAME +xml-resolver - A simple command-line resolver + +.SH SYNOPSIS + +.B xml-resolver +[options] keyword + +.SH DESCRIPTION + +\fBxml-resolver\fP is a simple command-line resolver. It takes some parameters +and passes them through the resolver, printing the result. + +The process ends with error-level 1, if there were errors. + +.SH OPTIONS + +Command-line options are described below. + +.PP +.B -c +catalogfile +.RS 4 +Load a particular catalog file +.RE +.PP +.B -n +name +.RS 4 +Sets the name +.RE +.PP +.B -p +publicId +.RS 4 +Sets the public identifier +.RE +.PP +.B -s +systemId +.RS 4 +Sets the system identifier +.RE +.PP +.B -a +.RS 4 +Absolute system URI +.RE +.PP +.B -u +uri +.RS 4 +Sets the URI +.RE +.PP +.B -d +integer +.RS 4 +Set the debug level +.RE + +And keyword is one of: doctype, document, entity, notation, public, +system, or uri. + diff --git a/xml-commons-resolver-xparse.1 b/xml-commons-resolver-xparse.1 new file mode 100644 index 0000000..d63fc86 --- /dev/null +++ b/xml-commons-resolver-xparse.1 @@ -0,0 +1,62 @@ +.TH XML-XPARSE 1 "11 April 2013" "xml-commons-resolver" "User commands" + +.SH NAME +xml-xparse - A simple command-line XML parsing application + +.SH SYNOPSIS + +.B xml-xparse +[options] document.xml + +.SH DESCRIPTION + +\fBxml-xparse\fP is a simple command-line XML Parser. It's just a little +wrapper around the JAXP Parser with support for catalogs. + +The process ends with error-level 1, if there were errors. + +.SH OPTIONS + +Command-line options are described below. + +.PP +.B -c +catalogfile +.RS 4 +Load a particular catalog file +.RE +.PP +.B -w +.RS 4 +Perform a well-formed parse, not a validating parse +.RE +.PP +.B -v +(default) +.RS 4 +Perform a validating parse +.RE +.PP +.B -n +.RS 4 +Perform a namespace-ignorant parse +.RE +.PP +.B -N +(default) +.RS 4 +Perform a namespace-aware parse +.RE +.PP +.B -d +integer +.RS 4 +Set the debug level. Warnings are shown if the debug level is > 2 +.RE +.PP +.B -E +integer +.RS 4 +Set the maximum number of errors to display +.RE + diff --git a/xml-commons-resolver-xread.1 b/xml-commons-resolver-xread.1 new file mode 100644 index 0000000..0dfe05a --- /dev/null +++ b/xml-commons-resolver-xread.1 @@ -0,0 +1,67 @@ +.TH XML-XREAD 1 "11 April 2013" "xml-commons-resolver" "User commands" + +.SH NAME +xml-xread - A simple command-line XML parsing application + +.SH SYNOPSIS + +.B xml-xread +[options] document.xml + +.SH DESCRIPTION + +\fBxml-xread\fP is a simple command-line XML Parser. It's just a little +wrapper around the JAXP XMLReader with support for catalogs. + +The process ends with error-level 1, if there were errors. + +.SH OPTIONS + +Command-line options are described below. + +.PP +.B -c +catalogfile +.RS 4 +Load a particular catalog file +.RE +.PP +.B -w +.RS 4 +Perform a well-formed parse, not a validating parse +.RE +.PP +.B -v +(default) +.RS 4 +Perform a validating parse +.RE +.PP +.B -s +.RS 4 +Enable W3C XML Schema validation +.RE +.PP +.B -n +.RS 4 +Perform a namespace-ignorant parse +.RE +.PP +.B -N +(default) +.RS 4 +Perform a namespace-aware parse +.RE +.PP +.B -d +integer +.RS 4 +Set the debug level. Warnings are shown if the debug level is > 2 +.RE +.PP +.B -E +integer +.RS 4 +Set the maximum number of errors to display +.RE + diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 409cb26..572fd9d 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -11,6 +11,9 @@ Source2: xml-commons-resolver-xread.sh Source3: xml-commons-resolver-xparse.sh Source4: %{name}-MANIFEST.MF Source5: %{name}-pom.xml +Source6: %{name}-resolver.1 +Source7: %{name}-xparse.1 +Source8: %{name}-xread.1 Requires: xml-commons-apis Requires: jpackage-utils @@ -75,6 +78,12 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xml-resolver cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/xml-xread cp %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xml-xparse +# Man pages +install -d -m 755 ${RPM_BUILD_ROOT}%{_mandir}/man1 +install -p -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-resolver.1 +install -p -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xparse.1 +install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 + # Pom install -pD -T -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-xml-resolver.pom %add_to_maven_depmap xml-resolver xml-resolver %{version} JPP xml-resolver @@ -94,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT %{_mavendepmapfragdir}/* %{_mavenpomdir}/* %{_javadir}/* +%{_mandir}/man1/* %attr(0755,root,root) %{_bindir}/* %files javadoc @@ -102,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE.resolver.txt %changelog +* Thu Apr 11 2013 Michal Srb - 0:1.2-12 +- Add man pages (Resolves: rhbz#949424) + * Fri Feb 15 2013 Fedora Release Engineering - 0:1.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From f9c4970c95de324a4e7fd1becb3b5aca33d95e9a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:26:17 -0500 Subject: [PATCH 020/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 572fd9d..63698a5 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE.resolver.txt %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Apr 11 2013 Michal Srb - 0:1.2-12 - Add man pages (Resolves: rhbz#949424) From faff5a96d13e5c6786d54e6dbb51f1f28521cdec Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 15 Aug 2013 13:42:07 +0100 Subject: [PATCH 021/100] Fix FTBFS rhbz #993143 --- xml-commons-resolver.spec | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 63698a5..784f3b9 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -17,8 +17,6 @@ Source8: %{name}-xread.1 Requires: xml-commons-apis Requires: jpackage-utils -Requires(post): jpackage-utils -Requires(postun): jpackage-utils BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant BuildRequires: jpackage-utils @@ -53,8 +51,6 @@ sed -i -e 's|org.apache.xml.resolver.Catalog|org.apache.xml.resolver.apps.resolv ant -f resolver.xml jar javadocs %install -rm -rf $RPM_BUILD_ROOT - # inject OSGi manifests mkdir -p META-INF cp -p %{SOURCE4} META-INF/MANIFEST.MF @@ -62,11 +58,9 @@ touch META-INF/MANIFEST.MF zip -u build/resolver.jar META-INF/MANIFEST.MF # Jars -install -pD -T build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-resolver-%{version}.jar - -# Jar versioning -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +install -p -m 644 build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/xml-resolver.jar # Javadocs mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} @@ -85,20 +79,11 @@ install -p -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xparse.1 install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 # Pom -install -pD -T -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-xml-resolver.pom -%add_to_maven_depmap xml-resolver xml-resolver %{version} JPP xml-resolver - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar %files -%defattr(-,root,root,-) %doc KEYS LICENSE.resolver.txt %{_mavendepmapfragdir}/* %{_mavenpomdir}/* @@ -107,11 +92,13 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{_bindir}/* %files javadoc -%defattr(-,root,root,-) %{_javadocdir}/%{name} %doc LICENSE.resolver.txt %changelog +* Thu Aug 15 2013 Mat Booth - 0:1.2-14 +- Fix FTBFS rhbz #993143 + * Sun Aug 04 2013 Fedora Release Engineering - 0:1.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From f4be5169b125748f435ea26bfdcbf27f2f676bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 23 Dec 2013 13:54:33 +0200 Subject: [PATCH 022/100] Use %jpackage_script to generate scripts. - Add OSGi metadata to manifest instead of discarding everything else in it. - Drop dependency on xml-commons-api, add one on java(-headless). - Crosslink javadocs with Java's. - Include NOTICE* in docs. - Update URLs. - Specfile cleanups. --- xml-commons-resolver-1.2-crosslink.patch | 11 +++++ xml-commons-resolver-1.2-osgi.patch | 19 +++++++ xml-commons-resolver-MANIFEST.MF | 12 ----- xml-commons-resolver-resolver.sh | 21 -------- xml-commons-resolver-xparse.sh | 21 -------- xml-commons-resolver-xread.sh | 21 -------- xml-commons-resolver.spec | 63 +++++++++++++----------- 7 files changed, 63 insertions(+), 105 deletions(-) create mode 100644 xml-commons-resolver-1.2-crosslink.patch create mode 100644 xml-commons-resolver-1.2-osgi.patch delete mode 100644 xml-commons-resolver-MANIFEST.MF delete mode 100644 xml-commons-resolver-resolver.sh delete mode 100644 xml-commons-resolver-xparse.sh delete mode 100644 xml-commons-resolver-xread.sh diff --git a/xml-commons-resolver-1.2-crosslink.patch b/xml-commons-resolver-1.2-crosslink.patch new file mode 100644 index 0000000..9587772 --- /dev/null +++ b/xml-commons-resolver-1.2-crosslink.patch @@ -0,0 +1,11 @@ +diff -up xml-commons-resolver-1.2/resolver.xml~ xml-commons-resolver-1.2/resolver.xml +--- xml-commons-resolver-1.2/resolver.xml~ 2006-11-20 22:23:07.000000000 +0200 ++++ xml-commons-resolver-1.2/resolver.xml 2011-10-19 00:43:22.186668155 +0300 +@@ -148,6 +148,7 @@ Also, you may need to adjust src/documen + use="true" + windowtitle="${name.resolver} API" + doctitle="${name.resolver}" ++ link="/usr/share/javadoc/java" + bottom="${copyright.message}"> + + diff --git a/xml-commons-resolver-1.2-osgi.patch b/xml-commons-resolver-1.2-osgi.patch new file mode 100644 index 0000000..895d5aa --- /dev/null +++ b/xml-commons-resolver-1.2-osgi.patch @@ -0,0 +1,19 @@ +diff -up xml-commons-resolver-1.2/src/manifest.resolver~ xml-commons-resolver-1.2/src/manifest.resolver +--- xml-commons-resolver-1.2/src/manifest.resolver~ 2006-11-20 22:23:06.000000000 +0200 ++++ xml-commons-resolver-1.2/src/manifest.resolver 2011-10-19 01:38:13.954802303 +0300 +@@ -1,5 +1,15 @@ + Manifest-Version: 1.0 + Main-Class: org.apache.xml.resolver.apps.resolver ++Bundle-RequiredExecutionEnvironment: J2SE-1.2 ++Bundle-SymbolicName: org.apache.xml.resolver ++Bundle-ManifestVersion: 2 ++Bundle-Name: XML Commons Resolver ++Bundle-Localization: plugin ++Bundle-Version: 1.2.0.v200806030312 ++Bundle-Vendor: Apache Software Foundation ++Export-Package: org.apache.env,org.apache.xml.resolver,org.apache.xml. ++ resolver.apps,org.apache.xml.resolver.etc,org.apache.xml.resolver.hel ++ pers,org.apache.xml.resolver.readers,org.apache.xml.resolver.tools + + Name: org/apache/xml/resolver + Comment: xml-commons Resolver code diff --git a/xml-commons-resolver-MANIFEST.MF b/xml-commons-resolver-MANIFEST.MF deleted file mode 100644 index c96dee4..0000000 --- a/xml-commons-resolver-MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-RequiredExecutionEnvironment: J2SE-1.2 -Main-Class: org.apache.xml.resolver.apps.resolver -Bundle-SymbolicName: org.apache.xml.resolver -Bundle-ManifestVersion: 2 -Bundle-Name: XML Commons Resolver -Bundle-Localization: plugin -Bundle-Version: 1.2.0.v200806030312 -Bundle-Vendor: Apache Software Foundation -Export-Package: org.apache.env,org.apache.xml.resolver,org.apache.xml. - resolver.apps,org.apache.xml.resolver.etc,org.apache.xml.resolver.hel - pers,org.apache.xml.resolver.readers,org.apache.xml.resolver.tools diff --git a/xml-commons-resolver-resolver.sh b/xml-commons-resolver-resolver.sh deleted file mode 100644 index ad7cf56..0000000 --- a/xml-commons-resolver-resolver.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# xml-commons-resolver resolver script -# JPackage Project (http://www.jpackage.org/) -# $Id: xml-commons-resolver-resolver.sh,v 1.1 2004/09/09 14:51:13 cvsdist Exp $ - -# Source functions library -. /usr/share/java-utils/java-functions - -# Configuration -MAIN_CLASS=org.apache.xml.resolver.apps.resolver -BASE_JARS="xml-commons-resolver.jar xml-commons-apis.jar jaxp_parser_impl.jar" - -# Set parameters -set_jvm -set_classpath $BASE_JARS -set_flags $BASE_FLAGS -set_options $BASE_OPTIONS - -# Let's start -run "$@" diff --git a/xml-commons-resolver-xparse.sh b/xml-commons-resolver-xparse.sh deleted file mode 100644 index bcbc1d7..0000000 --- a/xml-commons-resolver-xparse.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# xml-commons-resolver xparse script -# JPackage Project (http://www.jpackage.org/) -# $Id: xml-commons-resolver-xparse.sh,v 1.1 2004/09/09 14:51:13 cvsdist Exp $ - -# Source functions library -. /usr/share/java-utils/java-functions - -# Configuration -MAIN_CLASS=org.apache.xml.resolver.apps.xparse -BASE_JARS="xml-commons-resolver.jar xml-commons-apis.jar jaxp_parser_impl.jar" - -# Set parameters -set_jvm -set_classpath $BASE_JARS -set_flags $BASE_FLAGS -set_options $BASE_OPTIONS - -# Let's start -run "$@" diff --git a/xml-commons-resolver-xread.sh b/xml-commons-resolver-xread.sh deleted file mode 100644 index a47b514..0000000 --- a/xml-commons-resolver-xread.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# xml-commons-resolver xread script -# JPackage Project (http://www.jpackage.org/) -# $Id: xml-commons-resolver-xread.sh,v 1.1.2.1 2004/03/03 15:01:33 fche Exp $ - -# Source functions library -. /usr/share/java-utils/java-functions - -# Configuration -MAIN_CLASS=org.apache.xml.resolver.apps.xread -BASE_JARS="xml-commons-resolver.jar xml-commons-apis.jar jaxp_parser_impl.jar" - -# Set parameters -set_jvm -set_classpath $BASE_JARS -set_flags $BASE_FLAGS -set_options $BASE_OPTIONS - -# Let's start -run "$@" diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 784f3b9..9d29aef 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,26 +1,27 @@ +%if %{?fedora} > 19 || 0%{?rhel} > 6 +%global headless -headless +%endif + Name: xml-commons-resolver Version: 1.2 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 -URL: http://xml.apache.org/commons/ -Source0: http://www.apache.org/dist/xml/commons/xml-commons-resolver-%{version}.tar.gz -Source1: xml-commons-resolver-resolver.sh -Source2: xml-commons-resolver-xread.sh -Source3: xml-commons-resolver-xparse.sh -Source4: %{name}-MANIFEST.MF +URL: http://xerces.apache.org/xml-commons/components/resolver/ +Source0: http://www.apache.org/dist/xerces/xml-commons/%{name}-%{version}.tar.gz Source5: %{name}-pom.xml Source6: %{name}-resolver.1 Source7: %{name}-xparse.1 Source8: %{name}-xread.1 +Patch0: %{name}-1.2-crosslink.patch +Patch1: %{name}-1.2-osgi.patch -Requires: xml-commons-apis +Requires: java%{?headless} >= 1:1.6.0 Requires: jpackage-utils BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant BuildRequires: jpackage-utils -BuildRequires: zip Group: Development/Libraries BuildArch: noarch @@ -30,33 +31,26 @@ Resolver subproject of xml-commons. %package javadoc Summary: Javadoc for %{name} Group: Documentation -Requires: jpackage-utils +BuildRequires: java-javadoc +Requires: java-javadoc %description javadoc Javadoc for %{name}. %prep %setup -q +%patch0 -p1 +%patch1 -p1 # remove all binary libs and prebuilt javadocs find . -name "*.jar" -exec rm -f {} \; rm -rf docs -sed -i 's/\r//' KEYS LICENSE.resolver.txt +sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt %build -sed -i -e 's|call Resolver|call resolver|g' resolver.xml -sed -i -e 's|classname="org.apache.xml.resolver.Catalog"|fork="yes" classname="org.apache.xml.resolver.apps.resolver"|g' resolver.xml -sed -i -e 's|org.apache.xml.resolver.Catalog|org.apache.xml.resolver.apps.resolver|g' src/manifest.resolver - -ant -f resolver.xml jar javadocs +%ant -f resolver.xml jar javadocs %install -# inject OSGi manifests -mkdir -p META-INF -cp -p %{SOURCE4} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip -u build/resolver.jar META-INF/MANIFEST.MF - # Jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -p -m 644 build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar @@ -68,9 +62,9 @@ cp -pr build/apidocs/resolver/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # Scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} -cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xml-resolver -cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/xml-xread -cp %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xml-xparse +%jpackage_script org.apache.xml.resolver.apps.resolver "" "" %{name} xml-resolver true +%jpackage_script org.apache.xml.resolver.apps.xread "" "" %{name} xml-xread true +%jpackage_script org.apache.xml.resolver.apps.xparse "" "" %{name} xml-xparse true # Man pages install -d -m 755 ${RPM_BUILD_ROOT}%{_mandir}/man1 @@ -84,18 +78,27 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar %files -%doc KEYS LICENSE.resolver.txt +%doc KEYS LICENSE.resolver.txt NOTICE-resolver.txt %{_mavendepmapfragdir}/* %{_mavenpomdir}/* %{_javadir}/* %{_mandir}/man1/* -%attr(0755,root,root) %{_bindir}/* +%{_bindir}/xml-* %files javadoc %{_javadocdir}/%{name} -%doc LICENSE.resolver.txt +%doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Mon Dec 23 2013 Ville Skyttä - 0:1.2-15 +- Use %%jpackage_script to generate scripts. +- Add OSGi metadata to manifest instead of discarding everything else in it. +- Drop dependency on xml-commons-api, add one on java(-headless). +- Crosslink javadocs with Java's. +- Include NOTICE* in docs. +- Update URLs. +- Specfile cleanups. + * Thu Aug 15 2013 Mat Booth - 0:1.2-14 - Fix FTBFS rhbz #993143 @@ -147,7 +150,7 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom - Add dos2unix BR and fix line endings - Use upstream tarball -* Sat Aug 8 2009 Ville Skyttä - 0:1.1-4.16 +* Sat Aug 8 2009 Ville Skyttä - 0:1.1-4.16 - Fix specfile UTF-8 encoding. * Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-4.15 @@ -213,5 +216,5 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom * Tue May 06 2003 David Walluck 0:1.0-2jpp - update for JPackage 1.5 -* Wed Nov 13 2002 Ville Skyttä - 1.0-1jpp +* Wed Nov 13 2002 Ville Skyttä - 1.0-1jpp - Follow upstream changes, split out of xml-commons. From 4fca18edff04260898fb4befc97a9fdd7763acf0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:02:42 -0500 Subject: [PATCH 023/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 9d29aef..d279f50 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -4,7 +4,7 @@ Name: xml-commons-resolver Version: 1.2 -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -90,6 +90,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Dec 23 2013 Ville Skyttä - 0:1.2-15 - Use %%jpackage_script to generate scripts. - Add OSGi metadata to manifest instead of discarding everything else in it. From 59f2e6d23f134f4f3f6b15ac15af1aa09055f227 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 13 Jun 2014 09:55:18 +0300 Subject: [PATCH 024/100] Fix FTBFS. --- xml-commons-resolver.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index d279f50..b153d73 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -4,7 +4,7 @@ Name: xml-commons-resolver Version: 1.2 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -77,9 +77,8 @@ install -d -m 755 %{buildroot}%{_mavenpomdir} install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar -%files +%files -f .mfiles %doc KEYS LICENSE.resolver.txt NOTICE-resolver.txt -%{_mavendepmapfragdir}/* %{_mavenpomdir}/* %{_javadir}/* %{_mandir}/man1/* @@ -90,6 +89,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Fri Jun 13 2014 Alexander Kurtakov 0:1.2-17 +- Fix FTBFS. + * Sun Jun 08 2014 Fedora Release Engineering - 0:1.2-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 65d3a84a399dd1c43ccf5af5924836ae46cbb9d9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:07:03 +0000 Subject: [PATCH 025/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index b153d73..e7c946c 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -4,7 +4,7 @@ Name: xml-commons-resolver Version: 1.2 -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -89,6 +89,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0:1.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Jun 13 2014 Alexander Kurtakov 0:1.2-17 - Fix FTBFS. From f5610f8b90e9dacc6865c531499c919c3ee9b9e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:34:38 +0000 Subject: [PATCH 026/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index e7c946c..51278d5 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -4,7 +4,7 @@ Name: xml-commons-resolver Version: 1.2 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -89,6 +89,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0:1.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 0:1.2-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 542c2d04a1ff2dc67b0cd03a1a2cb83ee2c7475b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:56:06 +0000 Subject: [PATCH 027/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 51278d5..784738d 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -4,7 +4,7 @@ Name: xml-commons-resolver Version: 1.2 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -89,6 +89,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0:1.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 0:1.2-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 42298948592bef4f3b10149f736f0d0ce2b33364 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 16 Feb 2017 09:35:55 +0100 Subject: [PATCH 028/100] Fix rpm conditional --- xml-commons-resolver.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 784738d..031bcc9 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,10 +1,10 @@ -%if %{?fedora} > 19 || 0%{?rhel} > 6 +%if 0%{?fedora} > 19 || 0%{?rhel} > 6 %global headless -headless %endif Name: xml-commons-resolver Version: 1.2 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 2.0 @@ -89,6 +89,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Thu Feb 16 2017 Mikolaj Izdebski - 0:1.2-21 +- Fix rpm conditional + * Sat Feb 11 2017 Fedora Release Engineering - 0:1.2-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 3c0c49d2ef77d30b67513c08860bd511c09b3afc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 23 Feb 2017 15:43:25 +0100 Subject: [PATCH 029/100] Update to current packaging guidelines --- xml-commons-resolver.spec | 47 +++++++++++++-------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 031bcc9..bbcf74e 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,38 +1,30 @@ -%if 0%{?fedora} > 19 || 0%{?rhel} > 6 -%global headless -headless -%endif - Name: xml-commons-resolver -Version: 1.2 -Release: 21%{?dist} Epoch: 0 +Version: 1.2 +Release: 22%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ +BuildArch: noarch + Source0: http://www.apache.org/dist/xerces/xml-commons/%{name}-%{version}.tar.gz Source5: %{name}-pom.xml Source6: %{name}-resolver.1 Source7: %{name}-xparse.1 Source8: %{name}-xread.1 + Patch0: %{name}-1.2-crosslink.patch Patch1: %{name}-1.2-osgi.patch -Requires: java%{?headless} >= 1:1.6.0 -Requires: jpackage-utils -BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: javapackages-local BuildRequires: ant -BuildRequires: jpackage-utils -Group: Development/Libraries -BuildArch: noarch +BuildRequires: apache-parent %description Resolver subproject of xml-commons. %package javadoc Summary: Javadoc for %{name} -Group: Documentation -BuildRequires: java-javadoc -Requires: java-javadoc %description javadoc Javadoc for %{name}. @@ -47,18 +39,14 @@ find . -name "*.jar" -exec rm -f {} \; rm -rf docs sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt +%mvn_file : xml-commons-resolver xml-resolver + %build %ant -f resolver.xml jar javadocs +%mvn_artifact %{SOURCE5} build/resolver.jar %install -# Jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -p -m 644 build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/xml-resolver.jar - -# Javadocs -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr build/apidocs/resolver/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%mvn_install -J build/apidocs/resolver # Scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} @@ -72,23 +60,18 @@ install -p -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-resolver.1 install -p -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xparse.1 install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 -# Pom -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar - %files -f .mfiles %doc KEYS LICENSE.resolver.txt NOTICE-resolver.txt -%{_mavenpomdir}/* -%{_javadir}/* %{_mandir}/man1/* %{_bindir}/xml-* -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Thu Feb 23 2017 Mikolaj Izdebski - 0:1.2-22 +- Update to current packaging guidelines + * Thu Feb 16 2017 Mikolaj Izdebski - 0:1.2-21 - Fix rpm conditional From 3205e720adfaf20204c1fe90b35199e4eac3b13b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:11:59 +0000 Subject: [PATCH 030/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index bbcf74e..9a8a5b4 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ Name: xml-commons-resolver Epoch: 0 Version: 1.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -69,6 +69,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0:1.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Feb 23 2017 Mikolaj Izdebski - 0:1.2-22 - Update to current packaging guidelines From 00b8f8978809b67a28c93445ee8a5e167d2a3538 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:45:13 +0000 Subject: [PATCH 031/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 9a8a5b4..3212811 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ Name: xml-commons-resolver Epoch: 0 Version: 1.2 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -69,6 +69,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0:1.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0:1.2-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 07fe9fbfb58f660ee5b607a8494992a4af458deb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:22:14 +0000 Subject: [PATCH 032/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 3212811..6977ab9 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ Name: xml-commons-resolver Epoch: 0 Version: 1.2 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -69,6 +69,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0:1.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0:1.2-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a95c650fa714a6a9f14fb5ca3f70dee9f58e3403 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Wed, 1 Aug 2018 11:40:34 +0200 Subject: [PATCH 033/100] Add explicit requirement on javapackages-tools --- xml-commons-resolver.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 6977ab9..167ed6d 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ Name: xml-commons-resolver Epoch: 0 Version: 1.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -19,6 +19,9 @@ Patch1: %{name}-1.2-osgi.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: apache-parent +# Explicit javapackages-tools requires since scripts use +# /usr/share/java-utils/java-functions +Requires: javapackages-tools %description Resolver subproject of xml-commons. @@ -69,6 +72,10 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Wed Aug 01 2018 Severin Gehwolf - 0:1.2-26 +- Add requirement on javapackages-tools since scripts use + java-functions. + * Sat Jul 14 2018 Fedora Release Engineering - 0:1.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8863785d2895d938168794e1276498ca431768d9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:44 +0000 Subject: [PATCH 034/100] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 1c2025d..ab798ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46d52acdb67ba60f0156043f30108766 xml-commons-resolver-1.2.tar.gz +SHA512 (xml-commons-resolver-1.2.tar.gz) = 0c91057da3198fc488c7b2c20afb029aa4441ad979159c378d532b02caa294d27e730ae2f9857062af5e3815a603a6110c5441dd3fe6b36c342a78beac3c8a6f From dd5e2d20bbf5692bf1aae8b42ef0b23573fed44f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 035/100] Remove explicit Epoch --- xml-commons-resolver.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 167ed6d..f68bb56 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,5 +1,4 @@ Name: xml-commons-resolver -Epoch: 0 Version: 1.2 Release: 26%{?dist} Summary: Resolver subproject of xml-commons From 5dc3e2f5e74ac6de0cebabc1c5f7d7c226d68357 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:31:14 +0000 Subject: [PATCH 036/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 167ed6d..65a7b34 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ Name: xml-commons-resolver Epoch: 0 Version: 1.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0:1.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Aug 01 2018 Severin Gehwolf - 0:1.2-26 - Add requirement on javapackages-tools since scripts use java-functions. From c1d8db60a07f5ffc568eb572718087df621f88c8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:48 +0200 Subject: [PATCH 037/100] Mass rebuild for javapackages-tools 201901 --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index f68bb56..0af3923 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -71,6 +71,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.2-27 +- Mass rebuild for javapackages-tools 201901 + * Wed Aug 01 2018 Severin Gehwolf - 0:1.2-26 - Add requirement on javapackages-tools since scripts use java-functions. From 8c86511a92b635d29f6c273f9e64f9a13ade7a11 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:19:00 +0000 Subject: [PATCH 038/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 65a7b34..b498500 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ Name: xml-commons-resolver Epoch: 0 Version: 1.2 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0:1.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0:1.2-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 5ae1f4660595242fd67b5c32df61e05dd70b726d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 039/100] Mass rebuild for javapackages-tools 201902 --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 0af3923..8ba2059 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -71,6 +71,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.2-28 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1.2-27 - Mass rebuild for javapackages-tools 201901 From 445da22fe246262e1f8a598e3a1605c7c295301f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:34:55 +0000 Subject: [PATCH 040/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index b498500..7f03d23 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ Name: xml-commons-resolver Epoch: 0 Version: 1.2 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0:1.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0:1.2-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From cec9e37eef5aab9ca44c08d79057890c2a78867c Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 08:48:00 +0200 Subject: [PATCH 041/100] Rebuilt for JDK-11 --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 7f03d23..8f31103 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ Name: xml-commons-resolver Epoch: 0 Version: 1.2 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Jul 11 2020 Jiri Vanek - 0:1.2-30 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Fri Jan 31 2020 Fedora Release Engineering - 0:1.2-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 0b69f0c9f8fe595416fa248c4d9ce4e1e6dc5af8 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 14 Jul 2020 23:02:54 +0100 Subject: [PATCH 042/100] Generate 1.8 level bytecode to avoid breaking dependent packages that require Java 8 --- xml-commons-resolver.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 8f31103..a5f5e2e 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ Name: xml-commons-resolver Epoch: 0 Version: 1.2 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -45,7 +45,7 @@ sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt %mvn_file : xml-commons-resolver xml-resolver %build -%ant -f resolver.xml jar javadocs +%ant -f resolver.xml jar javadocs -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 %mvn_artifact %{SOURCE5} build/resolver.jar %install @@ -72,6 +72,10 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Tue Jul 14 2020 Mat Booth - 0:1.2-31 +- Generate 1.8 level bytecode to avoid breaking dependent packages that require + Java 8 + * Sat Jul 11 2020 Jiri Vanek - 0:1.2-30 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 3766189aa7e195d6f346aa2f40902278a91b4e8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:49:15 +0000 Subject: [PATCH 043/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index a5f5e2e..2b2a357 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ Name: xml-commons-resolver Epoch: 0 Version: 1.2 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0:1.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Mat Booth - 0:1.2-31 - Generate 1.8 level bytecode to avoid breaking dependent packages that require Java 8 From 880acd59a7f61f1d0ccf30a3a9e5b47f82ae4f51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:08:41 +0000 Subject: [PATCH 044/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 2b2a357..7f07267 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ Name: xml-commons-resolver Epoch: 0 Version: 1.2 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0:1.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0:1.2-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From de106975ef04d1932106d4ee8bd21990eb886f98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:42:06 +0000 Subject: [PATCH 045/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 2bcee4c..95c586f 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -71,6 +71,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jun 28 2021 Mikolaj Izdebski - 1.2-34 - Convert sources to SHA512 From ee39275350fe7993c21419cb15103671ceb8efd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:14:33 +0000 Subject: [PATCH 046/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 95c586f..8ffc499 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -71,6 +71,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.2-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.2-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e0d140b51d4d17ced27317821a096008909ae74c Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:44:24 +0100 Subject: [PATCH 047/100] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 8ffc499..0f5d124 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -71,6 +71,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 1.2-37 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 22 2022 Fedora Release Engineering - 1.2-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fecaec167118aa55a413ff4909aeab3eb1ebecf3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 048/100] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- xml-commons-resolver.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 0f5d124..0835d0d 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -5,6 +5,7 @@ Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: http://www.apache.org/dist/xerces/xml-commons/%{name}-%{version}.tar.gz Source5: %{name}-pom.xml From b751b3a114238fc1bfb418d8525949fa3a477055 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:16:26 +0000 Subject: [PATCH 049/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 0835d0d..408a1c2 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.2-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 1.2-37 - Rebuilt for java-17-openjdk as system jdk From b9d14b1b56f06a49548560f075ddd966e7c5dee0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:52 +0200 Subject: [PATCH 050/100] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From c01b0696d45dd2413b212c144e384370b6cf8d96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:36:36 +0000 Subject: [PATCH 051/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 408a1c2..8ca0a52 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.2-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.2-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5d06c6e269ebd85d3764d056e7ffd771dd2c73a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:00:35 +0000 Subject: [PATCH 052/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 8ca0a52..e35a3ae 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Resolver subproject of xml-commons License: ASL 2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.2-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.2-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From bc47d6eaccff0174e339f084c1f5ba420ef65d45 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:37 +0200 Subject: [PATCH 053/100] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- xml-commons-resolver.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index e35a3ae..1b4d5ee 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,8 +1,8 @@ Name: xml-commons-resolver Version: 1.2 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Resolver subproject of xml-commons -License: ASL 2.0 +License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 1.2-41 +- Convert License tag to SPDX format + * Sat Jul 22 2023 Fedora Release Engineering - 1.2-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From f0b68ba04823f67f0c1f49a9407f4ec19ac9d5c7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 054/100] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From 33f00e2b8abc06b54f799efaf012ccf2f8ef2e01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:51:36 +0000 Subject: [PATCH 055/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 1b4d5ee..1f71cf2 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Resolver subproject of xml-commons License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.2-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Sep 01 2023 Mikolaj Izdebski - 1.2-41 - Convert License tag to SPDX format From 9cd11b0e2301efcdba7245c82ba73f61dc5385e9 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:33:58 +0100 Subject: [PATCH 056/100] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 1f71cf2..40dd8ed 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Resolver subproject of xml-commons License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 1.2-43 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 1.2-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b50347cad322af87fb77410e90835b0926f0ab36 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:50 +0200 Subject: [PATCH 057/100] Eliminate use of obsolete %patchN syntax (#2283636) --- xml-commons-resolver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 40dd8ed..811f381 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -34,8 +34,8 @@ Javadoc for %{name}. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 # remove all binary libs and prebuilt javadocs find . -name "*.jar" -exec rm -f {} \; From 25c5ba0e607c2d13163f0e319a247d77e5c06ebf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 May 2024 05:41:47 +0200 Subject: [PATCH 058/100] Switch to a newer %patch syntax --- xml-commons-resolver.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 811f381..9872aa0 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Resolver subproject of xml-commons License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -34,8 +34,8 @@ Javadoc for %{name}. %prep %setup -q -%patch -P0 -p1 -%patch -P1 -p1 +%patch 0 -p1 +%patch 1 -p1 # remove all binary libs and prebuilt javadocs find . -name "*.jar" -exec rm -f {} \; @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Fri May 31 2024 Mikolaj Izdebski - 1.2-44 +- Switch to a newer patch macro syntax + * Tue Feb 27 2024 Jiri Vanek - 1.2-43 - Rebuilt for java-21-openjdk as system jdk From 0d46592c1b7e4d0eb01baa600aeb5e658dc40c87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:12:32 +0000 Subject: [PATCH 059/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 9872aa0..ac0f1eb 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Resolver subproject of xml-commons License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.2-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri May 31 2024 Mikolaj Izdebski - 1.2-44 - Switch to a newer patch macro syntax From cdb8bf0bd33dfcd1766298ef58148c365179bbe7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 24 Jul 2024 10:54:58 +0200 Subject: [PATCH 060/100] Install license files in licensedir instead of docdir --- xml-commons-resolver.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index ac0f1eb..43b64ca 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Resolver subproject of xml-commons License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -64,14 +64,18 @@ install -p -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xparse.1 install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %files -f .mfiles -%doc KEYS LICENSE.resolver.txt NOTICE-resolver.txt +%doc KEYS +%license LICENSE.resolver.txt NOTICE-resolver.txt %{_mandir}/man1/* %{_bindir}/xml-* %files javadoc -f .mfiles-javadoc -%doc LICENSE.resolver.txt NOTICE-resolver.txt +%license LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Wed Jul 24 2024 Mikolaj Izdebski - 1.2-46 +- Install license files in licensedir instead of docdir + * Sat Jul 20 2024 Fedora Release Engineering - 1.2-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 74e65f8161c495672d8442a007d862125c3a046b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 061/100] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From e5bb8d88f6e7be4abb64620c248c3f1beb0ab27d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 062/100] Switch from %setup to %autosetup --- xml-commons-resolver.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 43b64ca..30efa0b 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -33,9 +33,7 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -%patch 0 -p1 -%patch 1 -p1 +%autosetup -p1 -C # remove all binary libs and prebuilt javadocs find . -name "*.jar" -exec rm -f {} \; From 84080c80e4d4801151dfb3f9e58129a9474e5787 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:19 +0200 Subject: [PATCH 063/100] Switch to non-numdered patches --- xml-commons-resolver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 30efa0b..bcd719f 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -13,8 +13,8 @@ Source6: %{name}-resolver.1 Source7: %{name}-xparse.1 Source8: %{name}-xread.1 -Patch0: %{name}-1.2-crosslink.patch -Patch1: %{name}-1.2-osgi.patch +Patch: %{name}-1.2-crosslink.patch +Patch: %{name}-1.2-osgi.patch BuildRequires: javapackages-local BuildRequires: ant From b437b4e1f39bf38576e01efc1ae5e822e5d60a74 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 064/100] Empty commit to bump autorelease From cc0ec4dbe2c5e367cfa78e6af48526ce435ae941 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 065/100] Empty commit to bump autorelease From cbf66c5806aedc664b32fbcd11874c776ff0a3d0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 066/100] Empty commit to bump autorelease From c3a8c4596ceeacac9f0d33820c472954b4119aec Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 067/100] Empty commit to bump autorelease From bf0c8ebe02337dfbb2a5eb01a1bb8f63139af652 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 068/100] Empty commit to bump autorelease From 56e9fa9748c16ca90f78b30f7fd9a4213e0f85c8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 069/100] Empty commit to bump autorelease From b24a4035cc053103fb2783aa398e70c7969457df Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 070/100] Empty commit to bump autorelease From 0a2415e71cae82cac70e5bba0d89ab7e0098ccf6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 071/100] Empty commit to bump autorelease From abf6f6752ae26d218e365e23637f3f7df58e6a90 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 072/100] Empty commit to bump autorelease From c3afcd0b75e05bc069c7d7271bb92f41bb123599 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 073/100] Empty commit to bump autorelease From e0e94dba36fd9e79dac608d2510c7bad62a2c8b7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 074/100] Empty commit to bump autorelease From ceeac0f79ab82cb7ef8db816ed00fed3ae41452f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 075/100] Empty commit to bump autorelease From 73168726fb2a4394af3ba30affcf0e1517c0c633 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 076/100] Empty commit to bump autorelease From fb25697adb56e0beecfbea005b16ee332a327a82 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 077/100] Empty commit to bump autorelease From aa260ddde993f6d48e94e9f252521186e6b55262 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 078/100] Empty commit to bump autorelease From 6fa4f11d6db0512ce81b88cbda572137f44d3c05 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 079/100] Empty commit to bump autorelease From 16465997c1e0c8c9da2b003bf9978b715a000476 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 080/100] Empty commit to bump autorelease From 28b13e1aa12034c9cfbd4988da0121828e104b75 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 081/100] Empty commit to bump autorelease From a07462003e3a4761328902ff17784c022e879f49 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 082/100] Empty commit to bump autorelease From aca2cc072709656e6f0ab5bbdd69cd2c99df6029 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 083/100] Empty commit to bump autorelease From 99d9e1f1aeb3a61fc973c23562387dff923dd3a0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 084/100] Empty commit to bump autorelease From 1e62f0c6443ca7baf6fef46e5127df269f3939ad Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 085/100] Empty commit to bump autorelease From a91080394122ef84a1c28e7028f7b6d5df6c0e6b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:20 +0200 Subject: [PATCH 086/100] Convert to %autorelease and %autochangelog --- changelog | 229 +++++++++++++++++++++++++++++++++++++ xml-commons-resolver.spec | 232 +------------------------------------- 2 files changed, 231 insertions(+), 230 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..5085d3b --- /dev/null +++ b/changelog @@ -0,0 +1,229 @@ +* Wed Jul 24 2024 Mikolaj Izdebski - 1.2-46 +- Install license files in licensedir instead of docdir + +* Sat Jul 20 2024 Fedora Release Engineering - 1.2-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 1.2-44 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 1.2-43 +- Rebuilt for java-21-openjdk as system jdk + +* Sat Jan 27 2024 Fedora Release Engineering - 1.2-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.2-41 +- Convert License tag to SPDX format + +* Sat Jul 22 2023 Fedora Release Engineering - 1.2-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.2-37 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 28 2021 Mikolaj Izdebski - 1.2-34 +- Convert sources to SHA512 + +* Thu Jan 28 2021 Fedora Release Engineering - 0:1.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0:1.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Mat Booth - 0:1.2-31 +- Generate 1.8 level bytecode to avoid breaking dependent packages that require + Java 8 + +* Sat Jul 11 2020 Jiri Vanek - 0:1.2-30 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Jan 31 2020 Fedora Release Engineering - 0:1.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.2-28 +- Mass rebuild for javapackages-tools 201902 + +* Sat Jul 27 2019 Fedora Release Engineering - 0:1.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.2-27 +- Mass rebuild for javapackages-tools 201901 + +* Sun Feb 03 2019 Fedora Release Engineering - 0:1.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Aug 01 2018 Severin Gehwolf - 0:1.2-26 +- Add requirement on javapackages-tools since scripts use + java-functions. + +* Sat Jul 14 2018 Fedora Release Engineering - 0:1.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0:1.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0:1.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 23 2017 Mikolaj Izdebski - 0:1.2-22 +- Update to current packaging guidelines + +* Thu Feb 16 2017 Mikolaj Izdebski - 0:1.2-21 +- Fix rpm conditional + +* Sat Feb 11 2017 Fedora Release Engineering - 0:1.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 0:1.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0:1.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jun 13 2014 Alexander Kurtakov 0:1.2-17 +- Fix FTBFS. + +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Dec 23 2013 Ville Skyttä - 0:1.2-15 +- Use %%jpackage_script to generate scripts. +- Add OSGi metadata to manifest instead of discarding everything else in it. +- Drop dependency on xml-commons-api, add one on java(-headless). +- Crosslink javadocs with Java's. +- Include NOTICE* in docs. +- Update URLs. +- Specfile cleanups. + +* Thu Aug 15 2013 Mat Booth - 0:1.2-14 +- Fix FTBFS rhbz #993143 + +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Apr 11 2013 Michal Srb - 0:1.2-12 +- Add man pages (Resolves: rhbz#949424) + +* Fri Feb 15 2013 Fedora Release Engineering - 0:1.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Aug 17 2012 Andy Grimm - 0:1.2-10 +- Remove osgi(system.bundle) requirement + +* Sun Jul 22 2012 Fedora Release Engineering - 0:1.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 0:1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Nov 3 2010 Alexander Kurtakov 0:1.2-6 +- Fix merge review comments (bug#226564). + +* Wed Nov 3 2010 Alexander Kurtakov 0:1.2-5 +- Add missing zip BR. +- Remove perl and dos2unix usage. +- Fix license - ASL 2.0 now. + +* Fri Sep 24 2010 Mat Booth 0:1.2-4 +- Forgot to actually install a jar with a name that maven users expect. + +* Sun Sep 19 2010 Mat Booth 0:1.2-3 +- Install a maven pom and depmap. + +* Wed Apr 7 2010 Alexander Kurtakov 0:1.2-2 +- No need to require jaxp_parser_impl now that we require java 1.5 or newer. + +* Fri Mar 5 2010 Alexander Kurtakov 0:1.2-1 +- Update to 1.2. +- Drop gcj_support. + +* Mon Jan 11 2010 Andrew Overholt 0:1.1-4.17 +- Fix Group tags +- Remove '.' at end of Summary +- Add dos2unix BR and fix line endings +- Use upstream tarball + +* Sat Aug 8 2009 Ville Skyttä - 0:1.1-4.16 +- Fix specfile UTF-8 encoding. + +* Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-4.15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0:1.1-3.15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 30 2009 Alexander Kurtakov 0:1.1-2.15 +- Install osgi manifest for eclipse-dtp + +* Fri Sep 05 2008 Deepak Bhole 1.1-2.14 +- Build with IcedTea to escape sinjdoc issues + +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.1-2.13 +- drop repotag +- fix license tag + +* Mon Feb 18 2008 Fedora Release Engineering - 0:1.1-2jpp.12 +- Autorebuild for GCC 4.3 + +* Thu Aug 10 2006 Deepak Bhole 1.1-1jpp.12 +- Added missing dependencies. + +* Sat Jul 22 2006 Jakub Jelinek - 0:1.1-1jpp_11fc +- Rebuilt + +* Fri Jul 21 2006 Deepak Bhole - 0:1.1-1jpp_10fc +- Added conditional native compilation. + +* Wed Jul 12 2006 Jesse Keating - 0:1.1-1jpp_9fc +- rebuild + +* Mon Mar 6 2006 Jeremy Katz - 0:1.1-1jpp_8fc +- stop scriptlet spew + +* Wed Dec 21 2005 Jesse Keating 0:1.1-1jpp_7fc +- rebuilt again + +* Fri Dec 09 2005 Jesse Keating 0:1.1-1jpp_6fc +- rebuilt + +* Tue Jun 28 2005 Gary Benson 0:1.1-1jpp_5fc +- Remove jarfile from the tarball. + +* Thu Nov 4 2004 Gary Benson 0:1.1-1jpp_4fc +- Build into Fedora. + +* Thu Oct 28 2004 Gary Benson 0:1.1-1jpp_3fc +- Bootstrap into Fedora. + +* Thu Mar 4 2004 Frank Ch. Eigler 0:1.1-1jpp_2rh +- RH vacuuming part II + +* Wed Mar 3 2004 Frank Ch. Eigler 0:1.1-1jpp_1rh +- RH vacuuming + +* Wed Jan 21 2004 David Walluck 0:1.1-1jpp +- 1.1 +- use perl instead of patch +- don't build docs (build fails) + +* Tue May 06 2003 David Walluck 0:1.0-2jpp +- update for JPackage 1.5 + +* Wed Nov 13 2002 Ville Skyttä - 1.0-1jpp +- Follow upstream changes, split out of xml-commons. diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index bcd719f..7c8a368 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 46%{?dist} +Release: %autorelease Summary: Resolver subproject of xml-commons License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -71,232 +71,4 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %license LICENSE.resolver.txt NOTICE-resolver.txt %changelog -* Wed Jul 24 2024 Mikolaj Izdebski - 1.2-46 -- Install license files in licensedir instead of docdir - -* Sat Jul 20 2024 Fedora Release Engineering - 1.2-45 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri May 31 2024 Mikolaj Izdebski - 1.2-44 -- Switch to a newer patch macro syntax - -* Tue Feb 27 2024 Jiri Vanek - 1.2-43 -- Rebuilt for java-21-openjdk as system jdk - -* Sat Jan 27 2024 Fedora Release Engineering - 1.2-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 1.2-41 -- Convert License tag to SPDX format - -* Sat Jul 22 2023 Fedora Release Engineering - 1.2-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.2-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.2-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1.2-37 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 22 2022 Fedora Release Engineering - 1.2-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jun 28 2021 Mikolaj Izdebski - 1.2-34 -- Convert sources to SHA512 - -* Thu Jan 28 2021 Fedora Release Engineering - 0:1.2-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0:1.2-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Mat Booth - 0:1.2-31 -- Generate 1.8 level bytecode to avoid breaking dependent packages that require - Java 8 - -* Sat Jul 11 2020 Jiri Vanek - 0:1.2-30 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Jan 31 2020 Fedora Release Engineering - 0:1.2-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.2-28 -- Mass rebuild for javapackages-tools 201902 - -* Sat Jul 27 2019 Fedora Release Engineering - 0:1.2-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1.2-27 -- Mass rebuild for javapackages-tools 201901 - -* Sun Feb 03 2019 Fedora Release Engineering - 0:1.2-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Aug 01 2018 Severin Gehwolf - 0:1.2-26 -- Add requirement on javapackages-tools since scripts use - java-functions. - -* Sat Jul 14 2018 Fedora Release Engineering - 0:1.2-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0:1.2-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0:1.2-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Feb 23 2017 Mikolaj Izdebski - 0:1.2-22 -- Update to current packaging guidelines - -* Thu Feb 16 2017 Mikolaj Izdebski - 0:1.2-21 -- Fix rpm conditional - -* Sat Feb 11 2017 Fedora Release Engineering - 0:1.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0:1.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0:1.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Jun 13 2014 Alexander Kurtakov 0:1.2-17 -- Fix FTBFS. - -* Sun Jun 08 2014 Fedora Release Engineering - 0:1.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Dec 23 2013 Ville Skyttä - 0:1.2-15 -- Use %%jpackage_script to generate scripts. -- Add OSGi metadata to manifest instead of discarding everything else in it. -- Drop dependency on xml-commons-api, add one on java(-headless). -- Crosslink javadocs with Java's. -- Include NOTICE* in docs. -- Update URLs. -- Specfile cleanups. - -* Thu Aug 15 2013 Mat Booth - 0:1.2-14 -- Fix FTBFS rhbz #993143 - -* Sun Aug 04 2013 Fedora Release Engineering - 0:1.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Apr 11 2013 Michal Srb - 0:1.2-12 -- Add man pages (Resolves: rhbz#949424) - -* Fri Feb 15 2013 Fedora Release Engineering - 0:1.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Aug 17 2012 Andy Grimm - 0:1.2-10 -- Remove osgi(system.bundle) requirement - -* Sun Jul 22 2012 Fedora Release Engineering - 0:1.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0:1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0:1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Nov 3 2010 Alexander Kurtakov 0:1.2-6 -- Fix merge review comments (bug#226564). - -* Wed Nov 3 2010 Alexander Kurtakov 0:1.2-5 -- Add missing zip BR. -- Remove perl and dos2unix usage. -- Fix license - ASL 2.0 now. - -* Fri Sep 24 2010 Mat Booth 0:1.2-4 -- Forgot to actually install a jar with a name that maven users expect. - -* Sun Sep 19 2010 Mat Booth 0:1.2-3 -- Install a maven pom and depmap. - -* Wed Apr 7 2010 Alexander Kurtakov 0:1.2-2 -- No need to require jaxp_parser_impl now that we require java 1.5 or newer. - -* Fri Mar 5 2010 Alexander Kurtakov 0:1.2-1 -- Update to 1.2. -- Drop gcj_support. - -* Mon Jan 11 2010 Andrew Overholt 0:1.1-4.17 -- Fix Group tags -- Remove '.' at end of Summary -- Add dos2unix BR and fix line endings -- Use upstream tarball - -* Sat Aug 8 2009 Ville Skyttä - 0:1.1-4.16 -- Fix specfile UTF-8 encoding. - -* Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-4.15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0:1.1-3.15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Jan 30 2009 Alexander Kurtakov 0:1.1-2.15 -- Install osgi manifest for eclipse-dtp - -* Fri Sep 05 2008 Deepak Bhole 1.1-2.14 -- Build with IcedTea to escape sinjdoc issues - -* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.1-2.13 -- drop repotag -- fix license tag - -* Mon Feb 18 2008 Fedora Release Engineering - 0:1.1-2jpp.12 -- Autorebuild for GCC 4.3 - -* Thu Aug 10 2006 Deepak Bhole 1.1-1jpp.12 -- Added missing dependencies. - -* Sat Jul 22 2006 Jakub Jelinek - 0:1.1-1jpp_11fc -- Rebuilt - -* Fri Jul 21 2006 Deepak Bhole - 0:1.1-1jpp_10fc -- Added conditional native compilation. - -* Wed Jul 12 2006 Jesse Keating - 0:1.1-1jpp_9fc -- rebuild - -* Mon Mar 6 2006 Jeremy Katz - 0:1.1-1jpp_8fc -- stop scriptlet spew - -* Wed Dec 21 2005 Jesse Keating 0:1.1-1jpp_7fc -- rebuilt again - -* Fri Dec 09 2005 Jesse Keating 0:1.1-1jpp_6fc -- rebuilt - -* Tue Jun 28 2005 Gary Benson 0:1.1-1jpp_5fc -- Remove jarfile from the tarball. - -* Thu Nov 4 2004 Gary Benson 0:1.1-1jpp_4fc -- Build into Fedora. - -* Thu Oct 28 2004 Gary Benson 0:1.1-1jpp_3fc -- Bootstrap into Fedora. - -* Thu Mar 4 2004 Frank Ch. Eigler 0:1.1-1jpp_2rh -- RH vacuuming part II - -* Wed Mar 3 2004 Frank Ch. Eigler 0:1.1-1jpp_1rh -- RH vacuuming - -* Wed Jan 21 2004 David Walluck 0:1.1-1jpp -- 1.1 -- use perl instead of patch -- don't build docs (build fails) - -* Tue May 06 2003 David Walluck 0:1.0-2jpp -- update for JPackage 1.5 - -* Wed Nov 13 2002 Ville Skyttä - 1.0-1jpp -- Follow upstream changes, split out of xml-commons. +%autochangelog From a8e22a233b0676570b9663032b4e43d736752cf6 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 19 Nov 2024 20:43:57 +0100 Subject: [PATCH 087/100] Replace the buildroot variable with an RPM macro --- xml-commons-resolver.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 7c8a368..feaab0d 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -50,16 +50,16 @@ sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt %mvn_install -J build/apidocs/resolver # Scripts -mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p %{buildroot}%{_bindir} %jpackage_script org.apache.xml.resolver.apps.resolver "" "" %{name} xml-resolver true %jpackage_script org.apache.xml.resolver.apps.xread "" "" %{name} xml-xread true %jpackage_script org.apache.xml.resolver.apps.xparse "" "" %{name} xml-xparse true # Man pages -install -d -m 755 ${RPM_BUILD_ROOT}%{_mandir}/man1 -install -p -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-resolver.1 -install -p -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xparse.1 -install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 +install -d -m 755 %{buildroot}%{_mandir}/man1 +install -p -m 644 %{SOURCE6} %{buildroot}%{_mandir}/man1/xml-resolver.1 +install -p -m 644 %{SOURCE7} %{buildroot}%{_mandir}/man1/xml-xparse.1 +install -p -m 644 %{SOURCE8} %{buildroot}%{_mandir}/man1/xml-xread.1 %files -f .mfiles %doc KEYS From 7116f3adbf899e2243c96f4927de9ce44123d571 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 28 Nov 2024 07:50:43 +0100 Subject: [PATCH 088/100] Drop explicit requires on javapackages-tools --- plans/javapackages.fmf | 2 +- xml-commons-resolver.spec | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index feaab0d..fede13f 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -19,9 +19,6 @@ Patch: %{name}-1.2-osgi.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: apache-parent -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Requires: javapackages-tools %description Resolver subproject of xml-commons. From 6808711215a6a46dbea5846844a1eecb13a5e8e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:11 +0100 Subject: [PATCH 089/100] Update javadoc package description [skip changelog] --- xml-commons-resolver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index fede13f..3a7c629 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -24,10 +24,10 @@ BuildRequires: apache-parent Resolver subproject of xml-commons. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -Javadoc for %{name}. +API documentation for %{name}. %prep %autosetup -p1 -C From 04a0a468f0c1f73550607cfd11d5f3d4b9585de9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Jan 2025 10:46:45 +0100 Subject: [PATCH 090/100] Switch upstream URL to https --- xml-commons-resolver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 3a7c629..1693943 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -3,7 +3,7 @@ Version: 1.2 Release: %autorelease Summary: Resolver subproject of xml-commons License: Apache-2.0 -URL: http://xerces.apache.org/xml-commons/components/resolver/ +URL: https://xerces.apache.org/xml-commons/components/resolver/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch From 7e268112f3f3dfec44b7fbb6da4f9dee13642c80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:00:04 +0000 Subject: [PATCH 091/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 326ace225e7b589b7053df78b1fa026d06a9a155 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:14 +0100 Subject: [PATCH 092/100] Remove javadoc subpackage --- xml-commons-resolver.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 1693943..5e4552a 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -19,16 +19,12 @@ Patch: %{name}-1.2-osgi.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: apache-parent +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.2-53 %description Resolver subproject of xml-commons. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -40,11 +36,11 @@ sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt %mvn_file : xml-commons-resolver xml-resolver %build -%ant -f resolver.xml jar javadocs -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 +%ant -f resolver.xml jar -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 %mvn_artifact %{SOURCE5} build/resolver.jar %install -%mvn_install -J build/apidocs/resolver +%mvn_install # Scripts mkdir -p %{buildroot}%{_bindir} @@ -64,8 +60,5 @@ install -p -m 644 %{SOURCE8} %{buildroot}%{_mandir}/man1/xml-xread.1 %{_mandir}/man1/* %{_bindir}/xml-* -%files javadoc -f .mfiles-javadoc -%license LICENSE.resolver.txt NOTICE-resolver.txt - %changelog %autochangelog From 4e7c9c11819f1e8d1d88ce8aeedd688a9331d22c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 093/100] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From f789d2b96c5a0d7fb82b96855576755d05d04dc2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 094/100] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From e114e075220f3b589ffe1b6422a9c9b034abea48 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 095/100] Build with OpenJDK 25 --- xml-commons-resolver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 5e4552a..acca003 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -16,7 +16,7 @@ Source8: %{name}-xread.1 Patch: %{name}-1.2-crosslink.patch Patch: %{name}-1.2-osgi.patch -BuildRequires: javapackages-local +BuildRequires: javapackages-local-openjdk25 BuildRequires: ant BuildRequires: apache-parent # TODO Remove in Fedora 46 From 69d830c678f8abc789d136f1d999712c30a7d7a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:55:28 +0000 Subject: [PATCH 096/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f924e0160e77f7caf2bd69320dbb5a70e5b4daec Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:32:00 +0200 Subject: [PATCH 097/100] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- xml-commons-resolver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index acca003..1b17cd6 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -17,7 +17,7 @@ Patch: %{name}-1.2-crosslink.patch Patch: %{name}-1.2-osgi.patch BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: apache-parent # TODO Remove in Fedora 46 Obsoletes: %{name}-javadoc < 1.2-53 From 20371c3ca2388a54743b52d9db3c61d4cf0debc3 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 4 Sep 2025 16:38:50 +0200 Subject: [PATCH 098/100] manual bodhi update for jdk25 needed on selected pkgs From 00d95ea022a52832f68afdd842ab774b975491ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:45:07 +0000 Subject: [PATCH 099/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 7198db6806d137149912294249b7b6402c802081 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:17:57 +0000 Subject: [PATCH 100/100] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild