[mod_auth_kerb] clarify licensing; clean up spec file
jorton
jorton at fedoraproject.org
Thu Nov 15 13:40:41 UTC 2012
commit 6d96b324d87b81b35ec9a9f52914f78b0fe3e964
Author: Joe Orton <jorton at redhat.com>
Date: Thu Nov 15 13:40:36 2012 +0000
clarify licensing; clean up spec file
mod_auth_kerb.spec | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/mod_auth_kerb.spec b/mod_auth_kerb.spec
index 7e7be21..78223ed 100644
--- a/mod_auth_kerb.spec
+++ b/mod_auth_kerb.spec
@@ -8,7 +8,9 @@
Summary: Kerberos authentication module for HTTP
Name: mod_auth_kerb
Version: 5.4
-Release: 21%{?dist}
+Release: 22%{?dist}
+# src/mod_auth_kerb.c is under 3-clause BSD, ASL 2.0 code is patched in (-s4u2proxy.patch)
+# src/mit-internals.h contains MIT-licensed code.
License: BSD and MIT and ASL 2.0
Group: System Environment/Daemons
URL: http://modauthkerb.sourceforge.net/
@@ -21,7 +23,6 @@ Patch3: mod_auth_kerb-5.4-s4u2proxy.patch
Patch4: mod_auth_kerb-5.4-httpd24.patch
Patch5: mod_auth_kerb-5.4-delegation.patch
Patch6: mod_auth_kerb-5.4-cachedir.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: httpd-devel, krb5-devel
Requires: httpd-mmn = %{_httpd_mmn}
Requires(pre): httpd
@@ -74,11 +75,7 @@ mkdir -p $RPM_BUILD_ROOT/run/httpd/krbcache
# Copy the license files here so we can include them in %doc
cp -p %{SOURCE2} .
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%doc README LICENSE LICENSE.ASL
%config(noreplace) %{_httpd_modconfdir}/*.conf
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
@@ -89,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(0700,apache,apache) %dir /run/httpd/krbcache
%changelog
+* Thu Nov 15 2012 Joe Orton <jorton at redhat.com> - 5.4-22
+- clarify licensing; clean up spec file
+
* Tue Nov 13 2012 Joe Orton <jorton at redhat.com> - 5.4-21
- fix httpd_mmn stderr filter (thanks rcollet)
More information about the scm-commits
mailing list