From 125536ca1c6851ec84615187062cd296afe29bf4 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Fri, 9 Aug 2013 12:50:07 +0200 Subject: [PATCH] drop a docdir-related patch to fix a packaging failure (#993659) --- 0002-acl-2.2.52-docdir.patch | 25 ------------------------- acl.spec | 14 ++++++++------ 2 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 0002-acl-2.2.52-docdir.patch diff --git a/0002-acl-2.2.52-docdir.patch b/0002-acl-2.2.52-docdir.patch deleted file mode 100644 index 21857a9..0000000 --- a/0002-acl-2.2.52-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 -@@ -34,7 +34,7 @@ PKG_LIB_DIR = @libdir@@libdirsuffix@ - PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ - PKG_INC_DIR = @includedir@ - 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/acl.spec b/acl.spec index e1ea9bd..238b631 100644 --- a/acl.spec +++ b/acl.spec @@ -1,7 +1,7 @@ Summary: Access control list utilities Name: acl Version: 2.2.52 -Release: 2%{?dist} +Release: 3%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk BuildRequires: gettext @@ -13,9 +13,6 @@ Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}. # fix a typo in setfacl(1) man page (#675451) Patch1: 0001-acl-2.2.49-bz675451.patch -# use pkg version in $(PKG_DOC_DIR) -Patch2: 0002-acl-2.2.52-docdir.patch - # prepare the test-suite for SELinux and arbitrary umask Patch3: 0003-acl-2.2.52-tests.patch @@ -57,7 +54,6 @@ defined in POSIX 1003.1e draft standard 17. %prep %setup -q %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -92,6 +88,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.la chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.* +# drop already installed documentation, we will use an RPM macro to install it +rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}* + %find_lang %{name} %post -n libacl -p /sbin/ldconfig @@ -99,10 +98,10 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.* %postun -n libacl -p /sbin/ldconfig %files -f %{name}.lang +%doc doc/COPYING* %{_bindir}/chacl %{_bindir}/getfacl %{_bindir}/setfacl -%{_datadir}/doc/acl-%{version} %{_mandir}/man1/chacl.1* %{_mandir}/man1/getfacl.1* %{_mandir}/man1/setfacl.1* @@ -118,6 +117,9 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.* %{_libdir}/libacl.so.* %changelog +* Fri Aug 09 2013 Kamil Dudka 2.2.52-3 +- drop a docdir-related patch to fix a packaging failure (#993659) + * Sat Aug 03 2013 Fedora Release Engineering - 2.2.52-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild