[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jpackage-announce
Subject:    [JPackage-announce] [RPM (1.7)] plexus-ant-factory-1.0-0.a1.2jpp
From:       Deepak Bhole <jpackage () zarb ! org>
Date:       2006-10-30 15:47:54
Message-ID: 20061030154754.0B603625F0E () ryu ! zarb ! org
[Download RAW message or body]

Name        : plexus-ant-factory           Relocations: (not relocatable)
Version     : 1.0                               Vendor: JPackage Project
Release     : 0.a1.2jpp                     Build Date: Fri 27 Oct 2006 08:08:22 PM \
CEST Install Date: (not installed)               Build Host: \
to-jpackage2.toronto.redhat.com Group       : Development/Java              Source \
RPM: (none) Size        : 18817      License: Apache Software License
Signature   : (none)
Packager    : Deepak Bhole <dbhole@jpackage.org>
URL         : http://plexus.codehaus.org/
Summary     : Plexus Component Creator
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
is like a J2EE application server, without all the baggage.

---------------
Deepak Bhole <dbhole@redhat.com> 1.0-0.a1.2jpp
- Update for maven2 9jpp.
---------------
W: plexus-ant-factory non-standard-group Development/Java

---------------
Index: plexus-ant-factory.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-ant-factory/Attic/plexus-ant-factory.spec,v
 retrieving revision 1.1.2.1
diff -u -r1.1.2.1 plexus-ant-factory.spec
--- plexus-ant-factory.spec	21 Sep 2006 21:47:50 -0000	1.1.2.1
+++ plexus-ant-factory.spec	30 Oct 2006 15:47:52 -0000
@@ -28,6 +28,8 @@
 # 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}}}
 +
 %define section     free
 
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
@@ -40,7 +42,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.a1.1jpp
+Release:        0.a1.2jpp
 Epoch:          0
 Summary:        Plexus Component Creator
 License:        Apache Software License
@@ -51,17 +53,17 @@
 Source0:        %{name}-src.tar.gz
 # svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-ant-factory-1.0-alpha-1 \
plexus-ant-factory  
-Source1:		%{name}-mapdeps.xsl
-Source2:		%{name}-jpp-depmap.xml
-Source3:		%{name}-settings.xml
-Source4:		%{name}-build.xml
+Source1:		%{name}-jpp-depmap.xml
+Source2:		%{name}-build.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if ! %{gcj_support}
 BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 0:1.6
+%endif
+BuildRequires:  jpackage-utils >= 0:1.7.2
 %if %{with_maven}
-BuildRequires:	maven2 >= 2.0.4
+BuildRequires:	maven2 >= 2.0.4-9
 BuildRequires:	maven2-plugin-compiler
 BuildRequires:	maven2-plugin-install
 BuildRequires:	maven2-plugin-jar
@@ -80,6 +82,15 @@
 Requires:		plexus-container-default
 Requires:		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
 The Plexus project seeks to create end-to-end developer tools for
 writing applications. At the core is the container, which can be
@@ -102,35 +113,20 @@
 %prep
 %setup -q -n %{name}
 
-%if %{with_maven}
-	mkdir external_repo
-	ln -s %{_javadir} external_repo/JPP
-%else
-	cp %{SOURCE4} build.xml
+%if %{without_maven}
+	cp %{SOURCE2} build.xml
 %endif
 
 
 %build
 
-for pom in $(find -name pom.xml); do
-	cp $pom $pom.orig
-	saxon -o $pom $pom.orig %{SOURCE1} map=%{SOURCE2}
-done
-
 %if %{with_maven}
-	cp %{SOURCE3} %{maven_settings_file}
-
-	sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" \
                %{maven_settings_file}
-	sed -i -e "s|<url>__MAVENDIR_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" \
                %{maven_settings_file}
-
 	export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 	mkdir -p $MAVEN_REPO_LOCAL
 
-	mvn \
+	mvn-jpp \
 		-e \
 		-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-		-s %{maven_settings_file} \
-		-Dmaven2.jpp.mode=true \
 		install javadoc:javadoc
 
 %else
@@ -147,6 +143,7 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
 install -pm 644 target/*.jar \
 	  $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
+%add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-1 JPP/%{parent} \
%{subname}  
 (cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; do ln -sf \
${jar} `echo $jar| sed  "s|-%{version}||g"`; done)  
@@ -164,6 +161,10 @@
 	ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 %endif
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -178,13 +179,37 @@
 fi
 %endif
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+%update_maven_depmap
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+%update_maven_depmap
+
 %files
 %defattr(-,root,root,-)
 %dir %{_javadir}/plexus
 %{_javadir}/plexus
 %{_datadir}/maven2
+%{_mavendepmapfragdir}
 
 %if %{with_maven}
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-factory-1.0.jar.*
+%endif
+
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}-%{version}
@@ -193,5 +218,8 @@
 
 
 %changelog
+* Tue Oct 17 2006 Deepak Bhole <dbhole@redhat.com> 1.0-0.a1.2jpp
+- Update for maven2 9jpp.
+
 * Thu Sep 07 2006 Deepak Bhole <dbhole@redhat.com> 1.0-0.a1.1jpp
 - Initial build


_______________________________________________
JPackage-announce mailing list
JPackage-announce@zarb.org
https://www.zarb.org/mailman/listinfo/jpackage-announce


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic