From 7f7c637db70a818306a5e4f67c5dece2a5f1e940 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 7 Aug 2012 14:11:19 +0200
Subject: [PATCH] General package cleanup

- Enable tests
- Install NOTICE with javadoc package
- Fix file permissions
- Remove versioned symlinks
---
 apache-commons-codec.spec | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec
index 815ca6b..74b8ece 100644
--- a/apache-commons-codec.spec
+++ b/apache-commons-codec.spec
@@ -3,7 +3,7 @@
 
 Name:          apache-%{short_name}
 Version:       1.6
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Implementations of common encoders and decoders
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -57,20 +57,21 @@ Obsoletes:     jakarta-%{short_name}-javadoc < %{version}-%{release}
 sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
 
 %build
-mvn-rpmbuild -Dmaven.test.failure.ignore=true install javadoc:javadoc
+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
-(cd %{buildroot}%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed "s|%{short_name}|%{name}|g"`; done)
 
 # javadocs
 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
@@ -80,10 +81,16 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
 %{_javadir}/*
 
 %files javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Aug  7 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6-4
+- Enable tests
+- Install NOTICE with javadoc package
+- Fix file permissions
+- Remove versioned symlinks
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild