[sblim-cmpi-syslog] Fix for unversioned docdir change

vcrhonek vcrhonek at fedoraproject.org
Thu Dec 12 16:20:27 UTC 2013


commit 40aecaab779c2d4334c435ea88bd5bc4e49ac3d2
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Thu Dec 12 17:20:25 2013 +0100

    Fix for unversioned docdir change

 sblim-cmpi-syslog-0.9.0-docdir.patch |   48 ++++++++++++++++++++++++++++++++++
 sblim-cmpi-syslog.spec               |   12 ++++++--
 2 files changed, 57 insertions(+), 3 deletions(-)
---
diff --git a/sblim-cmpi-syslog-0.9.0-docdir.patch b/sblim-cmpi-syslog-0.9.0-docdir.patch
new file mode 100644
index 0000000..9827061
--- /dev/null
+++ b/sblim-cmpi-syslog-0.9.0-docdir.patch
@@ -0,0 +1,48 @@
+diff -up sblim-cmpi-syslog-0.9.0/Makefile.in.orig sblim-cmpi-syslog-0.9.0/Makefile.in
+--- sblim-cmpi-syslog-0.9.0/Makefile.in.orig	2013-12-12 16:53:26.882151537 +0100
++++ sblim-cmpi-syslog-0.9.0/Makefile.in	2013-12-12 16:53:42.065205722 +0100
+@@ -228,7 +228,7 @@ datadir = @datadir@
+ datarootdir = @datarootdir@
+ 
+ # docdir defines where the documentation goes
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+diff -up sblim-cmpi-syslog-0.9.0/syslog-conf/Makefile.in.orig sblim-cmpi-syslog-0.9.0/syslog-conf/Makefile.in
+--- sblim-cmpi-syslog-0.9.0/syslog-conf/Makefile.in.orig	2013-07-24 18:53:26.000000000 +0200
++++ sblim-cmpi-syslog-0.9.0/syslog-conf/Makefile.in	2013-12-12 17:07:04.382041958 +0100
+@@ -254,7 +254,7 @@ datadir = @datadir@
+ datarootdir = @datarootdir@
+ 
+ # docdir defines where the documentation goes
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+diff -up sblim-cmpi-syslog-0.9.0/syslog-log/Makefile.in.orig sblim-cmpi-syslog-0.9.0/syslog-log/Makefile.in
+--- sblim-cmpi-syslog-0.9.0/syslog-log/Makefile.in.orig	2013-12-12 17:07:12.975069208 +0100
++++ sblim-cmpi-syslog-0.9.0/syslog-log/Makefile.in	2013-12-12 17:07:20.734097726 +0100
+@@ -244,7 +244,7 @@ datadir = @datadir@
+ datarootdir = @datarootdir@
+ 
+ # docdir defines where the documentation goes
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+diff -up sblim-cmpi-syslog-0.9.0/syslog-service/Makefile.in.orig sblim-cmpi-syslog-0.9.0/syslog-service/Makefile.in
+--- sblim-cmpi-syslog-0.9.0/syslog-service/Makefile.in.orig	2013-12-12 17:07:27.615120372 +0100
++++ sblim-cmpi-syslog-0.9.0/syslog-service/Makefile.in	2013-12-12 17:07:36.158150574 +0100
+@@ -231,7 +231,7 @@ datadir = @datadir@
+ datarootdir = @datarootdir@
+ 
+ # docdir defines where the documentation goes
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/sblim-cmpi-syslog.spec b/sblim-cmpi-syslog.spec
index bc23d5e..5f2c9a5 100644
--- a/sblim-cmpi-syslog.spec
+++ b/sblim-cmpi-syslog.spec
@@ -3,7 +3,7 @@
 Summary:        SBLIM syslog instrumentation
 Name:           sblim-cmpi-syslog
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL
 Group:          Applications/System
 URL:            http://sourceforge.net/projects/sblim/
@@ -16,6 +16,7 @@ Source0:        %{name}-%{version}.tar.bz2
 
 # use Pegasus' root/interop instead of root/PG_Interop
 Patch0:         sblim-cmpi-syslog-0.9.0-pegasus-interop.patch
+Patch1:         sblim-cmpi-syslog-0.9.0-docdir.patch
 
 BuildRequires:  sblim-cmpi-devel
 BuildRequires:  sblim-cmpi-base-devel >= 1.5.4
@@ -49,6 +50,7 @@ SBLIM Base Syslog Testcase Files for SBLIM Testsuite
 %prep
 %setup -q
 %patch0 -p1 -b .interop
+%patch1 -p1 -b .docdir
 # removing COPYING, because it's misleading
 rm -f COPYING
 # ./autoconfiscate.sh
@@ -90,8 +92,8 @@ $RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/system/linux/messagelog.sh
 %{_bindir}/syslog-service.sh
 %{provider_dir}/lib[Ss]yslog*.so*
 %{_datadir}/%{name}
-%docdir %{_datadir}/doc/%{name}-%{version}
-%{_datadir}/doc/%{name}-%{version}
+%docdir %{_datadir}/doc/%{name}
+%{_datadir}/doc/%{name}
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %files test
@@ -197,6 +199,10 @@ fi
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Dec 12 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.9.0-3
+- Fix for unversioned docdir change
+  Resolves: #994085
+
 * Mon Aug  5 2013 Tomas Bzatek <tbzatek at redhat.com> - 0.9.0-2
 - Use Pegasus root/interop instead of root/PG_Interop
 


More information about the scm-commits mailing list