From ab5b7ee2402db3d92b1b791f3260a291c704807e Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 14:51:13 +0000 Subject: [PATCH 01/21] =?UTF-8?q?auto-import=20changelog=20data=20from=20x?= =?UTF-8?q?ml-commons-resolver-1.1-1jpp=5F1rh.src.rpm=201.1-1jpp=5F1rh=20-?= =?UTF-8?q?=20RH=20vacuuming=201.1-1jpp=20-=201.1=20-=20use=20perl=20inste?= =?UTF-8?q?ad=20of=20patch=20-=20don't=20build=20docs=20(build=20fails)=20?= =?UTF-8?q?1.0-2jpp=20-=20update=20for=20JPackage=201.5=20Wed=20Nov=2013?= =?UTF-8?q?=202002=20Ville=20Skytt=E4=20=20-?= =?UTF-8?q?=201.0-1jpp=20-=20Follow=20upstream=20changes,=20split=20out=20?= =?UTF-8?q?of=20xml-commons.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 1 + sources | 1 + xml-commons-resolver-resolver.sh | 21 ++++++ xml-commons-resolver-xparse.sh | 21 ++++++ xml-commons-resolver-xread.sh | 21 ++++++ xml-commons-resolver.spec | 116 +++++++++++++++++++++++++++++++ 6 files changed, 181 insertions(+) create mode 100644 xml-commons-resolver-resolver.sh create mode 100644 xml-commons-resolver-xparse.sh create mode 100644 xml-commons-resolver-xread.sh create mode 100644 xml-commons-resolver.spec diff --git a/.cvsignore b/.cvsignore index e69de29..c9d0528 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xml-commons-resolver-1.1.tar.gz diff --git a/sources b/sources index e69de29..9a5c0f8 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +deb95bdf88687430445d34e8c11d475e xml-commons-resolver-1.1.tar.gz diff --git a/xml-commons-resolver-resolver.sh b/xml-commons-resolver-resolver.sh new file mode 100644 index 0000000..ad7cf56 --- /dev/null +++ b/xml-commons-resolver-resolver.sh @@ -0,0 +1,21 @@ +#!/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 new file mode 100644 index 0000000..bcbc1d7 --- /dev/null +++ b/xml-commons-resolver-xparse.sh @@ -0,0 +1,21 @@ +#!/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 new file mode 100644 index 0000000..431e5fe --- /dev/null +++ b/xml-commons-resolver-xread.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# xml-commons-resolver xread script +# JPackage Project (http://www.jpackage.org/) +# $Id: xml-commons-resolver-xread.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.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 new file mode 100644 index 0000000..83f0e84 --- /dev/null +++ b/xml-commons-resolver.spec @@ -0,0 +1,116 @@ +%define name xml-commons-resolver +%define version 1.1 +%define release 1jpp_1rh +%define section free + +Name: %{name} +Version: %{version} +Release: %{release} +Epoch: 0 +Summary: Resolver subproject of xml-commons. +License: Apache Software License +URL: http://xml.apache.org/commons/ +Source0: http://xml.apache.org/dist/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 +Requires: jaxp_parser_impl +Requires: xml-commons-apis +BuildRequires: ant +BuildRequires: jpackage-utils >= 0:1.5 +#BuildRequires: %{_bindir}/xsltproc +#BuildRequires: docbook-style-xsl +Group: Text Processing/Markup/XML +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +#Vendor: JPackage Project +#Distribution: JPackage + +%description +Resolver subproject of xml-commons. + +%package javadoc +Summary: Javadoc for %{name} +Group: Development/Documentation + +%description javadoc +Javadoc for %{name}. + +%prep +%setup -q +# remove all binary libs and prebuilt javadocs +find . -name "*.jar" -exec rm -f {} \; +rm -rf docs + +%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 + +#ant -Ddocbook.dir=$DOCBOOK_XSL -f resolver.xml main +ant -f resolver.xml jar javadocs + +%install +rm -rf $RPM_BUILD_ROOT + +# Jars +mkdir -p $RPM_BUILD_ROOT%{_javadir} +cp build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{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}-%{version} +cp -pr build/apidocs/resolver/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} + +# 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 + +%clean +rm -rf $RPM_BUILD_ROOT + +%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) +%doc KEYS LICENSE.resolver.txt +%{_javadir}/* +%attr(0755,root,root) %{_bindir}/* + +%files javadoc +%defattr(0644,root,root,0755) +%{_javadocdir}/%{name}-%{version} + +%changelog +* 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. + From a8c80cc8698cb93e508a3aff8c5ecbda3628fab6 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 14:51:21 +0000 Subject: [PATCH 02/21] auto-import changelog data from xml-commons-resolver-1.1-1jpp_2rh.src.rpm 1.1-1jpp_2rh - RH vacuuming part II --- 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 83f0e84..eaccc87 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ %define name xml-commons-resolver %define version 1.1 -%define release 1jpp_1rh +%define release 1jpp_2rh %define section free Name: %{name} @@ -100,6 +100,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* 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 From d5a008286d84b00af502263e94828c6153e81f48 Mon Sep 17 00:00:00 2001 From: gbenson Date: Thu, 7 Oct 2004 13:55:31 +0000 Subject: [PATCH 03/21] Silence is golden --- .cvsignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.cvsignore b/.cvsignore index c9d0528..915301f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,4 @@ xml-commons-resolver-1.1.tar.gz +xml-commons-resolver-1.1 +noarch +*.src.rpm From 76680430ef578f1efbe64594a80e664ef8ebf769 Mon Sep 17 00:00:00 2001 From: gbenson Date: Tue, 12 Oct 2004 14:24:47 +0000 Subject: [PATCH 04/21] Bump releases and add %changelog entries for Fedora build --- 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 eaccc87..f60d5fc 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ %define name xml-commons-resolver %define version 1.1 -%define release 1jpp_2rh +%define release 1jpp_2fc %define section free Name: %{name} @@ -100,6 +100,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Mon Oct 11 2004 Gary Benson 0:1.1-1jpp_2fc +- Build into Fedora. + * Thu Mar 4 2004 Frank Ch. Eigler 0:1.1-1jpp_2rh - RH vacuuming part II From 9b867abf1f668a50b114679f9f1eaa24c01e6148 Mon Sep 17 00:00:00 2001 From: gbenson Date: Mon, 1 Nov 2004 10:30:51 +0000 Subject: [PATCH 05/21] Bump releases and stuff ready for FC4 build (wave 1) --- 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 f60d5fc..e339570 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ %define name xml-commons-resolver %define version 1.1 -%define release 1jpp_2fc +%define release 1jpp_4fc %define section free Name: %{name} @@ -100,9 +100,12 @@ fi %{_javadocdir}/%{name}-%{version} %changelog -* Mon Oct 11 2004 Gary Benson 0:1.1-1jpp_2fc +* Mon Nov 1 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 From f30ddedee854f7e4b2ad52363c73ce6a65da82d6 Mon Sep 17 00:00:00 2001 From: gbenson Date: Thu, 4 Nov 2004 14:41:06 +0000 Subject: [PATCH 06/21] Work, beehive, work! --- xml-commons-resolver.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index e339570..f6b7fee 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -17,6 +17,8 @@ Source3: xml-commons-resolver-xparse.sh Requires: jaxp_parser_impl Requires: xml-commons-apis BuildRequires: ant +# XXX the next line forces beehive to play nice +BuildRequires: xerces-j2, xml-commons-apis BuildRequires: jpackage-utils >= 0:1.5 #BuildRequires: %{_bindir}/xsltproc #BuildRequires: docbook-style-xsl @@ -100,7 +102,7 @@ fi %{_javadocdir}/%{name}-%{version} %changelog -* Mon Nov 1 2004 Gary Benson 0:1.1-1jpp_4fc +* 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 From e245e61d49a2f3ea731daefd5917157a9254ea34 Mon Sep 17 00:00:00 2001 From: gbenson Date: Thu, 4 Nov 2004 17:54:35 +0000 Subject: [PATCH 07/21] Don't leave hacks lying around where they could be tripped over --- xml-commons-resolver.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index f6b7fee..68eb110 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -17,8 +17,6 @@ Source3: xml-commons-resolver-xparse.sh Requires: jaxp_parser_impl Requires: xml-commons-apis BuildRequires: ant -# XXX the next line forces beehive to play nice -BuildRequires: xerces-j2, xml-commons-apis BuildRequires: jpackage-utils >= 0:1.5 #BuildRequires: %{_bindir}/xsltproc #BuildRequires: docbook-style-xsl From c0ded31f326ad4140dc2fd77270815ec42cc6b69 Mon Sep 17 00:00:00 2001 From: gbenson Date: Tue, 28 Jun 2005 09:08:08 +0000 Subject: [PATCH 08/21] Remove jarfile from the tarball --- .cvsignore | 2 +- sources | 2 +- xml-commons-resolver.spec | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 915301f..20b210c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -xml-commons-resolver-1.1.tar.gz +xml-commons-resolver-1.1-RHCLEAN.tar.bz2 xml-commons-resolver-1.1 noarch *.src.rpm diff --git a/sources b/sources index 9a5c0f8..f639b6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -deb95bdf88687430445d34e8c11d475e xml-commons-resolver-1.1.tar.gz +e72bd3cbc4e5972d15f6a8f9842482e0 xml-commons-resolver-1.1-RHCLEAN.tar.bz2 diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 68eb110..ebd6301 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ %define name xml-commons-resolver %define version 1.1 -%define release 1jpp_4fc +%define release 1jpp_5fc %define section free Name: %{name} @@ -10,7 +10,7 @@ Epoch: 0 Summary: Resolver subproject of xml-commons. License: Apache Software License URL: http://xml.apache.org/commons/ -Source0: http://xml.apache.org/dist/commons/xml-commons-resolver-1.1.tar.gz +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 @@ -23,8 +23,6 @@ BuildRequires: jpackage-utils >= 0:1.5 Group: Text Processing/Markup/XML BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -#Vendor: JPackage Project -#Distribution: JPackage %description Resolver subproject of xml-commons. @@ -100,6 +98,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* 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. From 5e6a30fc17a9f01a3a3322226d09ccf2277272cd Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 9 Dec 2005 20:46:17 +0000 Subject: [PATCH 09/21] gcc update bump --- 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 ebd6301..f0d0012 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,11 +1,11 @@ %define name xml-commons-resolver %define version 1.1 -%define release 1jpp_5fc +%define release 1jpp_5fc.1 %define section free Name: %{name} Version: %{version} -Release: %{release} +Release: %{release}.1 Epoch: 0 Summary: Resolver subproject of xml-commons. License: Apache Software License @@ -98,6 +98,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Fri Dec 09 2005 Jesse Keating +- rebuilt + * Tue Jun 28 2005 Gary Benson 0:1.1-1jpp_5fc - Remove jarfile from the tarball. From 3b6e5f1778b6400bf2d04f4b88c0dcbb694860f7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 16 Dec 2005 20:39:28 +0000 Subject: [PATCH 10/21] gcj bump --- 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 f0d0012..bd76d87 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ %define name xml-commons-resolver %define version 1.1 -%define release 1jpp_5fc.1 +%define release 1jpp_6fc %define section free Name: %{name} @@ -98,7 +98,7 @@ fi %{_javadocdir}/%{name}-%{version} %changelog -* Fri Dec 09 2005 Jesse Keating +* Fri Dec 09 2005 Jesse Keating 0:1.1-1jpp_6fc - rebuilt * Tue Jun 28 2005 Gary Benson 0:1.1-1jpp_5fc From dd0f459685a5656a131c9772d3a5324325c51f88 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 22 Dec 2005 06:20:04 +0000 Subject: [PATCH 11/21] bump again for gcc/gcj bugfix --- 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 bd76d87..a0ab21f 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,11 +1,11 @@ %define name xml-commons-resolver %define version 1.1 -%define release 1jpp_6fc +%define release 1jpp_7fc %define section free Name: %{name} Version: %{version} -Release: %{release}.1 +Release: %{release} Epoch: 0 Summary: Resolver subproject of xml-commons. License: Apache Software License @@ -98,6 +98,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* 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 From b223a82bbafb62705005d468a09abb2e02f1755c Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 6 Mar 2006 23:09:28 +0000 Subject: [PATCH 12/21] - stop scriptlet spew --- xml-commons-resolver.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index a0ab21f..30ebe7d 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ %define name xml-commons-resolver %define version 1.1 -%define release 1jpp_7fc +%define release 1jpp_8fc %define section free Name: %{name} @@ -30,6 +30,7 @@ Resolver subproject of xml-commons. %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation +Prereq: coreutils %description javadoc Javadoc for %{name}. @@ -98,6 +99,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* 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 From 4943bbdce83277f84ce99b7a19b40b018259c31e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 12 Jul 2006 08:54:30 +0000 Subject: [PATCH 13/21] bumped for 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 30ebe7d..9af3a5d 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ %define name xml-commons-resolver %define version 1.1 -%define release 1jpp_8fc +%define release 1jpp_9fc %define section free Name: %{name} @@ -99,6 +99,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* 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 From 975b1a8acfca0e79c2b468f663015fcfe4f9b6a0 Mon Sep 17 00:00:00 2001 From: Deepak Bhole Date: Fri, 21 Jul 2006 22:44:34 +0000 Subject: [PATCH 14/21] Added conditional native compilation. --- xml-commons-resolver.spec | 49 ++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 9af3a5d..a02137a 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,11 +1,13 @@ -%define name xml-commons-resolver -%define version 1.1 -%define release 1jpp_9fc + +%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 -Name: %{name} -Version: %{version} -Release: %{release} +Name: xml-commons-resolver +Version: 1.1 +Release: 1jpp_10fc Epoch: 0 Summary: Resolver subproject of xml-commons. License: Apache Software License @@ -21,9 +23,17 @@ BuildRequires: jpackage-utils >= 0:1.5 #BuildRequires: %{_bindir}/xsltproc #BuildRequires: docbook-style-xsl Group: Text Processing/Markup/XML +%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. @@ -76,6 +86,10 @@ 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 @@ -88,17 +102,40 @@ 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 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 From c5a7f57568dc218cd5416c29fc9fd2b598fb7a43 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 22 Jul 2006 08:46:51 +0000 Subject: [PATCH 15/21] Rebuilt --- 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 a02137a..8e1eca6 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -7,7 +7,7 @@ Name: xml-commons-resolver Version: 1.1 -Release: 1jpp_10fc +Release: 1jpp_11fc Epoch: 0 Summary: Resolver subproject of xml-commons. License: Apache Software License @@ -133,6 +133,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* 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. From 8e93730d6eeab027a46af3971e8d7a9a894bb372 Mon Sep 17 00:00:00 2001 From: Deepak Bhole Date: Thu, 10 Aug 2006 23:52:09 +0000 Subject: [PATCH 16/21] Added missing dependencies. --- 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 8e1eca6..ecb637f 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -7,7 +7,7 @@ Name: xml-commons-resolver Version: 1.1 -Release: 1jpp_11fc +Release: 1jpp.12 Epoch: 0 Summary: Resolver subproject of xml-commons. License: Apache Software License @@ -40,7 +40,8 @@ Resolver subproject of xml-commons. %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Prereq: coreutils +Requires(post): /bin/rm,/bin/ln +Requires(postun): /bin/rm %description javadoc Javadoc for %{name}. @@ -133,6 +134,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* 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 From a39f9ba335527c6baec9ccfc9223e550aa54e369 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 19:32:14 +0000 Subject: [PATCH 17/21] makefile update to properly grab makefile.common --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 32644b7..7e04885 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: xml-commons-resolver -# $Id$ +# $Id: Makefile,v 1.1 2004/09/09 14:51:11 cvsdist Exp $ NAME := xml-commons-resolver SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +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 +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 79ae41d409d76d305f20a2651de7f3ec1cbba3cf Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 03:16:00 +0000 Subject: [PATCH 18/21] - Autorebuild for GCC 4.3 --- 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 ecb637f..7dc20f1 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -7,7 +7,7 @@ Name: xml-commons-resolver Version: 1.1 -Release: 1jpp.12 +Release: 2jpp.12 Epoch: 0 Summary: Resolver subproject of xml-commons. License: Apache Software License @@ -134,6 +134,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* 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. From 958f6ba3168732d518227a4eac79634b13987ab0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 02:52:08 +0000 Subject: [PATCH 19/21] Initialize branch F-9 for xml-commons-resolver --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 73a57a03dc7c3a7b0cc699a45f749785f18bfbb2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:10 +0000 Subject: [PATCH 20/21] 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 7a3714a092aded00c794a7c442b3b3af0496dcd8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:55:30 +0000 Subject: [PATCH 21/21] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9