Fix License tag, use %%license, fix FTBFS

2018-08-22 13:34:04 +02:00 · 2018-08-22 13:34:04 +02:00 · 3582a7eafa
commit 3582a7eafa
parent 3b77ce8d31
4 changed files with 125 additions and 13 deletions
--- a/sblim-cmpi-base-1.6.2-docdir.patch
+++ b/sblim-cmpi-base-1.6.2-docdir.patch
@ -1,12 +1,12 @@
-diff -up sblim-cmpi-base-1.6.2/Makefile.in.orig sblim-cmpi-base-1.6.2/Makefile.in
--- sblim-cmpi-base-1.6.2/Makefile.in.orig	2013-08-07 17:24:23.824822914 +0200
-+++ sblim-cmpi-base-1.6.2/Makefile.in	2013-08-07 17:24:50.512965552 +0200
-@@ -370,7 +370,7 @@ datadir = @datadir@
- datarootdir = @datarootdir@
+diff -up sblim-cmpi-base-1.6.4/Makefile.am.orig sblim-cmpi-base-1.6.4/Makefile.am
+--- sblim-cmpi-base-1.6.4/Makefile.am.orig	2014-10-23 16:54:13.000000000 +0200
+++ sblim-cmpi-base-1.6.4/Makefile.am	2018-08-22 10:59:51.497500435 +0200
+@@ -23,7 +23,7 @@ sblimincdir = $(includedir)/sblim
+ EXTRA_DIST=
 
 # docdir defines where the documentation goes
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/$(PACKAGE)
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
+-docdir=$(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir=$(datadir)/doc/$(PACKAGE)
+ 
+ #
+ # Automake instructions for documentation
--- a/sblim-cmpi-base-1.6.4-dont-install-license.patch
+++ b/sblim-cmpi-base-1.6.4-dont-install-license.patch
@ -0,0 +1,12 @@
+diff -up sblim-cmpi-base-1.6.4/Makefile.am.orig sblim-cmpi-base-1.6.4/Makefile.am
+--- sblim-cmpi-base-1.6.4/Makefile.am.orig	2018-08-22 13:21:00.740031951 +0200
+++ sblim-cmpi-base-1.6.4/Makefile.am	2018-08-22 13:21:51.421079223 +0200
+@@ -28,7 +28,7 @@ docdir=$(datadir)/doc/$(PACKAGE)
+ #
+ # Automake instructions for documentation
+ #
+-doc_DATA=README AUTHORS COPYING 
+doc_DATA=README AUTHORS
+ 
+ # ADD EXTRA DOC FILES IF PRESENT
+ doc_DATA+=README.INDICATION README.tog-pegasus DEBUG
--- a/sblim-cmpi-base-1.6.4-list-lib-dependencies.patch
+++ b/sblim-cmpi-base-1.6.4-list-lib-dependencies.patch
@ -0,0 +1,86 @@
+diff -up sblim-cmpi-base-1.6.4/Makefile.am.orig sblim-cmpi-base-1.6.4/Makefile.am
+--- sblim-cmpi-base-1.6.4/Makefile.am.orig	2018-08-22 11:36:52.150165932 +0200
+++ sblim-cmpi-base-1.6.4/Makefile.am	2018-08-22 11:42:27.735431424 +0200
+@@ -61,6 +61,7 @@ libcmpiOSBase_ComputerSystemProvider_la_
+ 		OSBase_ComputerSystem.c
+ libcmpiOSBase_ComputerSystemProvider_la_LIBADD = -lcmpiOSBase_Common
+ libcmpiOSBase_ComputerSystemProvider_la_LDFLAGS = -avoid-version
+libcmpiOSBase_ComputerSystemProvider_la_DEPENDENCIES = libcmpiOSBase_Common.la
+ 
+ # Operating System
+ libcmpiOSBase_OperatingSystemProvider_la_SOURCES = \
+@@ -72,6 +73,8 @@ libcmpiOSBase_OperatingSystemProvider_la
+ 						-ldmiinfo @LINDHELP@
+ # This gcc/ld specific flag is ugly - need to check in configure
+ libcmpiOSBase_OperatingSystemProvider_la_LDFLAGS = -avoid-version
+libcmpiOSBase_OperatingSystemProvider_la_DEPENDENCIES = libcmpiOSBase_Common.la \
+						libdmiinfo.la
+ 
+ # Operating System Statistical Data
+ libcmpiOSBase_OperatingSystemStatisticalDataProvider_la_SOURCES = \
+@@ -80,6 +83,7 @@ libcmpiOSBase_OperatingSystemStatistical
+ 		OSBase_OperatingSystemStatisticalData.c
+ libcmpiOSBase_OperatingSystemStatisticalDataProvider_la_LIBADD =  -lcmpiOSBase_Common
+ libcmpiOSBase_OperatingSystemStatisticalDataProvider_la_LDFLAGS = -avoid-version
+libcmpiOSBase_OperatingSystemStatisticalDataProvider_la_DEPENDENCIES = libcmpiOSBase_Common.la
+ 
+ # Unix Process
+ libcmpiOSBase_UnixProcessProvider_la_SOURCES = \
+@@ -88,6 +92,7 @@ libcmpiOSBase_UnixProcessProvider_la_SOU
+ 		OSBase_UnixProcess.c
+ libcmpiOSBase_UnixProcessProvider_la_LIBADD =  -lcmpiOSBase_Common
+ libcmpiOSBase_UnixProcessProvider_la_LDFLAGS =  -avoid-version
+libcmpiOSBase_UnixProcessProvider_la_DEPENDENCIES = libcmpiOSBase_Common.la
+ 
+ # Processor 
+ libcmpiOSBase_ProcessorProvider_la_SOURCES = \
+@@ -96,6 +101,7 @@ libcmpiOSBase_ProcessorProvider_la_SOURC
+ 		OSBase_Processor.c
+ libcmpiOSBase_ProcessorProvider_la_LIBADD =  -lcmpiOSBase_Common -lpthread
+ libcmpiOSBase_ProcessorProvider_la_LDFLAGS =  -avoid-version
+libcmpiOSBase_ProcessorProvider_la_DEPENDENCIES = libcmpiOSBase_Common.la
+ 
+ # Base Board
+ libcmpiOSBase_BaseBoardProvider_la_SOURCES = \
+@@ -104,26 +110,33 @@ libcmpiOSBase_BaseBoardProvider_la_SOURC
+ 		OSBase_BaseBoard.c
+ libcmpiOSBase_BaseBoardProvider_la_LIBADD = -lcmpiOSBase_Common -ldmiinfo
+ libcmpiOSBase_BaseBoardProvider_la_LDFLAGS = -avoid-version
+libcmpiOSBase_BaseBoardProvider_la_DEPENDENCIES = libcmpiOSBase_Common.la \
+						libdmiinfo.la
+ 
+ libcmpiOSBase_RunningOSProvider_la_SOURCES = cmpiOSBase_RunningOSProvider.c
+ libcmpiOSBase_RunningOSProvider_la_LIBADD = -lcmpiOSBase_Common
+ libcmpiOSBase_RunningOSProvider_la_LDFLAGS = -avoid-version
+libcmpiOSBase_RunningOSProvider_la_DEPENDENCIES = libcmpiOSBase_Common.la
+ 
+ libcmpiOSBase_OSProcessProvider_la_SOURCES = cmpiOSBase_OSProcessProvider.c
+ libcmpiOSBase_OSProcessProvider_la_LIBADD = -lcmpiOSBase_Common
+ libcmpiOSBase_OSProcessProvider_la_LDFLAGS = -avoid-version
+libcmpiOSBase_OSProcessProvider_la_DEPENDENCIES = libcmpiOSBase_Common.la
+ 
+ libcmpiOSBase_OperatingSystemStatisticsProvider_la_SOURCES = cmpiOSBase_OperatingSystemStatisticsProvider.c
+ libcmpiOSBase_OperatingSystemStatisticsProvider_la_LIBADD = -lcmpiOSBase_Common
+ libcmpiOSBase_OperatingSystemStatisticsProvider_la_LDFLAGS = -avoid-version
+libcmpiOSBase_OperatingSystemStatisticsProvider_la_DEPENDENCIES = libcmpiOSBase_Common.la
+ 
+ libcmpiOSBase_CSProcessorProvider_la_SOURCES = cmpiOSBase_CSProcessorProvider.c
+ libcmpiOSBase_CSProcessorProvider_la_LIBADD = -lcmpiOSBase_Common
+ libcmpiOSBase_CSProcessorProvider_la_LDFLAGS = -avoid-version
+libcmpiOSBase_CSProcessorProvider_la_DEPENDENCIES = libcmpiOSBase_Common.la
+ 
+ libcmpiOSBase_CSBaseBoardProvider_la_SOURCES = cmpiOSBase_CSBaseBoardProvider.c
+ libcmpiOSBase_CSBaseBoardProvider_la_LIBADD = -lcmpiOSBase_Common
+ libcmpiOSBase_CSBaseBoardProvider_la_LDFLAGS = -avoid-version
+libcmpiOSBase_CSBaseBoardProvider_la_DEPENDENCIES = libcmpiOSBase_Common.la
+ 
+ 
+ # OSBase support utility libraries
+@@ -139,6 +152,7 @@ libdmiinfo_la_SOURCES=dmiinfo.c dmiinfo.
+ noinst_PROGRAMS = dmitest
+ dmitest_SOURCES = dmitest.c
+ dmitest_LDADD = -ldmiinfo
+dmitest_DEPENDENCIES = libdmiinfo.la
+ 
+ # Installable Header Files
+ sbliminc_HEADERS = OSBase_Common.h cmpiOSBase_Common.h \
--- a/sblim-cmpi-base.spec
+++ b/sblim-cmpi-base.spec
@ -1,10 +1,10 @@
 Name:           sblim-cmpi-base
 Version:        1.6.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        SBLIM CMPI Base Providers

 Group:          Applications/System
-License:        EPL
+License:        EPL-1.0
 URL:            http://sblim.wiki.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 Patch0:         sblim-cmpi-base-1.6.0-missing-fclose.patch
@ -16,6 +16,10 @@ Patch3:         sblim-cmpi-base-1.6.2-docdir.patch
 Patch4:         sblim-cmpi-base-1.6.2-pegasus-interop.patch
 # Patch5: call systemctl in provider registration
 Patch5:         sblim-cmpi-base-1.6.4-prov-reg-sfcb-systemd.patch
+# Patch6: explicitly list library dependencies in Makefile.am, rhbz#1606302
+Patch6:         sblim-cmpi-base-1.6.4-list-lib-dependencies.patch
+# Patch7: don't install COPYING with license, included through %%license
+Patch7:         sblim-cmpi-base-1.6.4-dont-install-license.patch
 Requires:       cim-server sblim-indication_helper
 BuildRequires:  perl-generators
 BuildRequires:  sblim-cmpi-devel sblim-indication_helper-devel
@ -57,6 +61,8 @@ autoreconf --install --force
 %patch3 -p1 -b .docdir
 %patch4 -p1 -b .pegasus-interop
 %patch5 -p1 -b .prov-reg-sfcb-systemd
+%patch6 -p1 -b .list-lib-dependencies
+%patch7 -p1 -b .dont-install-license

 %build
 %configure TESTSUITEDIR=%{_datadir}/sblim-testsuite --disable-static
@ -73,7 +79,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a

 %files
-%doc AUTHORS COPYING DEBUG README README.INDICATION README.TEST README.tog-pegasus
+%license COPYING
+%doc AUTHORS DEBUG README README.INDICATION README.TEST README.tog-pegasus
 %{_datadir}/%{name}
 %{_libdir}/*.so.*
 %{_libdir}/cmpi/*.so*
@ -108,6 +115,13 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
 %postun -p /sbin/ldconfig

 %changelog
+* Wed Aug 22 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.6.4-10
+- Fix docdir patch (patch Makefile.am, not Makefile.in)
+- Use correct short name for Eclipse Public License 1.0
+- Use %%license
+- Add explicit dependencies for libraries in Makefile.am (fixes FTBFS)
+  Resolves: #1606302
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild