From a8f1e2041868b573ecb01b8755d5da4d1e263ef448f33e810fbf399e0254822c Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 27 Oct 2009 15:23:19 +0000
Subject: [PATCH] Accepting request 23178 from Base:System

Copy from Base:System/acl based on submit request 23178 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/23178
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acl?expand=0&rev=14
---
 acl-fiximplicit.patch | 12 ++++++++++++
 acl.changes           | 11 +++++++++++
 acl.spec              | 30 ++++++++++++++----------------
 3 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 acl-fiximplicit.patch

diff --git a/acl-fiximplicit.patch b/acl-fiximplicit.patch
new file mode 100644
index 0000000..719dcd2
--- /dev/null
+++ b/acl-fiximplicit.patch
@@ -0,0 +1,12 @@
+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"
+ 
diff --git a/acl.changes b/acl.changes
index efbf162..4cfd1df 100644
--- a/acl.changes
+++ b/acl.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Oct 26 14:42:05 CET 2009 - meissner@suse.de
+
+- fixed implicit strchr() usage.
+
+-------------------------------------------------------------------
+Sun Sep 27 21:21:14 CEST 2009 - crrodriguez@suse.de
+
+- do not package static libraries
+- fix -devel package dependencies 
+
 -------------------------------------------------------------------
 Sat Aug  1 04:26:07 CEST 2009 - bphilips@novell.com
 
diff --git a/acl.spec b/acl.spec
index ffa4583..a909605 100644
--- a/acl.spec
+++ b/acl.spec
@@ -24,9 +24,10 @@ Group:          System/Filesystems
 AutoReqProv:    on
 Summary:        Commands for Manipulating POSIX Access Control Lists
 Version:        2.2.48
-Release:        1
+Release:        2
 Source:         %name-%version.src.tar.gz
 Patch0:         builddefs.in.diff
+Patch1:         acl-fiximplicit.patch
 Url:            http://download.savannah.gnu.org/releases-noredirect/acl/
 License:        GPL v2 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -65,7 +66,7 @@ License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Include Files and Libraries mandatory for Development
 AutoReqProv:    on
 Group:          Development/Libraries/C and C++
-Requires:       libacl = %{version} libattr-devel
+Requires:       libacl = %{version} glibc-devel
 Provides:       acl-devel
 Obsoletes:      acl-devel
 # bug437293
@@ -83,8 +84,9 @@ Authors:
     SGI
 
 %prep
-%setup -n acl-%version
+%setup -q -n acl-%version
 %patch0 -p1
+%patch1 -p1
 
 %build
 export OPTIMIZER="$RPM_OPT_FLAGS -fPIC"
@@ -92,17 +94,15 @@ export DEBUG=-DNDEBUG
 aclocal --acdir=m4
 autoconf
 CFLAGS="$RPM_OPT_FLAGS"
-./configure \
+%configure \
 	--prefix=/ \
 	--exec-prefix=/ \
 	--sbindir=/bin \
-	--bindir=%{_bindir} \
-	--mandir=%{_mandir} \
-	--includedir=%{_includedir} \
 	--libdir=/%{_lib} \
-	--datadir=/usr/share \
-	--libexecdir=%{_libdir}
-make
+    --libexecdir=/%{_lib} \
+	--disable-static \
+	--with-pic
+%{__make} %{?jobs:-j%jobs}
 
 %install
 DIST_ROOT="$RPM_BUILD_ROOT"
@@ -113,14 +113,13 @@ export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV DIST_INSTALL_LIB
 /usr/bin/make install DIST_MANIFEST="$DIST_INSTALL"
 /usr/bin/make install-dev DIST_MANIFEST="$DIST_INSTALL_DEV"
 /usr/bin/make install-lib DIST_MANIFEST="$DIST_INSTALL_LIB"
-ln -sf /%{_lib}/$(readlink $RPM_BUILD_ROOT/%{_lib}/libacl.so) \
-	$RPM_BUILD_ROOT/%{_libdir}/libacl.so
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libacl.la
-rm -f $RPM_BUILD_ROOT/%{_lib}/libacl.{a,la,so}
+%{__mkdir_p} %{buildroot}%{_libdir}
+%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so
+%{__rm} -v %{buildroot}/%{_lib}/lib%{name}.{la,so}
 %find_lang %name
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post -n libacl -p /sbin/ldconfig
 
@@ -147,7 +146,6 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libacl.{a,la,so}
 %dir %attr(755,root,root) %{_includedir}/acl
 %attr(644,root,root) %{_includedir}/acl/libacl.h
 %attr(644,root,root) %{_includedir}/sys/acl.h
-%attr(644,root,root) %{_libdir}/libacl.a
 %attr(755,root,root) %{_libdir}/libacl.so
 %doc %attr(644,root,root) %{_mandir}/man3/acl_add_perm.3.gz
 %doc %attr(644,root,root) %{_mandir}/man3/acl_calc_mask.3.gz