[plexus-container-default] Update to alpha 9 + hack for RPM

Stanislav Ochotnicky sochotni at fedoraproject.org
Thu Aug 25 12:35:13 UTC 2011 

commit 476532cb42de8f141ce02b671c90543fa5667ee8
Author: Tomas Radej <tradej at redhat.com>
Date:   Wed Aug 24 13:54:20 2011 +0200

    Update to alpha 9 + hack for RPM

 .gitignore                    |    3 +
 plexus-container-default.spec |  114 ++++++++++++++---------------------------
 sources                       |    2 +-
 3 files changed, 42 insertions(+), 77 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e6dca86..b844fa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 plexus-container-default-1.0-alpha-8-src.tar.bz2
+/plexus-container-default-1.0-alpha-9-stable-1-src.tar
+/plexus-container-default-1.0-alpha-9-stable-1-src.tar.xz
+/plexus-container-default-1.0-alpha-9-stable-1-src.tgz
diff --git a/plexus-container-default.spec b/plexus-container-default.spec
index 70e3794..fdda986 100644
--- a/plexus-container-default.spec
+++ b/plexus-container-default.spec
@@ -28,53 +28,34 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-# We don't want to use maven
-%define _without_maven 1
-
-# 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}
-
 Name:           plexus-container-default
 Version:        1.0
-Release:        0.4.a8.1.2%{?dist}
+Release:        0.5.a9%{?dist}
 Epoch:          0
 Summary:        Default Plexus Container
 License:        ASL 2.0 and MIT
 Group:          Development/Libraries
 URL:            http://plexus.codehaus.org/
-# svn export  \
-#     svn://svn.plexus.codehaus.org/plexus/tags/plexus-container-default-1.0-alpha-8 plexus-container-default-1.0-alpha-8
-# tar cjf plexus-container-default-1.0-alpha-8-src.tar.bz2 \
-#   plexus-container-default-1.0-alpha-8
-Source0:        %{name}-1.0-alpha-8-src.tar.bz2
-# This was generated by an maven download and hand-tuned
-Source1:        %{name}-1.0-build.xml
-Source2:        %{name}-1.0-project.xml
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# git clone git://github.com/sonatype/plexus-containers.git
+# git archive --format=tar --prefix=plexus-containers/ plexus-container-default-1.0-alpha-9-stable-1 | gzip > plexus-container-default-1.0-alpha-9-stable-1-src.tgz
+Source0:        %{name}-1.0-alpha-9-stable-1-src.tgz
 
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  ant >= 0:1.6
-BuildRequires:  ant-nodeps
 BuildRequires:  junit
-%if %{with_maven}
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven
-%endif
 BuildRequires:  classworlds >= 0:1.1
-BuildRequires:  plexus-utils 
+BuildRequires:  plexus-utils
 Requires:  classworlds >= 0:1.1
-Requires:  plexus-utils 
+Requires:  plexus-utils
 
 %description
-The Plexus project seeks to create end-to-end developer tools for 
-writing applications. At the core is the container, which can be 
-embedded or for a full scale application server. There are many 
-reusable components for hibernate, form processing, jndi, i18n, 
-velocity, etc. Plexus also includes an application server which 
+The Plexus project seeks to create end-to-end developer tools for
+writing applications. At the core is the container, which can be
+embedded or for a full scale application server. There are many
+reusable components for hibernate, form processing, jndi, i18n,
+velocity, etc. Plexus also includes an application server which
 is like a J2EE application server, without all the baggage.
 
 
@@ -87,67 +68,48 @@ Javadoc for %{name}.
 
 
 %prep
-%setup -q -n plexus-container-default-1.0-alpha-8
-cp %{SOURCE1} build.xml
-cp %{SOURCE2} project.xml
+%setup -q -n plexus-containers
 
 %build
-%if %{with_maven}
-mkdir -p .maven/repository/maven/jars
-build-jar-repository .maven/repository/maven/jars \
-maven-jelly-tags
-
-mkdir -p .maven/repository/JPP/jars
-build-jar-repository -s -p .maven/repository/JPP/jars \
-classworlds plexus/utils
-
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
-maven \
-        -Dmaven.repo.remote=file:/usr/share/maven-1.0/repository \
-        -Dmaven.home.local=$MAVEN_HOME_LOCAL \
-        jar:install javadoc
-
-%else
-mkdir -p target/lib
-build-jar-repository -s -p target/lib \
-classworlds \
-plexus/utils \
-junit
-
-ant jar javadoc
-%endif
+mvn-rpmbuild install javadoc:aggregate
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 target/%{name}-%{version}-alpha-8.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/container-default-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && \
- for jar in *-%{version}*; do \
-     ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; \
- done \
-)
+install -d -m 755 %{buildroot}%{_javadir}/plexus
+install -pm 644 target/%{name}-%{version}-alpha-9-stable-1.jar \
+  %{buildroot}%{_javadir}/plexus/container-default.jar
+
+# poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
+%pre javadoc
+# workaround for rpm bug, can be removed in F-19
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%{_javadocdir}/*
+
 
 %changelog
+* Wed Aug 24 2011 Tomas Radej <tradej at redhat.com> - 0:1.0-0.5.a9
+- Update to 1.0-alpha-9-stable-1
+- Adapted to building with maven
+- Guideline fixes
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.a8.1.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -172,7 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Jan 11 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-0.a8.2jpp
 - First JPP 1.7 build
-                                                                                
+
 * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a8.1jpp
 - First JPackage build
 
diff --git a/sources b/sources
index 3ccbb48..4a1ad8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ebed8e98936972bb5324da68c831cdb  plexus-container-default-1.0-alpha-8-src.tar.bz2
+6af51d09af78e00f459e9eb355dd06c5  plexus-container-default-1.0-alpha-9-stable-1-src.tgz

More information about the scm-commits mailing list