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/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/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..ae17c0c --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 +execute: + how: tmt 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 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 6eaee2a..0000000 --- a/xml-commons-resolver-MANIFEST.MF +++ /dev/null @@ -1,13 +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 -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-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-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.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-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.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-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 aa492c1..1b17cd6 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,202 +1,64 @@ Name: xml-commons-resolver Version: 1.2 -Release: 7%{?dist} -Epoch: 0 +Release: %autorelease 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 -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 -BuildRequires: zip -Group: Development/Libraries +License: Apache-2.0 +URL: https://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 +Source6: %{name}-resolver.1 +Source7: %{name}-xparse.1 +Source8: %{name}-xread.1 + +Patch: %{name}-1.2-crosslink.patch +Patch: %{name}-1.2-osgi.patch + +BuildRequires: javapackages-local-openjdk25 +BuildRequires: ant-openjdk25 +BuildRequires: apache-parent +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.2-53 %description Resolver subproject of xml-commons. -%package javadoc -Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils - -%description javadoc -Javadoc for %{name}. - %prep -%setup -q +%autosetup -p1 -C # 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 + +%mvn_file : xml-commons-resolver xml-resolver %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 -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 +%mvn_artifact %{SOURCE5} build/resolver.jar %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 -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) - -# Javadocs -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr build/apidocs/resolver/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%mvn_install # 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 +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 -# 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 +# Man pages +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 -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap - -%files -%defattr(-,root,root,-) -%doc KEYS LICENSE.resolver.txt -%{_mavendepmapfragdir}/* -%{_mavenpomdir}/* -%{_javadir}/* -%attr(0755,root,root) %{_bindir}/* - -%files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/%{name} -%doc LICENSE.resolver.txt +%files -f .mfiles +%doc KEYS +%license LICENSE.resolver.txt NOTICE-resolver.txt +%{_mandir}/man1/* +%{_bindir}/xml-* %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). - -* 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