Fix for unversioned docdir change

This commit is contained in:
Vitezslav Crhonek 2013-08-07 18:34:11 +02:00
parent 28d7754d69
commit 5083bf1c4d
2 changed files with 23 additions and 2 deletions

View File

@ -0,0 +1,12 @@
diff -up sblim-cmpi-devel-2.0.3/Makefile.in.orig sblim-cmpi-devel-2.0.3/Makefile.in
--- sblim-cmpi-devel-2.0.3/Makefile.in.orig 2012-07-31 06:11:51.000000000 +0200
+++ sblim-cmpi-devel-2.0.3/Makefile.in 2013-08-07 18:28:09.600712807 +0200
@@ -221,7 +221,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@

View File

@ -1,7 +1,7 @@
Name: sblim-cmpi-devel
Version: 2.0.3
Release: 3%{?dist}
Release: 4%{?dist}
Summary: SBLIM CMPI Provider Development Support
Group: Development/Libraries
@ -9,6 +9,9 @@ License: EPL
URL: http://sblim.wiki.sourceforge.net/
Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
# Patch0: remove version from docdir
Patch0: sblim-cmpi-devel-2.0.3-docdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@ -28,6 +31,7 @@ This packages provides the C++ wrapper library for CMPI development
%prep
%setup -q
%patch0 -p1 -b .docdir
%build
%configure
@ -48,7 +52,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name}-%{version}
%doc AUTHORS COPYING README
%{_includedir}/cmpi
%files -n libcmpiCppImpl0
@ -56,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libcmpiCppImpl.so*
%changelog
* Wed Aug 07 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.0.3-4
- Fix for unversioned docdir change
Resolves: #994075
* Thu Jul 25 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.0.3-3
- Fix libcmpiCppImpl0 Conflicts