From 762fa74e4fbf0f5c80da1740a513d7975cef3d70 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 28 Aug 2013 11:31:56 +0200 Subject: [PATCH] Fix for unversioned docdir change, Fix bogus date in %%changelog --- sblim-testsuite-1.3.0-docdir.patch | 12 ++++++++++++ sblim-testsuite.spec | 14 +++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 sblim-testsuite-1.3.0-docdir.patch diff --git a/sblim-testsuite-1.3.0-docdir.patch b/sblim-testsuite-1.3.0-docdir.patch new file mode 100644 index 0000000..98c1570 --- /dev/null +++ b/sblim-testsuite-1.3.0-docdir.patch @@ -0,0 +1,12 @@ +diff -up sblim-testsuite-1.3.0/Makefile.in.orig sblim-testsuite-1.3.0/Makefile.in +--- sblim-testsuite-1.3.0/Makefile.in.orig 2013-08-28 11:20:07.814934872 +0200 ++++ sblim-testsuite-1.3.0/Makefile.in 2013-08-28 11:20:28.085980836 +0200 +@@ -143,7 +143,7 @@ datarootdir = @datarootdir@ + # + + # docdir defines where the documentation goes +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) ++docdir = $(datadir)/doc/$(PACKAGE) + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host_alias = @host_alias@ diff --git a/sblim-testsuite.spec b/sblim-testsuite.spec index d80ebc6..5e79bd0 100644 --- a/sblim-testsuite.spec +++ b/sblim-testsuite.spec @@ -2,7 +2,7 @@ Name: sblim-testsuite Version: 1.3.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: SBLIM testsuite Group: Applications/System @@ -15,6 +15,8 @@ Requires: perl >= 5.6 Requires: sblim-wbemcli >= 1.5 Patch0: sblim-testsuite-1.3.0-perl-errors.patch +# Patch1: removes version from docdir +Patch1: sblim-testsuite-1.3.0-docdir.patch %description SBLIM automated testsuite scripts. @@ -22,6 +24,7 @@ SBLIM automated testsuite scripts. %prep %setup -q %patch0 -p1 -b .perl-errors +%patch1 -p1 -b .docdir %build %configure @@ -31,11 +34,16 @@ make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT %files -%doc %{_datadir}/doc/%{name}-%{version} +%doc AUTHORS COPYING README %{_datadir}/%{name} %{_localstatedir}/lib/%{name} %changelog +* Wed Aug 28 2013 Vitezslav Crhonek - 1.3.0-10 +- Fix for unversioned docdir change + Resolves: #994088 +- Fix bogus date in %%changelog + * Sun Aug 04 2013 Fedora Release Engineering - 1.3.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -77,7 +85,7 @@ make install DESTDIR=$RPM_BUILD_ROOT - Update to 1.2.5 Resolves: #468327 -* Thu Oct 28 2005 Viktor Mihajlovski - 1.2.4-1 +* Fri Oct 28 2005 Viktor Mihajlovski - 1.2.4-1 - New release * Thu Jul 28 2005 Viktor Mihajlovski - 1.2.3-0