[pmd] Fix FTBFS.
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Jun 28 10:26:19 UTC 2011
commit 0b767bd8ca47be9cb899d2de5e69124f25daed57
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Tue Jun 28 13:25:57 2011 +0300
Fix FTBFS.
Current guidelines updates.
pmd-4.2.5-build.patch | 2 +-
pmd.spec | 16 +++++-----------
2 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/pmd-4.2.5-build.patch b/pmd-4.2.5-build.patch
index 1fedef8..728b382 100644
--- a/pmd-4.2.5-build.patch
+++ b/pmd-4.2.5-build.patch
@@ -5,7 +5,7 @@
<property name="version" value="4.2.5" />
- <property name="asm.version" value="3.1" />
-+ <property name="asm.version" value="3.2" />
++ <property name="asm.version" value="3.3.1" />
<property name="jaxen.version" value="1.1.1" />
- <property name="junit.version" value="4.4" />
- <property name="retroweaver.version" value="2.0.5" />
diff --git a/pmd.spec b/pmd.spec
index 81da2f4..cf23cad 100644
--- a/pmd.spec
+++ b/pmd.spec
@@ -29,7 +29,7 @@
#
Name: pmd
Version: 4.2.5
-Release: 10%{?dist}
+Release: 11%{?dist}
Epoch: 0
Summary: Scans Java source code and looks for potential problems
License: BSD
@@ -108,8 +108,6 @@ ant
ant -f bin/build.xml -Ddir.lib=%{_javadir} javadoc
%install
-rm -rf $RPM_BUILD_ROOT
-
# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 lib/%{name}-%{version}.jar \
@@ -131,14 +129,7 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt etc/changelog.txt etc/fr_docs etc/readme.txt
%doc etc/pmdProperties.rtf
%{_javadir}/*.jar
@@ -148,11 +139,14 @@ cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadocdir}/*
%changelog
+* Tue Jun 28 2011 Alexander Kurtakov <akurtako at redhat.com> 0:4.2.5-11
+- Fix FTBFS.
+- Current guidelines updates.
+
* Thu Feb 24 2011 Alexander Kurtakov <akurtako at redhat.com> 0:4.2.5-10
- Let it conform to new packaging guidelines.
More information about the scm-commits
mailing list