- spec file cleanup according to rpmlint

- fix autotools stuff
This commit is contained in:
kzak 2008-05-20 22:40:45 +00:00
parent 80e5a6c161
commit 1c853575b4
2 changed files with 88 additions and 0 deletions

View File

@ -0,0 +1,84 @@
diff -up am-utils-6.1.5/bootstrap.kzak am-utils-6.1.5/bootstrap
--- am-utils-6.1.5/bootstrap.kzak 2003-10-11 08:02:04.000000000 +0200
+++ am-utils-6.1.5/bootstrap 2008-05-21 00:23:08.000000000 +0200
@@ -29,7 +29,9 @@ rm -fr autom4te.cache autom4te-*.cache
echo "AMU: prepare acinclude.m4..."
test -f acinclude.m4 && mv -f acinclude.m4 acinclude.m4.old
(cd m4/macros
- for i in HEADER *.m4; do
+ cat HEADER
+ cat libtool.m4
+ for i in $(ls *.m4 | sed 's/libtool.m4//'); do
cat $i
echo
echo
@@ -37,6 +39,18 @@ test -f acinclude.m4 && mv -f acinclude.
cat TRAILER
) > acinclude.m4
+rm -f aclocal.m4 aclocal.m4.old
+
+# generate libtoolize stuff
+echo "AMU: libtoolize..."
+libtoolize --version 2>&1 | head -1
+if libtoolize --force ; then
+ :
+else
+ echo "libtoolize command failed. fix errors and rerun $0."
+ exit 2
+fi
+
# generate aclocal.m4 file
echo "AMU: aclocal..."
test -f aclocal.m4 && mv -f aclocal.m4 aclocal.m4.old
@@ -49,6 +63,8 @@ else
exit 2
fi
+
+
# produce new configure.in (temp) script
echo "AMU: autoconf..."
# show version
diff -up am-utils-6.1.5/m4/macros/save_state.m4.kzak am-utils-6.1.5/m4/macros/save_state.m4
--- am-utils-6.1.5/m4/macros/save_state.m4.kzak 2002-01-07 08:36:24.000000000 +0100
+++ am-utils-6.1.5/m4/macros/save_state.m4 2008-05-20 23:59:09.000000000 +0200
@@ -1,12 +1,12 @@
dnl ######################################################################
dnl AC_SAVE_STATE: save confdefs.h onto dbgcf.h and write $ac_cv_* cache
dnl variables that are known so far.
-define(AMU_SAVE_STATE,
-AC_MSG_NOTICE(*** SAVING CONFIGURE STATE ***)
+define([AMU_SAVE_STATE],
+[AC_MSG_NOTICE(*** SAVING CONFIGURE STATE ***)
if test -f confdefs.h
then
cp confdefs.h dbgcf.h
fi
-[AC_CACHE_SAVE]
+AC_CACHE_SAVE]
)
dnl ======================================================================
diff -up am-utils-6.1.5/m4/macros/cache_check_dynamic.m4.kzak am-utils-6.1.5/m4/macros/cache_check_dynamic.m4
--- am-utils-6.1.5/m4/macros/cache_check_dynamic.m4.kzak 2008-05-21 00:30:15.000000000 +0200
+++ am-utils-6.1.5/m4/macros/cache_check_dynamic.m4 2008-05-21 00:29:38.000000000 +0200
@@ -8,7 +8,7 @@ dnl after COMMANDS are run.
dnl
dnl ======================================================================
dnl AMU_CACHE_CHECK_DYNAMIC(MESSAGE, CACHE-ID, COMMANDS)
-define(AMU_CACHE_CHECK_DYNAMIC,
+define([AMU_CACHE_CHECK_DYNAMIC],
[
ac_tmp=`echo $2`
if eval "test \"`echo '$''{'$ac_tmp'+set}'`\" = set"; then
diff -up am-utils-6.1.5/m4/macros/mount_headers.m4.kzak am-utils-6.1.5/m4/macros/mount_headers.m4
--- am-utils-6.1.5/m4/macros/mount_headers.m4.kzak 2008-05-21 00:30:08.000000000 +0200
+++ am-utils-6.1.5/m4/macros/mount_headers.m4 2008-05-21 00:29:53.000000000 +0200
@@ -1,6 +1,6 @@
dnl ######################################################################
dnl an M4 macro to include a list of common headers being used everywhere
-define(AMU_MOUNT_HEADERS,
+define([AMU_MOUNT_HEADERS],
[
#include "${srcdir}/include/mount_headers1.h"
#include AMU_NFS_PROTOCOL_HEADER

View File

@ -42,6 +42,8 @@ Patch1: am-utils-6.1.5-rmtab-temp.patch
Patch2: am-utils-6.1.5-nfs-version.patch
# UTS_RELEASE macro has been removed from the latest kernel
Patch3: am-utils-6.1.5-UTS_RELEASE.patch
# Build system bugfixes
Patch4: am-utils-6.1.5-buildsys.patch
# We need to filter out some perl requirements for now.
%define _use_internal_dependency_generator 0
@ -64,6 +66,7 @@ mounting and unmounting filesystems.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
find_requires=%{old_find_requires}
echo "$find_requires | grep -v lostaltmail.conf" > find-requires
@ -170,6 +173,7 @@ fi
%changelog
* Tue May 20 2008 Karel Zak <kzak@redhat.com> 5:6.1.5-9
- spec file cleanup according to rpmlint
- fix autotools stuff
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5:6.1.5-8
- Autorebuild for GCC 4.3