[cal10n] Build with maven 3.x.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Jun 8 11:26:03 UTC 2011
commit dad3ee7ad6a3386c4e28600a77e39882644a6988
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Jun 8 14:25:40 2011 +0300
Build with maven 3.x.
cal10n.spec | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/cal10n.spec b/cal10n.spec
index 027ce10..a10f7f7 100644
--- a/cal10n.spec
+++ b/cal10n.spec
@@ -1,6 +1,6 @@
Name: cal10n
Version: 0.7.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Compiler assisted localization library (CAL10N)
Group: Development/Libraries
@@ -8,13 +8,12 @@ License: MIT
URL: http://cal10n.qos.ch
Source0: http://cal10n.qos.ch/dist/cal10n-%{version}.tar.gz
Patch0: %{name}-fix-maven.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: junit4
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -25,7 +24,7 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-site-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
Requires: java
@@ -55,7 +54,7 @@ API documentation for %{name}.
%package -n maven-cal10n-plugin
Summary: CAL10N maven plugin
Group: Development/Tools
-Requires: maven2
+Requires: maven
Requires: %{name} = %{version}-%{release}
%description -n maven-cal10n-plugin
@@ -68,11 +67,7 @@ find . -name "*.jar" | xargs rm
%patch0
%build
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.test.failure.ignore=true \
- install javadoc:aggregate
+mvn-rpmbuild install javadoc:aggregate
%install
@@ -114,7 +109,6 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%defattr(-,root,root,-)
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/%{name}*.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-parent*
@@ -122,15 +116,16 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_mavendepmapfragdir}/%{name}
%files -n maven-cal10n-plugin
-%defattr(-,root,root,-)
%{_javadir}/%{name}/maven*.jar
%{_mavenpomdir}/JPP.%{name}-maven*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
+* Wed Jun 8 2011 Alexander Kurtakov <akurtako at redhat.com> 0.7.4-6
+- Build with maven 3.x.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list