[geronimo-jta] Build with Maven 3
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri Nov 25 13:57:12 UTC 2011
commit eca5370937727b30af4043f6fc46c1befb2ff2c4
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Fri Nov 25 14:57:01 2011 +0100
Build with Maven 3
- Fix packaging problems
geronimo-jta.spec | 64 ++++++++++++++++++++--------------------------------
1 files changed, 25 insertions(+), 39 deletions(-)
---
diff --git a/geronimo-jta.spec b/geronimo-jta.spec
index 9f2c623..1d913cb 100644
--- a/geronimo-jta.spec
+++ b/geronimo-jta.spec
@@ -2,7 +2,7 @@
Name: geronimo-jta
Version: 1.1.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: J2EE JTA v1.1 API
Group: Development/Libraries
@@ -11,15 +11,11 @@ URL: http://geronimo.apache.org/
# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/%{spec_name}-%{version}/
Source0: %{spec_name}-%{version}.tar.bz
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
# This pulls in almost all of the required java and maven stuff
BuildRequires: geronimo-parent-poms
-BuildRequires: maven2-plugin-resources
-
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+BuildRequires: maven-resources-plugin
# Ensure a smooth transition from geronimo-specs
Provides: jta = %{version}-%{release}
@@ -46,64 +42,54 @@ BuildArch: noarch
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.skip=true \
- install javadoc:javadoc
+mvn-rpmbuild -Dmaven.test.skip=true \
+ install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 target/%{spec_name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
# Also provide compat symlinks
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -sf %{name}-%{version}.jar %{spec_name}-%{version}.jar
-ln -sf %{name}-%{version}.jar jta.jar
+pushd $RPM_BUILD_ROOT%{_javadir}
+ln -sf %{name}.jar %{spec_name}.jar
+ln -sf %{name}.jar jta.jar
popd
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.geronimo.specs %{spec_name} %{version} JPP %{name}
-%add_to_maven_depmap javax.transaction jta %{version} JPP %{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "javax.transaction:jta"
+%pre javadoc
+# workaround for rpm bug, can be removed in F-20
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
-%{_javadir}/*.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/%{spec_name}.jar
+%{_javadir}/jta.jar
%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/*.pom
+%{_mavenpomdir}/JPP-%{name}.pom
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
+%doc LICENSE.txt NOTICE.txt
%{_javadocdir}/%{name}
-
%changelog
+* Fri Nov 25 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.1-8
+- Build with Maven 3
+- Fix packaging problems
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list