drop a docdir-related patch to fix a packaging failure (#991997)

This commit is contained in:
Kamil Dudka 2013-08-09 12:14:59 +02:00
commit 8d25cbb79d
2 changed files with 2 additions and 31 deletions

View file

@ -1,25 +0,0 @@
From b4e37109d66d698772e2513c0f79e818b4235897 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 20 May 2013 13:17:14 +0200
Subject: [PATCH] builddefs.in: use pkg version in $(PKG_DOC_DIR)
---
include/builddefs.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/builddefs.in b/include/builddefs.in
index d9931db..47bfdd6 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -46,7 +46,7 @@ PKG_LIB_DIR = @libdir@@libdirsuffix@
PKG_DEVLIB_DIR = @libdir@@libdirsuffix@
PKG_INC_DIR = @includedir@/attr
PKG_MAN_DIR = @mandir@
-PKG_DOC_DIR = @datadir@/doc/@pkg_name@
+PKG_DOC_DIR = @datadir@/doc/@pkg_name@-@pkg_version@
PKG_LOCALE_DIR = @datadir@/locale
CC = @cc@
--
1.7.1

View file

@ -8,9 +8,6 @@ Source: http://download.savannah.gnu.org/releases-noredirect/attr/attr-%{version
# silence compile-time warnings
Patch1: 0001-attr-2.4.47-warnings.patch
# use pkg version in $(PKG_DOC_DIR)
Patch2: 0002-attr-2.4.47-docdir.patch
License: GPLv2+
URL: http://acl.bestbits.at/
Group: System Environment/Base
@ -58,7 +55,6 @@ you'll also want to install attr.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%build
%configure
@ -103,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
%postun -n libattr -p /sbin/ldconfig
%files -f %{name}.lang
%doc doc
%doc doc/{CHANGES,COPYING*}
%{_bindir}/attr
%{_bindir}/getfattr
%{_bindir}/setfattr
@ -123,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
%changelog
* Fri Aug 09 2013 Kamil Dudka <kdudka@redhat.com> 2.4.47-3
- fix packaging failure due to change of the semantics of %%doc (#991997)
- drop a docdir-related patch to fix a packaging failure (#991997)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.47-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild