[apache-rat/xmvn] Update spec to current Java guidelines
Orion Poplawski
orion at fedoraproject.org
Fri Jul 26 19:39:43 UTC 2013
commit c39df53570bc7beafd3edbba8a01d24143396340
Author: Orion Poplawski <orion at nwra.com>
Date: Fri Jul 26 13:39:20 2013 -0600
Update spec to current Java guidelines
apache-rat.spec | 81 ++++++++++++++++++++++++++++---------------------------
1 files changed, 41 insertions(+), 40 deletions(-)
---
diff --git a/apache-rat.spec b/apache-rat.spec
index 5b3bd4b..832f7c3 100644
--- a/apache-rat.spec
+++ b/apache-rat.spec
@@ -3,10 +3,9 @@
Name: apache-rat
Version: 0.8
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Apache Release Audit Tool (RAT)
-Group: Development/Libraries
License: ASL 2.0
URL: http://creadur.apache.org/rat/
#svn had a number of needed bugfixes
@@ -18,26 +17,24 @@ Patch1: apache-rat-compat.patch
Patch2: apache-rat-0.8-test.patch
BuildArch: noarch
-BuildRequires: jpackage-utils
-BuildRequires: java-devel
BuildRequires: maven-local
-BuildRequires: maven-antrun-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-dependency-plugin
-BuildRequires: maven-install-plugin
+#BuildRequires: maven-antrun-plugin
+#BuildRequires: maven-compiler-plugin
+#BuildRequires: maven-dependency-plugin
+#BuildRequires: maven-install-plugin
BuildRequires: maven-invoker-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-site-plugin
-BuildRequires: maven-source-plugin
-BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven-wagon
-
-BuildRequires: ant-antunit
-BuildRequires: ant-testutil
-BuildRequires: apache-commons-compress
+#BuildRequires: maven-jar-plugin
+#BuildRequires: maven-javadoc-plugin
+#BuildRequires: maven-plugin-plugin
+#BuildRequires: maven-resources-plugin
+#BuildRequires: maven-site-plugin
+#BuildRequires: maven-source-plugin
+#BuildRequires: maven-surefire-maven-plugin
+#BuildRequires: maven-wagon
+
+#BuildRequires: ant-antunit
+#BuildRequires: ant-testutil
+#BuildRequires: apache-commons-compress
Requires: jpackage-utils
Requires: java
@@ -108,28 +105,30 @@ This package contains the API documentation for %{name}.
%build
-mvn-rpmbuild -DskipTests=true package javadoc:aggregate
+%mvn_build --skip-tests
+#mvn-rpmbuild -DskipTests=true package javadoc:aggregate
%install
+%mvn_install
#Dirs
-mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+#mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
+#mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
#Parent pom
-cp -p pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom
+#cp -p pom.xml \
+ #$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+#%add_maven_depmap JPP.%{name}-%{name}.pom
#Components
-for comp in core plugin tasks
-do
- jarname=%{name}-${comp}
- jarfile=$jarname/target/${jarname}-%{version}.jar
- cp -p $jarfile $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname}.jar
- cp -p ${jarname}/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-${jarname}.pom
- %add_maven_depmap JPP.%{name}-${jarname}.pom %{name}/${jarname}.jar -f ${comp}
-done
+#for comp in core plugin tasks
+#do
+ #jarname=%{name}-${comp}
+ #jarfile=$jarname/target/${jarname}-%{version}.jar
+ #cp -p $jarfile $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname}.jar
+ #cp -p ${jarname}/pom.xml \
+ #$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-${jarname}.pom
+ #%add_maven_depmap JPP.%{name}-${jarname}.pom %{name}/${jarname}.jar -f ${comp}
+#done
#Wrapper script
%jpackage_script org.apache.rat.Report "" "" %{name}/%{name}-core:commons-cli:commons-io:commons-collections:commons-compress:commons-lang:junit apache-rat true
@@ -139,9 +138,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
#Javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/
-cp -rp target/site/apidocs \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+#mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/
+#cp -rp target/site/apidocs \
+# $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
@@ -170,12 +169,14 @@ cp -rp target/site/apidocs \
%{_mavendepmapfragdir}/%{name}-tasks
%{_javadir}/%{name}/%{name}-tasks.jar
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
%changelog
+* Thu Jul 25 2013 Orion Poplawski <orion at cora.nwra.com> 0.8-11
+- Update spec to current Java guidelines
+
* Tue Jun 11 2013 Orion Poplawski <orion at cora.nwra.com> 0.8-10
- Split up depmap fragments (bug 973242)
More information about the scm-commits
mailing list