commit 032d038263e06faa4a621a09c741d45e6f112c71
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Wed Nov 30 15:39:38 2011 +0200
Build with maven 3.
- Adapt to current guidelines.
apache-commons-digester.spec | 63 ++++++++++++-----------------------------
1 files changed, 19 insertions(+), 44 deletions(-)
---
diff --git a/apache-commons-digester.spec b/apache-commons-digester.spec
index 4058168..0999f85 100644
--- a/apache-commons-digester.spec
+++ b/apache-commons-digester.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.8.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: XML to Java object mapping module
Group: Development/Libraries
License: ASL 2.0
@@ -11,30 +11,26 @@ URL:
http://commons.apache.org/%{base_name}/
Source0:
http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-...
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: apache-commons-beanutils >= 1.8
BuildRequires: apache-commons-logging >= 1.1.1
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-idea-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-plugin-bundle
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
Requires: java
Requires: jpackage-utils
-Requires(post):jpackage-utils
-Requires(postun):jpackage-utils
Requires: apache-commons-beanutils >= 1.8
Requires: apache-commons-logging >= 1.1.1
@@ -62,56 +58,36 @@ Obsoletes: jakarta-%{short_name}-javadoc <
%{version}-%{release}
sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp -Dmaven.compile.source=1.5 -Dmaven.compile.target=1.5 \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -pD -T target/%{short_name}-%{version}.jar \
- %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar}
`echo $jar| sed "s|%{short_name}|%{name}|g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
+ %{buildroot}%{_javadir}/%{short_name}.jar
+ln -s %{short_name}.jar %{buildroot}/%{_javadir}/%{name}.jar
# javadocs
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
# pom
install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-
-%clean
-rm -rf %{buildroot}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a
"%{short_name}:%{short_name}"
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES*
%{_mavendepmapfragdir}/*
%{_mavenpomdir}/*
%{_javadir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Wed Nov 30 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.8.1-9
+- Build with maven 3.
+- Adapt to current guidelines.
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.8.1-8
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -217,4 +193,3 @@ rm -rf %{buildroot}
* Thu May 08 2003 Henri Gomez <hgomez(a)users.sourceforge.net> 1.5-2jpp
- 1.5
-