[jakarta-commons-httpclient/f18] Install LICENSE and NOTICE files

Mikolaj Izdebski mizdebsk at fedoraproject.org
Thu Sep 20 11:02:08 UTC 2012


commit 3f24c41cdc85279f61864ab344a43d9143e3ea6a
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Sep 20 12:52:53 2012 +0200

    Install LICENSE and NOTICE files
    
    - Add missing R: java, jpackage-utils

 jakarta-commons-httpclient.spec |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/jakarta-commons-httpclient.spec b/jakarta-commons-httpclient.spec
index 36482a1..7289b24 100644
--- a/jakarta-commons-httpclient.spec
+++ b/jakarta-commons-httpclient.spec
@@ -32,7 +32,7 @@
 
 Name:           jakarta-commons-httpclient
 Version:        3.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          1
 Summary: Jakarta Commons HTTPClient implements the client side of HTTP standards
 License:        ASL 2.0
@@ -53,6 +53,8 @@ BuildRequires:  apache-commons-logging >= 0:1.0.3
 BuildRequires:  apache-commons-logging-javadoc
 BuildRequires:  junit
 
+Requires:       java
+Requires:       jpackage-utils
 Requires:       apache-commons-logging >= 0:1.0.3
 Requires:       apache-commons-codec
 
@@ -128,10 +130,6 @@ pushd src
     rm tempf
 popd
 
-%{__sed} -i 's/\r//' RELEASE_NOTES.txt
-%{__sed} -i 's/\r//' README.txt
-%{__sed} -i 's/\r//' LICENSE.txt
-
 %build
 ant \
   -Dbuild.sysclasspath=first \
@@ -167,13 +165,15 @@ rm -f dist/docs/{BUILDING,TESTING}.txt
 ln -s %{_javadocdir}/%{name}-%{version} dist/docs/apidocs
 
 %files
-%doc LICENSE.txt README.txt RELEASE_NOTES.txt
+%doc LICENSE NOTICE
+%doc README RELEASE_NOTES
 %{_javadir}/%{name}.jar
 %{_javadir}/commons-httpclient3.jar
 %{_javadir}/commons-httpclient.jar
 
 
 %files javadoc
+%doc LICENSE NOTICE
 %doc %{_javadocdir}/%{name}
 
 %files demo
@@ -184,6 +184,10 @@ ln -s %{_javadocdir}/%{name}-%{version} dist/docs/apidocs
 
 
 %changelog
+* Thu Sep 20 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1:3.1-9
+- Install LICENSE and NOTICE files
+- Add missing R: java, jpackage-utils
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list