From 51b12a39d085d5c7133a30a9d7d6f88fdac5413a Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Thu, 20 Aug 2009 15:10:25 +0000 Subject: [PATCH] - Document sources and patches --- plexus-classworlds.spec | 88 ++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 59 deletions(-) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index fd3124a..3a86c17 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -28,13 +28,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} - -# If you don't want to build with maven, and use straight ant instead, -# give rpmbuild option '--without maven' - -%define with_maven %{!?_without_maven:1}%{?_without_maven:0} -%define without_maven %{?_without_maven:1}%{!?_without_maven:0} +%define with_maven 0 %define parent plexus %define subname classworlds @@ -42,27 +36,27 @@ Name: %{parent}-%{subname} Version: 1.2 -Release: 0.a9.6%{?dist} +Release: 0.a9.7%{?dist} Epoch: 0 Summary: Plexus Classworlds Classloader Framework License: ASL 2.0 and Plexus -Group: Development/Java +Group: Development/Libraries URL: http://plexus.codehaus.org/ -# svn export http://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-1.2-alpha-9/ plexus-classworlds -# tar czf plexus-classworlds-1.0-alpha-9.tar.gz plexus-classworlds/ +# svn export http://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-1.2-alpha-9/ plexus-classworlds-1.2-alpha-9 +# tar czf plexus-classworlds-1.2-alpha-9.tar.gz plexus-classworlds-1.2-alpha-9 Source0: %{name}-%{namedversion}-src.tar.gz +# Generated with mvn ant:ant Source1: plexus-classworlds-1.2-build.xml +# Fedora-specific maven bits Source3: plexus-classworlds-settings.xml Source4: plexus-classworlds-1.2-jpp-depmap.xml +# Add plexus-utils dependency Patch0: plexus-classworlds-1.2-pom_xml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%if ! %{gcj_support} BuildArch: noarch -%endif BuildRequires: jpackage-utils >= 0:1.7.3 BuildRequires: ant >= 0:1.6.5 @@ -77,26 +71,15 @@ BuildRequires: maven2-plugin-javadoc BuildRequires: maven2-plugin-resources BuildRequires: maven2-plugin-surefire = 2.3 BuildRequires: maven-surefire-provider-junit = 2.3 -BuildRequires: maven-doxia +BuildRequires: maven-doxia BuildRequires: maven-doxia-sitetools -BuildRequires: maven-release -%endif -BuildRequires: plexus-utils -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat +BuildRequires: maven-release %endif +BuildRequires: plexus-utils Requires(post): jpackage-utils >= 0:1.7.2 Requires(postun): jpackage-utils >= 0:1.7.2 -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif - %description Classworlds is a framework for container developers who require complex manipulation of Java's ClassLoaders. @@ -109,9 +92,7 @@ classworlds. %package javadoc Summary: Javadoc for %{name} -Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +Group: Documentation %description javadoc Javadoc for %{name}. @@ -119,7 +100,7 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{namedversion} for j in $(find . -name "*.jar" | grep -v /test-data/ | grep -v /test-jars/); do - mv $j $j.no + mv $j $j.no done cp %{SOURCE1} build.xml cp %{SOURCE3} settings.xml @@ -133,15 +114,15 @@ ln -sf $(build-classpath commons-logging) lib/commons-logging-1.0.3.jar export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mkdir -p $MAVEN_REPO_LOCAL -# org.codehaus.plexus.classworlds.strategy.StrategyTest fails +# org.codehaus.plexus.classworlds.strategy.StrategyTest fails # upstream, so ignore failures for now %if %{with_maven} mvn-jpp \ - -e \ - -Dmaven.test.failure.ignore=true \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - install javadoc:javadoc + -e \ + -Dmaven.test.failure.ignore=true \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + install javadoc:javadoc %else export CLASSPATH= @@ -167,48 +148,37 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{s # javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink - -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %post %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %postun %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %files %defattr(-,root,root,-) %{_javadir}/%{parent} %{_datadir}/maven2 %{_mavendepmapfragdir} -%if %{gcj_support} -%dir %attr(-,root,root) %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{subname}*-%{version}.jar.* -%endif +%doc LICENSE.txt %files javadoc %defattr(-,root,root,-) %doc %{_javadocdir}/* %changelog +* Wed Aug 19 2009 Andrew Overholt 0:1.2-0.a9.7 +- Document sources and patches + +* Wed Aug 19 2009 Andrew Overholt 0:1.2-0.a9.6 +- Update tarball-building instructions +- Remove gcj support +- Remove unnecessary post requirements + * Thu May 14 2009 Fernando Nasser 0:1.2-0.a9.6 - Fix license specification @@ -220,7 +190,7 @@ fi - rebuild with new maven2 2.0.8 built in bootstrap mode * Tue Jan 13 2009 Yong Yang 0:1.2-0.a9.3jpp.1 -- re-build with maven +- re-build with maven * Tue Jan 06 2009 Yong Yang 0:1.2-0.a9.2jpp.1 - Imported into devel from dbhole's maven 2.0.8 packages