[javassist] Switch to Maven 3 build.
Andy Grimm
arg at fedoraproject.org
Tue Aug 30 20:34:31 UTC 2011
commit 98686625a3f9b4b8ca7e783e2ad3316454bf4b46
Author: Andy Grimm <agrimm at gmail.com>
Date: Tue Aug 30 16:33:43 2011 -0400
Switch to Maven 3 build.
javassist.spec | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/javassist.spec b/javassist.spec
index d1f9cd4..43de335 100644
--- a/javassist.spec
+++ b/javassist.spec
@@ -1,6 +1,6 @@
Name: javassist
Version: 3.14.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Java Programming Assistant provides simple Java bytecode manipulation
Group: Development/Libraries
License: MPLv1.1 or LGPLv2+
@@ -56,19 +56,14 @@ javassist development documentation.
find . -name \*.jar -type f -delete
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
--Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap %{name} %{name} %{version}-GA JPP %{name}
# jar
@@ -91,7 +86,6 @@ rm -rf $RPM_BUILD_ROOT
%update_maven_depmap
%files
-%defattr(-,root,root,-)
%doc License.html Readme.html
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
@@ -99,13 +93,15 @@ rm -rf $RPM_BUILD_ROOT
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%doc License.html
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*
%changelog
+* Tue Aug 30 2011 Andy Grimm <agrimm at gmail.com> - 3.14.0-4
+- Switch to Maven 3 build.
+
* Tue Aug 30 2011 John5342 <john5342 at, fedoraproject.org> - 3.14.0-3
- Remove ext_ver macro usage leftover after last rebase (rhbz#734255)
More information about the scm-commits
mailing list