From 14ffa605addabcb8d7ea68f3bfcd7318c6efe07b Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Tue, 9 Jul 2013 13:43:53 +0200
Subject: Added separate BSD and MIT license files

---
 BSD        | 28 ++++++++++++++++++++++++++++
 MIT        | 19 +++++++++++++++++++
 groff.spec | 14 +++++++++++---
 3 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 BSD
 create mode 100644 MIT

diff --git a/BSD b/BSD
new file mode 100644
index 0000000..42755b0
--- /dev/null
+++ b/BSD
@@ -0,0 +1,28 @@
+Copyright (c) 1991, 1993
+The Regents of the University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. [Deleted.  See
+   ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change]
+4. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/MIT b/MIT
new file mode 100644
index 0000000..c5371c7
--- /dev/null
+++ b/MIT
@@ -0,0 +1,19 @@
+Copyright (c) 1989 Massachusetts Institute of Technology
+
+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.
diff --git a/groff.spec b/groff.spec
index dbc1f5a..370b398 100644
--- a/groff.spec
+++ b/groff.spec
@@ -1,13 +1,16 @@
-%{!?with_x:%define with_x 1}
+%{!?with_x:%global with_x 1}
 
 Summary: A document formatting system
 Name: groff
 Version: 1.22.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+ and GFDL and BSD and MIT
 Group: Applications/Publishing
 URL: http://www.gnu.org/software/groff/
 Source: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
+# Licenses in separate files
+Source1: BSD
+Source2: MIT
 
 # resolves: #530788
 Patch0: 0001-missing-groff-x11-info-message-when-gxditview-not-fo.patch
@@ -100,6 +103,8 @@ for file in NEWS src/devices/grolbp/grolbp.man doc/{groff.info*,webpage.ms} \
     mv "${file}_" "$file"
 done
 
+%{__cp} %{SOURCE1} %{SOURCE2} .
+
 %build
 %configure \
     --docdir=%{_docdir}/%{name}-%{version} \
@@ -230,7 +235,7 @@ fi
 %{_infodir}/groff.info*
 
 %files base
-%doc BUG-REPORT COPYING FDL LICENSES MORE.STUFF NEWS PROBLEMS
+%doc BUG-REPORT COPYING FDL LICENSES MORE.STUFF NEWS PROBLEMS BSD MIT
 # configuration
 %dir %{_sysconfdir}/groff/
 %config(noreplace) %{_sysconfdir}/groff/*
@@ -397,6 +402,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}/pdf/
 
 %changelog
+* Tue Jul  9 2013 Peter Schiffer <pschiffe@redhat.com> 1.22.2-3
+- added BSD and MIT license files
+
 * Mon Mar 11 2013 Peter Schiffer <pschiffe@redhat.com> 1.22.2-2
 - resolves: #915682
   moved html device to the groff-base subpackage
-- 
cgit