corsepiu pushed to rt (f21). "Install README* directy into %_pkgdocdir (Work-around regression introduced (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Aug 17 11:26:11 UTC 2015


From 43920651b662dfa84efc711e7a86c3fcf33dac78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Tue, 4 Aug 2015 06:27:29 +0200
Subject: Install README* directy into %_pkgdocdir (Work-around regression
 introduced

  by rpm-4.12.90 (RHBZ#1249716).

diff --git a/rt.spec b/rt.spec
index 4c95f6d..c430712 100644
--- a/rt.spec
+++ b/rt.spec
@@ -39,7 +39,7 @@
 
 Name:		rt
 Version:	4.2.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Request tracker
 
 Group:		Applications/Internet
@@ -440,6 +440,11 @@ done
 %install
 make install DESTDIR=${RPM_BUILD_ROOT}
 
+# Work-around to regression in rpm >= 4.12.90:
+# Can't mix %%doc with directly installed docs, anymore.
+# Need to install all files directly.
+install -m 644 README README.fedora ${RPM_BUILD_ROOT}%{_pkgdocdir}
+
 # We don't want CPAN
 rm -f ${RPM_BUILD_ROOT}%{_sbindir}/rt-test-dependencies
 
@@ -528,7 +533,7 @@ fi
 
 
 %files
-%doc README README.fedora
+%{_pkgdocdir}
 %license COPYING
 %{_bindir}/*
 %{_sbindir}/*
@@ -591,6 +596,10 @@ fi
 %endif
 
 %changelog
+* Tue Aug 04 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 4.2.11-2
+- Install README* directy into %_pkgdocdir (Work-around regression introduced
+  by rpm-4.12.90 (RHBZ#1249716).
+
 * Wed Jun 17 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 4.2.11-1
 - Update to 4.2.11.
 - Rebase patches.
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/rt.git/commit/?h=f21&id=43920651b662dfa84efc711e7a86c3fcf33dac78


More information about the perl-devel mailing list