[apache-commons-digester] General package cleanup

Stanislav Ochotnicky sochotni at fedoraproject.org
Tue Aug 7 12:35:12 UTC 2012


commit 64d8e0dadee6b284cbd4684fd70303ce4f49be48
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Aug 7 14:12:57 2012 +0200

    General package cleanup
    
    - Fix file permissions
    - Install LICENSE and NOTICE with javadoc package

 apache-commons-digester.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/apache-commons-digester.spec b/apache-commons-digester.spec
index 6190fa4..ea8b561 100644
--- a/apache-commons-digester.spec
+++ b/apache-commons-digester.spec
@@ -3,7 +3,7 @@
 
 Name:          apache-%{short_name}
 Version:       1.8.1
-Release:       11%{?dist}
+Release:       12%{?dist}
 Summary:       XML to Java object mapping module
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -62,7 +62,8 @@ mvn-rpmbuild install javadoc:javadoc
 
 %install
 # jars
-install -pD -T target/%{short_name}-%{version}.jar \
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 target/%{short_name}-%{version}.jar \
   %{buildroot}%{_javadir}/%{short_name}.jar
 ln -s %{short_name}.jar %{buildroot}/%{_javadir}/%{name}.jar
 
@@ -71,7 +72,8 @@ 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
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
 %add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "%{short_name}:%{short_name}"
 
 %files
@@ -81,9 +83,14 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
 %{_javadir}/*
 
 %files javadoc
+%doc LICENSE.txt NOTICE.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Aug  7 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.8.1-12
+- Fix file permissions
+- Install LICENSE and NOTICE with javadoc package
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list