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

Changed files:
    attr-miscfix.patch -> 1.6
    attr.spec -> 1.41

diff --git a/attr-miscfix.patch b/attr-miscfix.patch
index a858541be633d0b727b246cb4ddbb13a5279ae3b..0dfa1d78de15587aca3606283427002b5c9bdfe3 100644 (file)
--- a/attr-miscfix.patch
+++ b/attr-miscfix.patch
@@ -1,11 +1,28 @@
-diff -urN aaa/attr-2.4.7/configure.in attr-2.4.7/configure.in
---- aaa/attr-2.4.7/configure.in        2003-06-25 03:51:28.000000000 +0200
-+++ attr-2.4.7/configure.in    2003-08-06 01:17:02.000000000 +0200
-@@ -14,7 +14,6 @@
- 
- AC_PACKAGE_GLOBALS(attr)
- AC_PACKAGE_UTILITIES(attr)
--AC_MANUAL_FORMAT
- 
- AC_C_CONST
- AC_TYPE_MODE_T
+--- attr-2.4.7/m4/manual_format.m4.orig        2003-06-25 03:51:29.000000000 +0200
++++ attr-2.4.7/m4/manual_format.m4     2003-08-08 21:08:12.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)
+   ])
+--- attr-2.4.7/m4/package_utilies.m4.orig      2003-06-25 03:51:29.000000000 +0200
++++ attr-2.4.7/m4/package_utilies.m4   2003-08-08 21:08:29.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/attr.spec b/attr.spec
index 9de42678d541975692f708e5cc64deb03458699e..1b7790eab3118e3b1d3df54dc9ac834855c754d3 100644 (file)
--- a/attr.spec
+++ b/attr.spec
@@ -11,6 +11,7 @@ Source0:      ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}-%{versio
 Patch0:                %{name}-miscfix.patch
 URL:           http://oss.sgi.com/projects/xfs/
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: e2fsprogs-devel
 BuildRequires: xfsprogs-devel >= 2.0.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,13 +54,16 @@ Static libraries for extended attributes.
 Biblioteki statyczne attr.
 
 %prep
-%setup  -q
+%setup -q
 %patch0 -p1
 
 %build
-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}
 
@@ -83,7 +87,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/{attr_getf,attr_listf}.3
 rm -f  $RPM_BUILD_ROOT%{_mandir}/man3/{attr_multif,attr_removef,attr_setf}.3
 rm -rf $RPM_BUILD_ROOT%{_mandir}/man2
 
-ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT/lib ; echo libattr.so.*.*.*) \
+ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} ; echo libattr.so.*.*.*) \
         $RPM_BUILD_ROOT%{_libexecdir}/libattr.so
 
 echo ".so attr_get.3"  > $RPM_BUILD_ROOT%{_mandir}/man3/attr_getf.3