Accepting request 179214 from home:jengelh:branches:Base:System

- Update to new upstream release 2.2.52

OBS-URL: https://build.opensuse.org/request/show/179214
OBS-URL: https://build.opensuse.org/package/show/Base:System/acl?expand=0&rev=36

acl-2.2.51.src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225
-size 385378

acl-2.2.52.src.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23
+size 386604

acl-fiximplicit.patch

@@ -1,12 +0,0 @@
-Index: acl-2.2.48/libmisc/quote.c
-===================================================================
---- acl-2.2.48.orig/libmisc/quote.c
-+++ acl-2.2.48/libmisc/quote.c
-@@ -19,6 +19,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <ctype.h>
- #include "misc.h"
- 

acl.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Jun 16 21:40:18 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 2.2.52
+* This release fixes a few build system issues that were found and
+  merges in a tree walking bug fix.
+- Remove acl-fiximplicit.patch (merged upstream),
+  config-guess-sub-update.diff (no longer applies)
+- Remove libacl-devel's dependency on libattr-devel: SO references
+  are automatic anyway.
+- Sync baselibs.conf with in-.spec obsoletes/provides.
+
 -------------------------------------------------------------------
 Tue Mar 19 10:32:32 UTC 2013 - meissner@suse.com
 

acl.spec

@@ -18,22 +18,23 @@
 
 Name:           acl
 %define lname	libacl1
-BuildRequires:  libattr-devel
 Summary:        Commands for Manipulating POSIX Access Control Lists
 License:        GPL-2.0+ and LGPL-2.1+
 Group:          System/Filesystems
-Version:        2.2.51
+Version:        2.2.52
 Release:        0
+Url:            http://download.savannah.gnu.org/releases-noredirect/acl/
+
+#Git-Web:	http://git.savannah.gnu.org/cgit/acl.git/
+#Git-Clone:	git://git.sv.gnu.org/acl
 Source:         http://download.savannah.gnu.org/releases-noredirect/acl/%name-%version.src.tar.gz
 Source1:        http://download.savannah.gnu.org/releases-noredirect/acl/%name-%version.src.tar.gz.sig
 Source2:        baselibs.conf
 # http://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=acl
 Source3:        %name.keyring
 Patch0:         builddefs.in.diff
-Patch1:         acl-fiximplicit.patch
 Patch2:         0001-Use-OS-byteswapping-macros.patch
-Patch3:         config-guess-sub-update.diff
+BuildRequires:  libattr-devel
-Url:            http://download.savannah.gnu.org/releases-noredirect/acl/
 %if 0%{?suse_version} > 1220
 BuildRequires:  gpg-offline
 %endif
@@ -50,7 +51,7 @@ Group:          System/Libraries
 %ifarch ppc64
 Obsoletes:      libacl-64bit
 %endif
-#
+# Added for 12.1
 Provides:       libacl = %version-%release
 Obsoletes:      libacl < %version-%release
 
@@ -64,8 +65,6 @@ Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
 Requires:       %lname = %version
 Requires:       glibc-devel
-# the .so file references libattr.so.x, so require libattr-devel
-Requires:       libattr-devel
 Provides:       acl-devel = %{version}
 Obsoletes:      acl-devel < %{version}
 # bug437293
@@ -84,9 +83,8 @@ to develop applications that require these.
 %endif
 %setup -q -n acl-%version
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
-%patch3
+
 %build
 export OPTIMIZER="$RPM_OPT_FLAGS -fPIC"
 export DEBUG=-DNDEBUG

baselibs.conf

@@ -1,8 +1,8 @@
-# added in 2.2.51; change to just "<" with 2.2.52 or up.
 libacl1
-	obsoletes "libacl-<targettype> <= <version>"
+	obsoletes "libacl-<targettype> < <version>"
 	provides "libacl-<targettype> = <version>"
 libacl-devel
 	requires -libacl-<targettype>
 	requires "libacl1-<targettype> = <version>"
-
+	obsoletes "acl-devel-<targettype> < <version>"
+	provides "acl-devel-<targettype> = <version>"