[apache-commons-lang] Update to 2.6

[Stanislav Ochotnicky]

commit 5522c13e8623d1074625157d47a78dc022dd6d30
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Tue Jan 18 13:58:40 2011 +0100

    Update to 2.6
    
    - Versionless jars & javadocs
    - Use maven 3 to build

 0001-Make-source-version-1.3.patch |   35 ++++++++++++++++++++++++++++++
 apache-commons-lang.spec           |   42 ++++++++++++++++-------------------
 2 files changed, 54 insertions(+), 23 deletions(-)
---
diff --git a/0001-Make-source-version-1.3.patch b/0001-Make-source-version-1.3.patch
new file mode 100644
index 0000000..2b6a7a2
--- /dev/null
+++ b/0001-Make-source-version-1.3.patch
@@ -0,0 +1,35 @@
+From 4bdae0c8e87e64322753890a10bbbe5971d46bb6 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 18 Jan 2011 13:43:08 +0100
+Subject: [PATCH] Make source version 1.3
+
+---
+ pom.xml |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 367d439..fa3db7b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -458,6 +458,18 @@
+           <tarLongFileMode>gnu</tarLongFileMode>
+         </configuration>
+       </plugin>
++      <plugin>
++        <artifactId>maven-javadoc-plugin</artifactId>
++        <configuration>
++          <source>1.3</source>
++        </configuration>
++      </plugin>
++      <plugin>
++        <artifactId>maven-compiler-plugin</artifactId>
++        <configuration>
++          <source>1.3</source>
++        </configuration>
++      </plugin>
+     </plugins>
+   </build>
+ 
+-- 
+1.7.3.4
+
diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec
index 5ddebd5..78cd494 100644
--- a/apache-commons-lang.spec
+++ b/apache-commons-lang.spec
@@ -3,17 +3,19 @@
 %global short_name      commons-%{base_name}
 
 Name:           apache-%{short_name}
-Version:        2.5
-Release:        7%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        Provides a host of helper utilities for the java.lang API
 License:        ASL 2.0
 Group:          Development/Libraries
 URL:            http://commons.apache.org/%{base_name}
 Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Patch0:         0001-Make-source-version-1.3.patch
 BuildArch:      noarch
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  maven-site-plugin
+BuildRequires:  maven
 BuildRequires:  apache-commons-parent
 
 Requires:       java >= 1:1.6.0
@@ -21,7 +23,6 @@ Requires:       jpackage-utils >= 0:1.6
 Requires(post):    jpackage-utils
 Requires(postun):  jpackage-utils
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This should go away with F-17
 Provides:       jakarta-commons-lang = 0:%{version}-%{release}
@@ -51,28 +52,18 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 0:2.4
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
+%patch0 -p1
 sed -i 's/\r//' *.txt
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-    install javadoc:javadoc
+mvn-local install javadoc:javadoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-
-pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}*; do
-    ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
-    ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
-    ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
-done
-popd # come back from javadir
+install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -sf %{buildroot}%{_javadir}%{name}.jar %{short_name}.jar
 
 # pom
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -88,12 +79,13 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
 %add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %post
 %update_maven_depmap
@@ -111,10 +103,14 @@ rm -rf $RPM_BUILD_ROOT
 %files javadoc
 %defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jan 18 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.6-1
+- Update to 2.6
+- Versionless jars & javadocs
+- Use maven 3 to build
+
 * Wed Nov 10 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.5-7
 - Use apache-commons-parent instead of maven-*