diff --git a/cpio-2.9-m4_macro.patch b/cpio-2.9-m4_macro.patch new file mode 100644 index 0000000..5aa451c --- /dev/null +++ b/cpio-2.9-m4_macro.patch @@ -0,0 +1,20 @@ +--- m4/intmax_t.m4 2007-11-29 15:32:01.000000000 +0100 ++++ m4/intmax_t.m4 2006-09-05 20:46:08.000000000 +0200 +@@ -18,7 +18,7 @@ + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) + if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then +- AC_REQUIRE([gl_AC_TYPE_LONG_LONG]) ++ AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) + test $ac_cv_type_long_long = yes \ + && ac_type='long long' \ + || ac_type='long' +@@ -51,7 +51,7 @@ + AC_DEFINE(HAVE_INTMAX_T, 1, + [Define if you have the 'intmax_t' type in or .]) + else +- AC_REQUIRE([gl_AC_TYPE_LONG_LONG]) ++ AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) + test $ac_cv_type_long_long = yes \ + && ac_type='long long' \ + || ac_type='long' diff --git a/cpio.changes b/cpio.changes index 5728ea2..757736f 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 29 15:49:49 CET 2007 - lmichnovic@suse.cz + +- removed unused m4 macro gl_LONG_LONG (*m4_macro.patch) + ------------------------------------------------------------------- Wed Nov 7 15:30:30 CET 2007 - lmichnovic@suse.cz diff --git a/cpio.spec b/cpio.spec index a56d5a9..c643c05 100644 --- a/cpio.spec +++ b/cpio.spec @@ -16,7 +16,7 @@ License: GPL v3 only Group: Productivity/Archiving/Compression AutoReqProv: on Version: 2.9 -Release: 24 +Release: 27 Summary: A Backup and Archiving Utility Source: cpio-2.9.tar.bz2 Patch1: cpio-2.9-no_rmt.patch @@ -31,6 +31,7 @@ Patch9: cpio-2.9-gcc4_3.patch Patch10: cpio-2.9-segfault_in_copyin.patch Patch11: cpio-2.9-avoid_overflow_warning.patch Patch12: cpio-2.9-doc_typo.patch +Patch13: cpio-2.9-m4_macro.patch PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -67,6 +68,7 @@ Authors: %patch10 %patch11 %patch12 +%patch13 chmod 755 . chmod u+w * chmod a+r * @@ -105,7 +107,10 @@ ln -sf ../../bin/cpio $RPM_BUILD_ROOT/usr/bin/cpio %doc %{_mandir}/man1/cpio.1.gz %doc %{_mandir}/man1/mt.1.gz #/usr/share/locale/*/LC_MESSAGES/cpio.mo + %changelog +* Thu Nov 29 2007 - lmichnovic@suse.cz +- removed unused m4 macro gl_LONG_LONG (*m4_macro.patch) * Wed Nov 07 2007 - lmichnovic@suse.cz - upstream fix of typo in documantation (*doc_typo.patch) * Tue Oct 23 2007 - lmichnovic@suse.cz