Attachment 148075 Details for Bug 227069 – patch for 1.1b7 to clear up issues

[patch] patch for 1.1b7 to clear up issues

jaxen-bootstrap.spec.patch (text/plain), 3.87 KB, created by Andrew Overholt on 2007-02-14 17:40:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Overholt

Created: 2007-02-14 17:40:49 UTC

Size: 3.87 KB

patch

obsolete

>--- jaxen-bootstrap.spec.orig	2006-02-15 14:16:10.000000000 -0500
>+++ jaxen-bootstrap.spec	2007-02-14 11:28:23.000000000 -0500
>@@ -31,6 +31,12 @@
> # If you don't want to build with maven, and use straight ant instead,
> # give rpmbuild option '--without maven'
> 
>+# We don't ever want to build with maven because dbhole@redhat.com says
>+# we don't want maven1 in Fedora.  I've left the with_maven sections for
>+# easy comparison with JPackage and for historical reasons.
>+# -- overholt, 2007-02-13
>+%define _without_maven 1
>+
> %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
> %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
> 
>@@ -39,29 +45,30 @@
> %define dom4jver	1.6.1
> %define version	1.1
> %define release	0.b7.3jpp
>-%define section	free
> 
> Name:		%{name}
> Version:	%{version}
> Release:	%{release}
> Epoch:		0
> Summary:        A convenience package for build of dom4j
>-License:        Open Source
>+License:        Apache-style
> Url:            http://jaxen.codehaus.org/
>-Group:          Development/Libraries/Java
>-Vendor:         JPackage Project
>-Distribution:	JPackage
>-SOURCE0:	http://cvs.codehaus.org/viewrep/~tarball=tgz,tag=V11_BETA_7/jaxen/jaxen.tgz
>+Group:          Development/Libraries
>+Source0:	http://cvs.codehaus.org/viewrep/~tarball=tgz,tag=V11_BETA_7/jaxen/jaxen.tgz
>+%if %{with_maven}
> Source1:        pom-maven2jpp-depcat.xsl
> Source2:        pom-maven2jpp-newdepmap.xsl
> Source3:        pom-maven2jpp-mapdeps.xsl
> Source4:        jaxen-1.1-b7-jpp-depmap.xml
>+%endif
> 
>-
>+# dom4j is needed for bootstrapping; we build a subset of it below.
> Source5:        http://prdownloads.sourceforge.net/dom4j/dom4j-%{dom4jver}.tar.gz
>+# This is a pre-generated build.xml used to subvert the need for maven1.
>+# It can be generated with a pre-built maven from upstream but it has
>+# some hand tuning.
> Source6:        jaxen-1.1-b7-build.xml
> 
>-Provides:	jaxen-bootstrap
> Requires:	jdom >= 0:1.0-0.rc1.1jpp
> Requires:	xalan-j2
> Requires:	xerces-j2
>@@ -75,7 +82,7 @@
> BuildRequires:	xerces-j2
> BuildRequires:	xom
> BuildArch:      noarch
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
>+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> %description
> Dom4j depends on a jaxen build with dom4j support.
>@@ -83,9 +90,8 @@
> event of having to rebuild dom4j.
> 
> %prep
>-rm -rf $RPM_BUILD_ROOT
> %setup -q -n %{real}
>-/bin/gzip -dc %{SOURCE5} | tar -xf -
>+gzip -dc %{SOURCE5} | tar -xf -
> cp %{SOURCE6} build.xml
> find . -name "*.jar" -exec rm -f {} \;
> 
>@@ -124,8 +130,6 @@
>         org/dom4j/Text.java \
>         org/dom4j/io/SAXReader.java \
> 
>-
>-
> jar cf ../../dom4j.jar $(find . -name "*.class")
> popd
> 
>@@ -133,7 +137,6 @@
> 
> cp dom4j-%{dom4jver}/dom4j.jar .maven/repository/JPP/jars/dom4j.jar
> 
>-
> %if %{with_maven}
> for p in $(find . -name project.xml); do
>     pushd $(dirname $p)
>@@ -153,12 +156,14 @@
> 
> 
> %install
>+rm -rf $RPM_BUILD_ROOT
>+
> # jars
> install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
> install -m 644 target/jaxen-1.1-beta-7.jar \
> $RPM_BUILD_ROOT%{_javadir}/%{real}-%{version}.jar
> 
>-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
>+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in %{name}*; do \
> ln -sf ${jar} ${jar/-%{version}/}; done)
> 
> 
>@@ -170,6 +175,20 @@
> %{_javadir}/*
> 
> %changelog
>+* Tue Feb 13 2007 Andrew Overholt <overholt@redhat.com> 1:1.1-0.1.b7.3jpp.1
>+- Make release 0.Z.tag.Xjpp.Y%{?dist}
>+- Remove Distribution, Vendor
>+- Fix Group
>+- Set _without_maven for bootstrapping
>+- Add cleaning of buildroot to beginning of %%install
>+- Remove cleaning of buildroot from beginning of %%prep
>+- Remove Provides: jaxen-bootstrap as it is implied
>+- Remove %%section free
>+- Use Fedora buildroot
>+- Glob on %%{name} and not on %%{version} for symlinking
>+- Add xsl and xml files to maven if-block
>+- Add note about pre-generated build.xml
>+
> * Wed Feb 15 2006 Ralph Apel <r.apel@r-apel.de> 0:1.1-0.b7.3jpp
> - Add copyright notice to spec file
>

Actions: View | Diff

Attachments on bug 227069: 148022 | 148075