Add the NOTICE file to the rpm spec file in compliance with the Apache

v2.0 license.
PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104119 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 955f7405400b72e27b09ba2e297467546fce5baf..4758334b9fb9e9458783a82a2d47b06e750df16d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Add the NOTICE file to the rpm spec file in compliance with the
+     Apache v2.0 license. [Graham Leggett]
+
   *) mod_proxy: multiple bugfixes, principally support cookies in
      ProxyPassReverse, and don't canonicalise URL passed to backend.
      Documentation correspondingly updated. [Nick Kew <nick webthing.com>]

diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index 9a2d3ff4e8189ad1cf82e5019820d37a1ca92414..259135ef3a87482500370f85161d84c99036b044 100644 (file)
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -293,7 +293,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 
-%doc ABOUT_APACHE README CHANGES LICENSE
+%doc ABOUT_APACHE README CHANGES LICENSE NOTICE
 
 %dir %{_sysconfdir}/httpd
 %{_sysconfdir}/httpd/modules