[jakarta-commons-httpclient] Fix symlinks in javadir

Stanislav Ochotnicky sochotni at fedoraproject.org
Tue Jun 28 12:53:54 UTC 2011


commit 4e968396a3acd1662ecac6f1a82baf4107ddc39b
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Tue Jun 28 14:52:56 2011 +0200

    Fix symlinks in javadir

 jakarta-commons-httpclient.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/jakarta-commons-httpclient.spec b/jakarta-commons-httpclient.spec
index 970eda8..e188560 100644
--- a/jakarta-commons-httpclient.spec
+++ b/jakarta-commons-httpclient.spec
@@ -32,7 +32,7 @@
 
 Name:           jakarta-commons-httpclient
 Version:        3.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          1
 Summary: Jakarta Commons HTTPClient implements the client side of HTTP standards
 License:        ASL 2.0
@@ -144,10 +144,10 @@ ant \
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p dist/commons-httpclient.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
 # compat symlink
 pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s commons-httpclient.jar commons-httpclient3.jar
+ln -s jakarta-commons-httpclient.jar commons-httpclient3.jar
+ln -s jakarta-commons-httpclient.jar commons-httpclient.jar
 popd
 
 # javadoc
@@ -164,7 +164,10 @@ ln -s %{_javadocdir}/%{name}-%{version} dist/docs/apidocs
 
 %files
 %doc LICENSE.txt README.txt RELEASE_NOTES.txt
-%{_javadir}/*
+%{_javadir}/%{name}.jar
+%{_javadir}/commons-httpclient3.jar
+%{_javadir}/commons-httpclient.jar
+
 
 %files javadoc
 %doc %{_javadocdir}/%{name}
@@ -177,6 +180,9 @@ ln -s %{_javadocdir}/%{name}-%{version} dist/docs/apidocs
 
 
 %changelog
+* Tue Jun 28 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1:3.1-5
+- Fix symlinks in javadir
+
 * Tue Jun 28 2011 Alexander Kurtakov <akurtako at redhat.com> 1:3.1-4
 - Fix FTBFS.
 - Adapt to current guidelines.


More information about the scm-commits mailing list