Fix for unversioned docdir change
This commit is contained in:
parent
b7ca5e7136
commit
b6091f1fa6
12
sblim-gather-2.2.8-docdir.patch
Normal file
12
sblim-gather-2.2.8-docdir.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up sblim-gather-2.2.8/Makefile.in.orig sblim-gather-2.2.8/Makefile.in
|
||||
--- sblim-gather-2.2.8/Makefile.in.orig 2013-08-28 12:53:38.468175893 +0200
|
||||
+++ sblim-gather-2.2.8/Makefile.in 2013-08-28 12:53:48.018209290 +0200
|
||||
@@ -685,7 +685,7 @@ datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
|
||||
# docdir defines where the documentation goes
|
||||
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
|
||||
+docdir = $(datadir)/doc/$(PACKAGE)
|
||||
dvidir = @dvidir@
|
||||
enable_man = @enable_man@
|
||||
exec_prefix = @exec_prefix@
|
@ -4,7 +4,7 @@
|
||||
|
||||
Name: sblim-gather
|
||||
Version: 2.2.8
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: SBLIM Gatherer
|
||||
|
||||
Group: Applications/System
|
||||
@ -29,6 +29,9 @@ BuildRequires: cmake
|
||||
Patch1: sblim-gather-2.2.7-missing_providers.patch
|
||||
Patch2: sblim-gather-2.2.7-typos.patch
|
||||
|
||||
# Patch3: removes version from docdir
|
||||
Patch3: sblim-gather-2.2.8-docdir.patch
|
||||
|
||||
Requires: tog-pegasus >= %{tog_pegasus_version}
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
@ -84,6 +87,7 @@ Testsuite
|
||||
tar xfvz %{SOURCE4}
|
||||
%patch1 -p1 -b .missing_providers
|
||||
%patch2 -p1 -b .typos
|
||||
%patch3 -p1 -b .docdir
|
||||
|
||||
%build
|
||||
%ifarch s390 s390x ppc ppc64
|
||||
@ -144,10 +148,10 @@ install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/reposd.service
|
||||
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||
%{_unitdir}/gatherer.service
|
||||
%{_unitdir}/reposd.service
|
||||
%docdir %{_datadir}/doc/%{name}-%{version}
|
||||
%docdir %{_datadir}/doc/%{name}
|
||||
%{_bindir}/*
|
||||
%{_sbindir}/*
|
||||
%{_datadir}/doc/%{name}-%{version}
|
||||
%{_datadir}/doc/%{name}
|
||||
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
|
||||
%config(noreplace) %{_sysconfdir}/tmpfiles.d/sblim-gather.conf
|
||||
%endif
|
||||
@ -236,6 +240,10 @@ fi
|
||||
%postun provider -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Wed Aug 28 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.8-4
|
||||
- Fix for unversioned docdir change
|
||||
Resolves: #994086
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.8-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user