[lua/f21] fix license handling

Tom Callaway spot at fedoraproject.org
Fri Jul 18 19:57:22 UTC 2014


commit a04375e8bb555ce4e36c7d0acbf70a639805fc37
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Jul 18 15:57:47 2014 -0400

    fix license handling

 lua.spec |   10 +++++++++-
 mit.txt  |   19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/lua.spec b/lua.spec
index 0af8817..4c30579 100644
--- a/lua.spec
+++ b/lua.spec
@@ -2,12 +2,14 @@
 
 Name:           lua
 Version:        %{major_version}.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Powerful light-weight programming language
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.lua.org/
 Source0:        http://www.lua.org/ftp/lua-%{version}.tar.gz
+# copied from doc/readme.html on 2014-07-18
+Source1:	mit.txt
 Patch0:         %{name}-%{version}-autotoolize.patch
 Patch1:         %{name}-%{version}-idsize.patch
 Patch2:         %{name}-%{version}-luac-shared-link-fix.patch
@@ -46,6 +48,7 @@ This package contains the static version of liblua for %{name}.
 
 %prep
 %setup -q
+cp %{SOURCE1} .
 mv src/luaconf.h src/luaconf.h.template.in
 %patch0 -p1 -E -z .autoxxx
 %patch1 -p1 -z .idsize
@@ -75,6 +78,8 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version}
 
 
 %files
+%{!?_licensedir:%global license %%doc}
+%license mit.txt
 %doc README doc/*.html doc/*.css doc/*.gif doc/*.png
 %{_bindir}/lua
 %{_bindir}/luac
@@ -96,6 +101,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version}
 
 
 %changelog
+* Fri Jul 18 2014 Tom Callaway <spot at fedoraproject.org> - 5.2.2-7
+- fix license handling
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/mit.txt b/mit.txt
new file mode 100644
index 0000000..4e6c510
--- /dev/null
+++ b/mit.txt
@@ -0,0 +1,19 @@
+Copyright (c) 1994-2013 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.


More information about the scm-commits mailing list