From 8d25cbb79d41eb0e048dcf71b4723c107f81b854 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Fri, 9 Aug 2013 12:14:59 +0200 Subject: [PATCH] drop a docdir-related patch to fix a packaging failure (#991997) --- 0002-attr-2.4.47-docdir.patch | 25 ------------------------- attr.spec | 8 ++------ 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 0002-attr-2.4.47-docdir.patch diff --git a/0002-attr-2.4.47-docdir.patch b/0002-attr-2.4.47-docdir.patch deleted file mode 100644 index ec3508c..0000000 --- a/0002-attr-2.4.47-docdir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b4e37109d66d698772e2513c0f79e818b4235897 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -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 - diff --git a/attr.spec b/attr.spec index 609dc40..72f9be1 100644 --- a/attr.spec +++ b/attr.spec @@ -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 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 - 2.4.47-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild