[pmd] Update to 5.0.5 upstream release.

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Aug 13 16:35:19 UTC 2013


commit ef8d1ef4529263a632228dd075f634cc5e4f134e
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Aug 13 19:35:07 2013 +0300

    Update to 5.0.5 upstream release.
    
    Also make use of xmvn macros.

 .gitignore |    1 +
 pmd.spec   |   31 +++++++++++--------------------
 sources    |    2 +-
 3 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da6afae..9ea940c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /libpeerconnection.log
 /pmd-src-5.0.4.zip
+/pmd-src-5.0.5.zip
diff --git a/pmd.spec b/pmd.spec
index d013639..b929f69 100644
--- a/pmd.spec
+++ b/pmd.spec
@@ -28,8 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 Name:           pmd
-Version:        5.0.4
-Release:        3%{?dist}
+Version:        5.0.5
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Scans Java source code and looks for potential problems
 License:        BSD
@@ -102,35 +102,26 @@ API documentation for %{name}.
 find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.class" -exec rm -f {} \;
 
+%mvn_alias : pmd:pmd
+
 %build
 # some tests are failing so ignore them
 # this may be because fedora has a newer rhino than pmd expects
-mvn-rpmbuild install javadoc:aggregate \
-  -Dmaven.test.failure.ignore=true -Dmaven.clover.skip=true
+%mvn_build -- -Dmaven.test.failure.ignore=true -Dmaven.clover.skip=true
 
 %install
-# jar
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap -a "pmd:pmd"
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_install
 
 %files -f .mfiles
 %doc LICENSE.txt etc/changelog.txt
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
-%{_javadocdir}/*
 
 %changelog
+* Tue Aug 13 2013 Alexander Kurtakov <akurtako at redhat.com> 0:5.0.5-1
+- Update to latest upstream.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:5.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -232,7 +223,7 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 * Wed Aug 25 2004 Fernando Nasser <fnasser at redhat.com> - 1.9-1jpp
 - Upgrade to 1.9
 
-* Wed Aug 24 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.5-4jpp
+* Tue Aug 24 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.5-4jpp
 - Rebuild with Ant 1.6.2
 
 * Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 1.5-3jpp
diff --git a/sources b/sources
index 1de5d87..09e6267 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ea9075e4129a8ed5816913020e131c4  pmd-src-5.0.4.zip
+a87974acb8e480f6c296cfa636c6758f  pmd-src-5.0.5.zip


More information about the scm-commits mailing list