From 5d100106b3b8f5ae787cd6cc31f4aef06ad760f5 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Jul 31 2014 14:25:05 +0000
Subject: fix license handling


---

diff --git a/configobj-bsd-license.txt b/configobj-bsd-license.txt
new file mode 100644
index 0000000..2a16af3
--- /dev/null
+++ b/configobj-bsd-license.txt
@@ -0,0 +1,32 @@
+Copyright (c) 2005-2014
+Michael Foord: fuzzyman AT voidspace DOT org DOT uk
+Nicola Larosa: nico AT tekNico DOT net
+Rob Dennis: rdennis AT gmail DOT com
+Eli Courtwright: eli AT courtwright DOT org
+
+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. Neither the name of the copyright holder 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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/python-configobj.spec b/python-configobj.spec
index 3c24bcf..a22eeed 100644
--- a/python-configobj.spec
+++ b/python-configobj.spec
@@ -8,7 +8,7 @@
 
 Name:           python-configobj
 Version:        5.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Config file reading, writing, and validation
 
 Group:          System Environment/Libraries
@@ -20,6 +20,8 @@ Source0:        https://pypi.python.org/packages/source/c/configobj/configobj-%{
 # git checkout v5.0.5
 # tar -czf configobj-5.0.5-tests.tar.gz tests/ test_configobj.py
 Source1:        configobj-%{version}-tests.tar.gz
+# Generated from source code on 2014-07-31
+Source2:        configobj-bsd-license.txt
 Patch0:         configobj-import-all-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -86,6 +88,8 @@ This package ships Python 3 build of configobj.
 %setup -q -n configobj-%{version}
 %patch0 -p1 -b .all
 
+cp %{SOURCE2} .
+
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -133,16 +137,23 @@ rm -rf $RPM_BUILD_ROOT
 # no docs untile upstream puts them in sdist again:
 #  https://github.com/DiffSK/configobj/issues/63
 %defattr(-,root,root,-)
+%{!?_licensedir:%global license %%doc}
+%license configobj-bsd-license.txt
 %{python_sitelib}/*
 
 %if 0%{?with_python3}
 %files -n python3-configobj
 %defattr(-,root,root,-)
+%{!?_licensedir:%global license %%doc}
+%license configobj-bsd-license.txt
 %{python3_sitelib}/*
 %endif
 
 
 %changelog
+* Thu Jul 31 2014 Tom Callaway <spot@fedoraproject.org> - 5.0.5-2
+- fix license handling
+
 * Thu Jun 26 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 5.0.5-1
 - Updated to 5.0.5 (new upstream "with the blessing of original creator")
 - Introduced python3-configobj subpackage