Various docdir/license fixes

This commit is contained in:
Vitezslav Crhonek 2018-10-11 12:54:28 +02:00
parent e6e99c3250
commit 1b25cb6532
2 changed files with 34 additions and 2 deletions

View File

@ -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 \

View File

@ -7,10 +7,13 @@
Summary: Small Footprint CIM Client Library Summary: Small Footprint CIM Client Library
Name: sblim-sfcc Name: sblim-sfcc
Version: 2.2.8 Version: 2.2.8
Release: 10%{?dist} Release: 11%{?dist}
License: EPL License: EPL-1.0
URL: http://www.sblim.org URL: http://www.sblim.org
Source0: http://downloads.sourceforge.net/project/sblim/%{name}/%{name}-%{version}.tar.bz2 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: curl-devel chrpath
BuildRequires: gcc gcc-c++ BuildRequires: gcc gcc-c++
@ -28,6 +31,7 @@ Small Footprint CIM Client Library Header Files and Link Libraries
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .docdir-license
%build %build
chmod a-x backend/cimxml/*.[ch] chmod a-x backend/cimxml/*.[ch]
@ -48,6 +52,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcmpisfcc.so.1.0.0
%files %files
%license COPYING
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_libdir}/libcimcClientXML.so %{_libdir}/libcimcClientXML.so
%{_mandir}/man3/*.3.gz %{_mandir}/man3/*.3.gz
@ -60,6 +65,12 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcmpisfcc.so.1.0.0
%{_libdir}/libcmpisfcc.so %{_libdir}/libcmpisfcc.so
%changelog %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 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild