From b72255aa0675309b4f3c08f161bb2323c955fc80 Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Thu, 11 Oct 2018 10:41:14 +0200
Subject: [PATCH] Various docdir/license fixes

---
 sblim-sfcb-1.4.9-docdir-license.patch | 21 +++++++++++++++++++++
 sblim-sfcb.spec                       | 17 +++++++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 sblim-sfcb-1.4.9-docdir-license.patch

diff --git a/sblim-sfcb-1.4.9-docdir-license.patch b/sblim-sfcb-1.4.9-docdir-license.patch
new file mode 100644
index 0000000..1262628
--- /dev/null
+++ b/sblim-sfcb-1.4.9-docdir-license.patch
@@ -0,0 +1,21 @@
+diff -up sblim-sfcb-1.4.9/Makefile.in.orig sblim-sfcb-1.4.9/Makefile.in
+--- sblim-sfcb-1.4.9/Makefile.in.orig	2018-10-11 10:03:54.533549400 +0200
++++ sblim-sfcb-1.4.9/Makefile.in	2018-10-11 10:04:12.199570473 +0200
+@@ -619,7 +619,7 @@ top_srcdir = @top_srcdir@
+ # 
+ # 
+ AUTOMAKE_OPTIONS = no-dist-gzip dist-bzip2
+-sfcbdocdir = $(datadir)/doc/sfcb-$(VERSION)
++sfcbdocdir = $(datadir)/doc/sblim-sfcb
+ sfcbdatadir = $(datadir)/sfcb
+ sfcbconfdir = $(sysconfdir)/sfcb
+ sfcbstatedir = $(localstatedir)/lib/sfcb
+@@ -908,7 +908,7 @@ dist_sfcbdata_DATA = default.reg 10_inte
+ nodist_bin_SCRIPTS = sfcbrepos sfcbstage sfcbunstage sfcbuuid
+ dist_bin_SCRIPTS = wbemcat xmltest
+ init_SCRIPTS = sfcb
+-sfcbdoc_DATA = README AUTHORS COPYING
++sfcbdoc_DATA = README AUTHORS
+ sfcbconf_DATA = sfcb.cfg
+ @PAM_TRUE@dist_pam_DATA = pam/sfcb
+ @DOCS_TRUE@noinst_DATA = doc/html/index.html
diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec
index 7dee969..dfdb7fd 100644
--- a/sblim-sfcb.spec
+++ b/sblim-sfcb.spec
@@ -8,7 +8,7 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://sblim.wiki.sourceforge.net/
 Version: 1.4.9
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: EPL-1.0
 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 Source1: sfcb.service
@@ -36,6 +36,9 @@ Patch7: sblim-sfcb-1.4.9-fix-null-deref.patch
 # Patch8: fix null pointer (DoS) vulnerability via POST request to /cimom
 #   (CVE-2018-6644), patch by Adam Majer, rhbz#1543826
 Patch8: sblim-sfcb-1.4.9-fix-null-content-type-crash.patch
+# Patch9: fixes docdir name and removes install of COPYING with license
+#   which is included through %%license
+Patch9: sblim-sfcb-1.4.9-docdir-license.patch
 Provides: cim-server = 0
 Requires: cim-schema
 Requires: sblim-sfcCommon
@@ -74,6 +77,7 @@ Programming Interface (CMPI).
 %patch6 -p1 -b .fix-ftbfs
 %patch7 -p1 -b .fix-null-deref
 %patch8 -p1 -b .fix-null-content-type-crash
+%patch9 -p1 -b .docdir-license
 
 %build
 %configure --enable-debug --enable-uds --enable-ssl --enable-pam --enable-ipv6 \
@@ -93,13 +97,12 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man1/
 # remove unused static libraries and so files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
 
-echo "%defattr(-,root,root,-)" > _pkg_list
-
+echo "%%license COPYING" > _pkg_list
 find $RPM_BUILD_ROOT/%{_datadir}/sfcb -type f | grep -v $RPM_BUILD_ROOT/%{_datadir}/sfcb/CIM >> _pkg_list
 sed -i s?$RPM_BUILD_ROOT??g _pkg_list > _pkg_list_2
 echo "%config(noreplace) %{_sysconfdir}/sfcb/*" >> _pkg_list
 echo "%config(noreplace) %{_sysconfdir}/pam.d/*" >> _pkg_list
-echo "%doc %{_datadir}/doc/*" >> _pkg_list
+echo "%doc %{_datadir}/doc/sblim-sfcb/[!COPYING]*" >> _pkg_list
 echo "%{_datadir}/man/man1/*" >> _pkg_list
 echo "%{_unitdir}/sblim-sfcb.service" >> _pkg_list
 echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
@@ -133,6 +136,12 @@ fi;
 %files -f _pkg_list
 
 %changelog
+* Thu Oct 11 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.4.9-14
+- 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
+- Remove %%defattr
+
 * Mon Oct 08 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.4.9-13
 - Fix license tag