From 1b25cb653277a6d6b7d1b0f29750916ef53a8a7a Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Thu, 11 Oct 2018 12:54:28 +0200
Subject: [PATCH] Various docdir/license fixes

---
 sblim-sfcc-2.2.8-docdir-license.patch | 21 +++++++++++++++++++++
 sblim-sfcc.spec                       | 15 +++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 sblim-sfcc-2.2.8-docdir-license.patch

diff --git a/sblim-sfcc-2.2.8-docdir-license.patch b/sblim-sfcc-2.2.8-docdir-license.patch
new file mode 100644
index 0000000..25d275b
--- /dev/null
+++ b/sblim-sfcc-2.2.8-docdir-license.patch
@@ -0,0 +1,21 @@
+diff -up sblim-sfcc-2.2.8/Makefile.in.orig sblim-sfcc-2.2.8/Makefile.in
+--- sblim-sfcc-2.2.8/Makefile.in.orig	2018-10-11 11:54:07.504330059 +0200
++++ sblim-sfcc-2.2.8/Makefile.in	2018-10-11 11:54:40.301366853 +0200
+@@ -290,7 +290,7 @@ build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/sfcc-$(VERSION)
++docdir = $(datadir)/doc/sblim-sfcc
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+@@ -355,7 +355,7 @@ dist_man_MANS = man/man3/CMCIClient.3 ma
+ 	man/man3/CMPIStatus.3 man/man3/CMPIString.3 \
+ 	man/man3/CMPIValue.3
+ 
+-dist_doc_DATA = README AUTHORS COPYING
++dist_doc_DATA = README AUTHORS
+ EXTRA_DIST = sfcc.spec
+ noinst_HEADERS = \
+ 	backend/cimxml/cimXmlParser.h \
diff --git a/sblim-sfcc.spec b/sblim-sfcc.spec
index 1150d21..8cc8aa8 100644
--- a/sblim-sfcc.spec
+++ b/sblim-sfcc.spec
@@ -7,10 +7,13 @@
 Summary: Small Footprint CIM Client Library
 Name: sblim-sfcc
 Version: 2.2.8
-Release: 10%{?dist}
-License: EPL
+Release: 11%{?dist}
+License: EPL-1.0
 URL: http://www.sblim.org
 Source0: http://downloads.sourceforge.net/project/sblim/%{name}/%{name}-%{version}.tar.bz2
+# Patch0: fixes docdir name and removes install of COPYING with license
+#   which is included through %%license
+Patch0: sblim-sfcc-2.2.8-docdir-license.patch
 BuildRequires: curl-devel chrpath
 BuildRequires: gcc gcc-c++
 
@@ -28,6 +31,7 @@ Small Footprint CIM Client Library Header Files and Link Libraries
 %prep
 
 %setup -q
+%patch0 -p1 -b .docdir-license
 
 %build
 chmod a-x backend/cimxml/*.[ch]
@@ -48,6 +52,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcmpisfcc.so.1.0.0
 
 
 %files
+%license COPYING
 %{_libdir}/*.so.*
 %{_libdir}/libcimcClientXML.so
 %{_mandir}/man3/*.3.gz
@@ -60,6 +65,12 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcmpisfcc.so.1.0.0
 %{_libdir}/libcmpisfcc.so
 
 %changelog
+* Thu Oct 11 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.8-11
+- Use %%license for file which contains the text of the license
+- Change versioned docdir to unversioned and rename the docdir to match
+  the package name
+- Fix license tag
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild