- optimize, more fixes in miscfix patch to properly detect headers

- -devel R: attr-devel

Changed files:
    acl-miscfix.patch -> 1.6
    acl.spec -> 1.47

diff --git a/acl-miscfix.patch b/acl-miscfix.patch
index 437ef61966071394fedd87d611024dfef04b0811..0ca5c8518d3349082df98cfe13167d508feabd58 100644 (file)
--- a/acl-miscfix.patch
+++ b/acl-miscfix.patch
@@ -1,11 +1,28 @@
-diff -urN aaa/acl-2.2.13/configure.in acl-2.2.13/configure.in
---- aaa/acl-2.2.13/configure.in        2003-06-25 03:51:25.000000000 +0200
-+++ acl-2.2.13/configure.in    2003-08-06 01:24:19.000000000 +0200
-@@ -17,7 +17,6 @@
- AC_PACKAGE_NEED_ATTR_XATTR_H
- AC_PACKAGE_NEED_ATTR_ERROR_H
- AC_PACKAGE_NEED_GETXATTR_LIBATTR
--AC_MANUAL_FORMAT
- 
- AC_FUNC_GCC_VISIBILITY
- 
+--- acl-2.2.13/m4/manual_format.m4.orig        2003-06-25 03:51:27.000000000 +0200
++++ acl-2.2.13/m4/manual_format.m4     2003-08-08 21:14:48.000000000 +0200
+@@ -6,12 +6,5 @@
+ # 
+ AC_DEFUN([AC_MANUAL_FORMAT],
+   [ have_zipped_manpages=false
+-    for d in ${prefix}/share/man ${prefix}/man ; do
+-        if test -f $d/man1/man.1.gz
+-        then
+-            have_zipped_manpages=true
+-            break
+-        fi
+-    done
+     AC_SUBST(have_zipped_manpages)
+   ])
+--- acl-2.2.13/m4/package_utilies.m4.orig      2003-06-25 03:51:27.000000000 +0200
++++ acl-2.2.13/m4/package_utilies.m4   2003-08-08 21:15:02.000000000 +0200
+@@ -17,9 +17,7 @@
+ #  MSGFMT MSGMERGE RPM
+ #
+ AC_DEFUN([AC_PACKAGE_UTILITIES],
+-  [ if test -z "$CC"; then
+-        AC_PROG_CC
+-    fi
++  [ AC_PROG_CC
+     cc="$CC"
+     AC_SUBST(cc)
+     AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])

diff --git a/acl.spec b/acl.spec
index e19165d811343a9f1ca081da3288e98e377cd6e4..6d29619b3568dd44e0b84b7a1d98a5d08ad038c0 100644 (file)
--- a/acl.spec
+++ b/acl.spec
@@ -1,5 +1,5 @@
-Summary:       Command for manipulating access control lists
-Summary(pl):   Komenda do manipulacji listami kontroli dostêpu (ACL)
+Summary:       Command and library for manipulating access control lists
+Summary(pl):   Polecenie i biblioteka do manipulacji listami kontroli dostêpu (ACL)
 Name:          acl
 Version:       2.2.13
 Release:       1
@@ -11,7 +11,8 @@ Patch0:               %{name}-miscfix.patch
 URL:           http://oss.sgi.com/projects/xfs/
 BuildRequires: attr-devel >= 2.4.1
 BuildRequires: autoconf
-Requires:      attr
+BuildRequires: automake
+Requires:      attr >= 2.4.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _bindir         /bin
@@ -19,18 +20,19 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _libexecdir     /usr/lib
 
 %description
-A command (chacl) to manipulate POSIX access control lists under
-Linux.
+A command (chacl) and a library (libacl) to manipulate POSIX access
+control lists under Linux.
 
 %description -l pl
-Komenda (chacl) do manipulowania zgodnymi z POSIX listami kontroli
-dostêpu (ACL) pod Linuksem.
+Polecenie (chacl) i biblioteka (libacl) do manipulowania zgodnymi z
+POSIX listami kontroli dostêpu (ACL) pod Linuksem.
 
 %package devel
 Summary:       Header files for acl library
 Summary(pl):   Pliki nag³ówkowe biblioteki acl
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
+Requires:      attr-devel
 
 %description devel
 Header files to develop software which manipulate access control
@@ -53,13 +55,17 @@ Static acl library.
 Statyczna biblioteka acl.
 
 %prep
-%setup  -q
+%setup -q
 %patch0 -p1
 
 %build
-DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"; export DEBUG
+#DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"; export DEBUG
+rm -f aclocal.m4
+%{__aclocal} -I m4
 %{__autoconf}
-%configure
+%configure \
+       DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
+       OPTIMIZER="%{rpmcflags}"
 
 %{__make}
 
@@ -89,7 +95,7 @@ echo ".so acl_from_text.3"    > $RPM_BUILD_ROOT%{_mandir}/man3/acl_to_short_text.3
 echo ".so acl_from_text.3"     > $RPM_BUILD_ROOT%{_mandir}/man3/acl_to_text.3
 
 rm -f $RPM_BUILD_ROOT%{_libexecdir}/lib*.so
-ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT/lib ; echo libacl.so.*.*.*) \
+ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} ; echo libacl.so.*.*.*) \
        $RPM_BUILD_ROOT%{_libexecdir}/libacl.so
 
 %find_lang %{name}