[apache-commons-logging/f18] Install NOTICE file

Mikolaj Izdebski mizdebsk at fedoraproject.org
Fri Nov 23 12:02:50 UTC 2012


commit 016af291365afe3b2f308a3550839758b2613339
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Nov 22 21:31:35 2012 +0100

    Install NOTICE file
    
    - Resolves: rhbz#879581

 apache-commons-logging.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 955de34..f788396 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -64,7 +64,7 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 0:1.0.4
 %patch0 -p1
 %patch1
 
-sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
+sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
 
 # -----------------------------------------------------------------------------
 
@@ -116,7 +116,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
-%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
+%doc LICENSE.txt NOTICE.txt
+%doc PROPOSAL.html STATUS.html RELEASE-NOTES.txt
 %{_javadir}/*
 %{_mavenpomdir}/JPP-%{short_name}.pom
 %{_mavenpomdir}/JPP-%{short_name}-api.pom
@@ -124,12 +125,16 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %files javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
 %{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Nov 22 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1.1-21
+- Install NOTICE file
+- Resolves: rhbz#879581
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list