commit 5904c80e15d19c436266c305b07c3a2f8c60645c
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Tue Dec 13 17:34:06 2011 +0200
Build with maven 3.x.
jline.spec | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 deletions(-)
---
diff --git a/jline.spec b/jline.spec
index ab2245a..b4b1385 100644
--- a/jline.spec
+++ b/jline.spec
@@ -30,7 +30,7 @@
Name: jline
Version: 0.9.94
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Java library for reading and editing user input in console applications
License: BSD
URL: http://jline.sourceforge.net/
@@ -44,11 +44,9 @@ Requires: bash
# for /bin/stty
Requires: coreutils
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
BuildRequires: jpackage-utils
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -61,7 +59,6 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: java-javadoc
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
JLine is a java library for reading and editing user input in console
@@ -107,15 +104,9 @@ export CLASSPATH=%{_builddir}/%{name}-%{version}/build
cd src/
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp -e -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
install -pD -T -m 644 src/target/%{name}-%{version}.jar \
%{buildroot}%{_javadir}/%{name}.jar
@@ -130,16 +121,7 @@ cp -pr examples %{buildroot}%{_datadir}/%{name}
# pom
install -pD -T -m 644 src/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap %{name} %{name} %{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
%pre javadoc
# workaround for rpm bug, can be removed in F-17
@@ -147,22 +129,22 @@ rm -rf $RPM_BUILD_ROOT
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%defattr(-,root,root,-)
%{_javadir}/%{name}.jar
%{_mavendepmapfragdir}/*
%{_mavenpomdir}/*
%doc LICENSE.txt src/src/main/resources/jline/keybindings.properties
%files demo
-%defattr(-,root,root,-)
%{_datadir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadocdir}/*
%changelog
+* Tue Dec 13 2011 Alexander Kurtakov <akurtako at redhat.com> 0.9.94-6
+- Build with maven 3.x.
+
* Sat Oct 15 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.9.94-5
- BuildRequire maven2.