[attr] new upstream release - 2.4.47
Kamil Dudka
kdudka at fedoraproject.org
Mon May 20 11:24:55 UTC 2013
commit 37911a2f5162db597c0a34a7ea727f877733ef37
Author: Kamil Dudka <kdudka at redhat.com>
Date: Mon May 20 13:02:44 2013 +0200
new upstream release - 2.4.47
.gitignore | 1 +
...rnings.patch => 0001-attr-2.4.47-warnings.patch | 16 +-
0002-attr-2.4.47-docdir.patch | 25 +++
attr-2.4.32-build.patch | 40 ----
attr-2.4.44-bz660613.patch | 50 -----
attr-2.4.44-bz660619.patch | 61 ------
attr-2.4.44-bz669095.patch | 35 ----
attr-2.4.44-bz957989.patch | 198 --------------------
attr-2.4.44-tests.patch | 22 ---
attr-2.4.46.src.tar.gz.sig | Bin 72 -> 0 bytes
attr-2.4.47.src.tar.gz.sig | Bin 0 -> 543 bytes
attr.spec | 41 +---
sources | 2 +-
13 files changed, 46 insertions(+), 445 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0fbc9c7..6a86c65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
attr-2.4.44.src.tar.gz
/attr-2.4.45.src.tar.gz
/attr-2.4.46.src.tar.gz
+/attr-2.4.47.src.tar.gz
diff --git a/attr-2.4.44-warnings.patch b/0001-attr-2.4.47-warnings.patch
similarity index 86%
rename from attr-2.4.44-warnings.patch
rename to 0001-attr-2.4.47-warnings.patch
index ab11a02..2e8d0e7 100644
--- a/attr-2.4.44-warnings.patch
+++ b/0001-attr-2.4.47-warnings.patch
@@ -1,7 +1,7 @@
-From b01c9a5805632167acc4c669852093555bfc10ae Mon Sep 17 00:00:00 2001
+From 356db83c304052b89a431670ec35ce037a24bcb6 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka at redhat.com>
-Date: Tue, 19 Apr 2011 08:48:53 +0200
-Subject: [PATCH] fix compile-time warnings in attr-2.4.45
+Date: Mon, 20 May 2013 12:56:50 +0200
+Subject: [PATCH] attr-2.4.44-warnings.patch rebased for 2.4.47
---
attr/attr.c | 10 ++++++++--
@@ -41,10 +41,10 @@ index e4a8272..2b1ba6a 100644
printf("\n");
}
diff --git a/getfattr/getfattr.c b/getfattr/getfattr.c
-index 9c3de32..7ced700 100644
+index 692d2d8..88b59c6 100644
--- a/getfattr/getfattr.c
+++ b/getfattr/getfattr.c
-@@ -274,8 +274,10 @@ int print_attribute(const char *path, const char *name, int *header_printed)
+@@ -275,8 +275,10 @@ int print_attribute(const char *path, const char *name, int *header_printed)
*header_printed = 1;
}
@@ -70,10 +70,10 @@ index bf8f9eb..8835af4 100644
#include <string.h>
#include "misc.h"
diff --git a/libmisc/walk_tree.c b/libmisc/walk_tree.c
-index 30ff92a..b87c35c 100644
+index 2be9d47..e7e654d 100644
--- a/libmisc/walk_tree.c
+++ b/libmisc/walk_tree.c
-@@ -100,8 +100,8 @@ static int walk_tree_rec(const char *path, int walk_flags,
+@@ -101,8 +101,8 @@ static int walk_tree_rec(const char *path, int walk_flags,
* a dir not from a symlink
* a link and follow_symlinks
*/
@@ -85,5 +85,5 @@ index 30ff92a..b87c35c 100644
struct dirent *entry;
--
-1.7.4.2
+1.7.1
diff --git a/0002-attr-2.4.47-docdir.patch b/0002-attr-2.4.47-docdir.patch
new file mode 100644
index 0000000..ec3508c
--- /dev/null
+++ b/0002-attr-2.4.47-docdir.patch
@@ -0,0 +1,25 @@
+From b4e37109d66d698772e2513c0f79e818b4235897 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka at 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 at -@pkg_version@
+ PKG_LOCALE_DIR = @datadir@/locale
+
+ CC = @cc@
+--
+1.7.1
+
diff --git a/attr-2.4.47.src.tar.gz.sig b/attr-2.4.47.src.tar.gz.sig
new file mode 100644
index 0000000..abd1c2c
Binary files /dev/null and b/attr-2.4.47.src.tar.gz.sig differ
diff --git a/attr.spec b/attr.spec
index cfe3dea..b037d09 100644
--- a/attr.spec
+++ b/attr.spec
@@ -1,30 +1,15 @@
Summary: Utilities for managing filesystem extended attributes
Name: attr
-Version: 2.4.46
-Release: 10%{?dist}
+Version: 2.4.47
+Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: http://download.savannah.gnu.org/releases-noredirect/attr/attr-%{version}.src.tar.gz
-# make it ready for rpmbuild
-Patch1: attr-2.4.32-build.patch
-
-# prepare the test-suite for SELinux
-Patch3: attr-2.4.44-tests.patch
-
# silence compile-time warnings
-Patch4: attr-2.4.44-warnings.patch
-
-# getfattr: return non-zero exit code on failure (#660619)
-Patch7: attr-2.4.44-bz660619.patch
+Patch1: 0001-attr-2.4.47-warnings.patch
-# walk_tree: do not follow symlink to directory with -h (#660613)
-Patch8: attr-2.4.44-bz660613.patch
-
-# fix typos in attr(1) man page (#669095)
-Patch9: attr-2.4.44-bz669095.patch
-
-# use <sys/syscalls.h> to fix build on aarch64 (#957989)
-Patch10: attr-2.4.44-bz957989.patch
+# use pkg version in $(PKG_DOC_DIR)
+Patch2: 0002-attr-2.4.47-docdir.patch
License: GPLv2+
URL: http://acl.bestbits.at/
@@ -73,16 +58,10 @@ you'll also want to install attr.
%prep
%setup -q
%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%patch2 -p1
%build
-# attr <= 2.4.46 abuses libexecdir (fixed upstream in 2971df45)
-%configure --libexecdir=%{_libdir}
+%configure
# uncomment to turn off optimizations
# sed -i 's/-O2/-O0/' libtool include/builddefs
@@ -109,8 +88,6 @@ make install-dev DESTDIR=$RPM_BUILD_ROOT
make install-lib DESTDIR=$RPM_BUILD_ROOT
# get rid of libattr.a and libattr.la
-rm -f $RPM_BUILD_ROOT/%{_lib}/libattr.a
-rm -f $RPM_BUILD_ROOT/%{_lib}/libattr.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libattr.a
rm -f $RPM_BUILD_ROOT%{_libdir}/libattr.la
@@ -142,6 +119,10 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libattr.so.*.*.*
%{_libdir}/libattr.so.*
%changelog
+* Mon May 20 2013 Kamil Dudka <kdudka at redhat.com> 2.4.47-1
+- new upstream release, drop applied patches
+- drop workarounds that are no longer necessary
+
* Fri May 03 2013 Kamil Dudka <kdudka at redhat.com> 2.4.46-10
- use <sys/syscalls.h> to fix build on aarch64 (#957989)
diff --git a/sources b/sources
index 4d9d0e8..227a558 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db557c17fdfa4f785333ecda08654010 attr-2.4.46.src.tar.gz
+84f58dec00b60f2dc8fd1c9709291cc7 attr-2.4.47.src.tar.gz
More information about the scm-commits
mailing list