Fix demo subpackage's dependencies and remove a tarball from the tarball

This commit is contained in:
gbenson 2005-06-28 09:33:38 +00:00
parent 1cc850e110
commit d7cd6e4eed
3 changed files with 13 additions and 7 deletions

View File

@ -1,4 +1,4 @@
xalan-j_2_6_0-src-RHCLEAN.tar.bz2 xalan-j_2_6_0-src-RHsemiCLEAN.tar.bz2
xalan-j_2_6_0 xalan-j_2_6_0
i386 i386
*.src.rpm *.src.rpm

View File

@ -1 +1 @@
1308f13a9b5edeb545d8bde449397245 xalan-j_2_6_0-src-RHCLEAN.tar.bz2 ed5d8bdfcac79989486ee418abe51f80 xalan-j_2_6_0-src-RHsemiCLEAN.tar.bz2

View File

@ -4,15 +4,16 @@
Name: xalan-j2 Name: xalan-j2
Version: %{version} Version: %{version}
Release: 3jpp_1fc Release: 3jpp_2fc
Epoch: 0 Epoch: 0
Summary: Java XSLT processor Summary: Java XSLT processor
License: Apache Software License License: Apache Software License
Source0: xalan-j_%{cvs_version}-src-RHCLEAN.tar.bz2 Source0: xalan-j_%{cvs_version}-src-RHsemiCLEAN.tar.bz2
Patch0: %{name}-noxsltcdeps.patch Patch0: %{name}-noxsltcdeps.patch
Patch1: %{name}-manifest.patch Patch1: %{name}-manifest.patch
Patch2: %{name}-crosslink.patch Patch2: %{name}-crosslink.patch
Patch4: %{name}-bz152255.patch Patch4: %{name}-bz152255.patch
Patch5: %{name}-javadoc.patch
URL: http://xml.apache.org/xalan-j/ URL: http://xml.apache.org/xalan-j/
Group: Text Processing/Markup/XML Group: Text Processing/Markup/XML
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@ -65,8 +66,8 @@ Javadoc for %{name}.
%package demo %package demo
Summary: Demo for %{name} Summary: Demo for %{name}
Group: Text Processing/Markup/XML Group: Text Processing/Markup/XML
Requires: %{name} = %{epoch}:%{version}-%{release}, servlet Requires: %{name} = %{epoch}:%{version}-%{release}, servletapi5
BuildRequires: servlet BuildRequires: servletapi5
%description demo %description demo
Demonstrations and samples for %{name}. Demonstrations and samples for %{name}.
@ -76,12 +77,13 @@ Demonstrations and samples for %{name}.
%patch0 -p0 %patch0 -p0
%patch1 -p0 %patch1 -p0
%patch2 -p0 %patch2 -p0
%patch4 -p1
%patch5 -p1
# Remove all binary libs, except ones needed to build docs and N/A elsewhere. # Remove all binary libs, except ones needed to build docs and N/A elsewhere.
find . -name "*.jar" \ find . -name "*.jar" \
! -name xalan2jdoc.jar \ ! -name xalan2jdoc.jar \
! -name stylebook-1.0-b3_xalan-2.jar \ ! -name stylebook-1.0-b3_xalan-2.jar \
-exec rm -f {} \; -exec rm -f {} \;
%patch4 -p1
%build %build
if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi
@ -216,6 +218,10 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
%{_datadir}/%{name} %{_datadir}/%{name}
%changelog %changelog
* Tue Jun 28 2005 Gary Benson <gbenson at redhat.com> 0:2.6.0-3jpp_2fc
- Remove a tarball from the tarball too.
- Fix demo subpackage's dependencies.
* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:2.6.0-3jpp_1fc * Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:2.6.0-3jpp_1fc
- Remove jarfiles from the tarball. - Remove jarfiles from the tarball.