commit d5597a131336e1ac35e5e186606a85c2397c9c7e Author: gil puntogil@libero.it Date: Mon Jul 1 17:32:22 2013 +0200
switch to XMvn, minor changes to adapt to current guideline
tiger-types.spec | 46 ++++++++++++++++------------------------------ 1 files changed, 16 insertions(+), 30 deletions(-) --- diff --git a/tiger-types.spec b/tiger-types.spec index 26a416b..1350804 100644 --- a/tiger-types.spec +++ b/tiger-types.spec @@ -1,8 +1,7 @@ Name: tiger-types Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Type arithmetic library for Java5 -Group: Development/Libraries License: CDDL or GPLv2 with exceptions Url: http://java.net/projects/tiger-types # svn export https://svn.java.net/svn/tiger-types~svn/tags/tiger-types-1.4 @@ -13,31 +12,22 @@ Source0: %{name}-%{version}-src-svn.tar.gz Source1: glassfish-LICENSE.txt
BuildRequires: java-devel -BuildRequires: jpackage-utils BuildRequires: jvnet-parent
BuildRequires: junit
BuildRequires: maven-local -BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4
Requires: jvnet-parent
-Requires: java -Requires: jpackage-utils BuildArch: noarch
%description Tiger-types is a type arithmetic library for Java5.
%package javadoc -Group: Documentation Summary: Javadoc for %{name}
%description javadoc @@ -64,42 +54,38 @@ This package contains javadoc for %{name}. </execution> </executions>' # removed some warning -%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-compiler-plugin']" "<groupId>org.apache.maven.plugins</groupId><version>2.5.1</version>" -%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId ='maven-javadoc-plugin']" "<groupId>org.apache.maven.plugins</groupId><version>2.9</version>" +%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-compiler-plugin']" " + <groupId>org.apache.maven.plugins</groupId> + <version>any</version>" +%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId ='maven-javadoc-plugin']" " + <groupId>org.apache.maven.plugins</groupId> + <version>any</version>"
# Unneeded %pom_remove_plugin :maven-idea-plugin %pom_remove_plugin :maven-release-plugin
+%mvn_file :%{name} %{name} + cp -p %{SOURCE1} LICENSE.txt sed -i 's/\r//' LICENSE.txt
%build
-mvn-rpmbuild package javadoc:aggregate +%mvn_build
%install +%mvn_install
-mkdir -p %{buildroot}%{_javadir} -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -%files -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc LICENSE.txt
-%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc LICENSE.txt
%changelog +* Mon Jul 01 2013 gil cattaneo puntogil@libero.it 1.4-2 +- switch to XMvn, minor changes to adapt to current guideline + * Sat Aug 25 2012 gil cattaneo puntogil@libero.it 1.4-1 - initial rpm \ No newline at end of file
java-sig-commits@lists.fedoraproject.org