Compare commits

...
Sign in to create a new pull request.

21 commits

Author SHA1 Message Date
Fedora Release Engineering
7a3714a092 dist-git conversion 2010-07-29 15:55:30 +00:00
Bill Nottingham
73a57a03dc Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:34:10 +00:00
Jesse Keating
958f6ba316 Initialize branch F-9 for xml-commons-resolver 2008-04-22 02:52:08 +00:00
Jesse Keating
79ae41d409 - Autorebuild for GCC 4.3 2008-02-19 03:16:00 +00:00
Bill Nottingham
a39f9ba335 makefile update to properly grab makefile.common 2007-10-15 19:32:14 +00:00
Deepak Bhole
8e93730d6e Added missing dependencies. 2006-08-10 23:52:09 +00:00
c5a7f57568 Rebuilt 2006-07-22 08:46:51 +00:00
Deepak Bhole
975b1a8acf Added conditional native compilation. 2006-07-21 22:44:34 +00:00
Jesse Keating
4943bbdce8 bumped for rebuild 2006-07-12 08:54:30 +00:00
Jeremy Katz
b223a82bba - stop scriptlet spew 2006-03-06 23:09:28 +00:00
Jesse Keating
dd0f459685 bump again for gcc/gcj bugfix 2005-12-22 06:20:04 +00:00
Jesse Keating
3b6e5f1778 gcj bump 2005-12-16 20:39:28 +00:00
Jesse Keating
5e6a30fc17 gcc update bump 2005-12-09 20:46:17 +00:00
gbenson
c0ded31f32 Remove jarfile from the tarball 2005-06-28 09:08:08 +00:00
gbenson
e245e61d49 Don't leave hacks lying around where they could be tripped over 2004-11-04 17:54:35 +00:00
gbenson
f30ddedee8 Work, beehive, work! 2004-11-04 14:41:06 +00:00
gbenson
9b867abf1f Bump releases and stuff ready for FC4 build (wave 1) 2004-11-01 10:30:51 +00:00
gbenson
76680430ef Bump releases and add %changelog entries for Fedora build 2004-10-12 14:24:47 +00:00
gbenson
d5a008286d Silence is golden 2004-10-07 13:55:31 +00:00
cvsdist
a8c80cc869 auto-import changelog data from xml-commons-resolver-1.1-1jpp_2rh.src.rpm
1.1-1jpp_2rh
- RH vacuuming part II
2004-09-09 14:51:21 +00:00
cvsdist
ab5b7ee240 auto-import changelog data from xml-commons-resolver-1.1-1jpp_1rh.src.rpm
1.1-1jpp_1rh
- RH vacuuming
1.1-1jpp
- 1.1
- use perl instead of patch
- don't build docs (build fails)
1.0-2jpp
- update for JPackage 1.5
Wed Nov 13 2002 Ville Skytt <ville.skytta at iki.fi> - 1.0-1jpp
- Follow upstream changes, split out of xml-commons.
2004-09-09 14:51:13 +00:00
8 changed files with 254 additions and 6 deletions

View file

4
.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
xml-commons-resolver-1.1-RHCLEAN.tar.bz2
xml-commons-resolver-1.1
noarch
*.src.rpm

View file

@ -1,6 +0,0 @@
# Makefile for source rpm: xml-commons-resolver
# $Id$
NAME := xml-commons-resolver
SPECFILE = $(firstword $(wildcard *.spec))
include ../common/Makefile.common

View file

@ -0,0 +1 @@
e72bd3cbc4e5972d15f6a8f9842482e0 xml-commons-resolver-1.1-RHCLEAN.tar.bz2

View file

@ -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 "$@"

View file

@ -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 "$@"

View file

@ -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 "$@"

186
xml-commons-resolver.spec Normal file
View file

@ -0,0 +1,186 @@
%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: xml-commons-resolver
Version: 1.1
Release: 2jpp.12
Epoch: 0
Summary: Resolver subproject of xml-commons.
License: Apache Software License
URL: http://xml.apache.org/commons/
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
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
%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.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Requires(post): /bin/rm,/bin/ln
Requires(postun): /bin/rm
%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
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%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
%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
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.1-2jpp.12
- Autorebuild for GCC 4.3
* Thu Aug 10 2006 Deepak Bhole <dbhole@redhat.com> 1.1-1jpp.12
- Added missing dependencies.
* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.1-1jpp_11fc
- Rebuilt
* Fri Jul 21 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.1-1jpp_10fc
- Added conditional native compilation.
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.1-1jpp_9fc
- rebuild
* Mon Mar 6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.1-1jpp_8fc
- stop scriptlet spew
* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> 0:1.1-1jpp_7fc
- rebuilt again
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> 0:1.1-1jpp_6fc
- rebuilt
* Tue Jun 28 2005 Gary Benson <gbenson@redhat.com> 0:1.1-1jpp_5fc
- Remove jarfile from the tarball.
* Thu Nov 4 2004 Gary Benson <gbenson@redhat.com> 0:1.1-1jpp_4fc
- Build into Fedora.
* Thu Oct 28 2004 Gary Benson <gbenson@redhat.com> 0:1.1-1jpp_3fc
- Bootstrap into Fedora.
* Thu Mar 4 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.1-1jpp_2rh
- RH vacuuming part II
* Wed Mar 3 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.1-1jpp_1rh
- RH vacuuming
* Wed Jan 21 2004 David Walluck <david@anti-microsoft.org> 0:1.1-1jpp
- 1.1
- use perl instead of patch
- don't build docs (build fails)
* Tue May 06 2003 David Walluck <david@anti-microsoft.org> 0:1.0-2jpp
- update for JPackage 1.5
* Wed Nov 13 2002 Ville Skyttä <ville.skytta at iki.fi> - 1.0-1jpp
- Follow upstream changes, split out of xml-commons.