diff --git a/cpio-2.11-temporary-allow-build.patch b/cpio-2.11-temporary-allow-build.patch deleted file mode 100644 index 45918db..0000000 --- a/cpio-2.11-temporary-allow-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/gnu/fcntl.in.h b/gnu/fcntl.in.h -index 95298de..a9a8ddd 100644 ---- a/gnu/fcntl.in.h -+++ b/gnu/fcntl.in.h -@@ -216,6 +216,10 @@ _GL_WARN_ON_USE (openat, "openat is not portable - " - # define O_SYNC 0 - #endif - -+#ifndef __O_SYNC -+# define __O_SYNC 04000000 -+#endif -+ - #ifndef O_TTY_INIT - # define O_TTY_INIT 0 - #endif diff --git a/cpio.spec b/cpio.spec index fa6b5dd..a4e6336 100644 --- a/cpio.spec +++ b/cpio.spec @@ -3,7 +3,7 @@ Summary: A GNU archiving program Name: cpio Version: 2.11 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -27,8 +27,6 @@ Patch6: cpio-2.11-stdio.in.patch Patch7: cpio-2.10-longnames-split.patch # cpio does Sum32 checksum, not CRC Patch8: cpio-2.11-crc-fips-nit.patch -# allow to build since the glibc is not fixed yet (see: #872336) -Patch9: cpio-2.11-temporary-allow-build.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -60,7 +58,6 @@ Install cpio if you need a program to manage file archives. %patch6 -p1 -b .gnulib %patch7 -p1 -b .longnames %patch8 -p1 -b .sum32-fips -%patch9 -p1 -b .allow-to-build autoheader @@ -110,6 +107,9 @@ fi %{_infodir}/*.info* %changelog +* Mon Nov 05 2012 Pavel Raiskup - 2.11-15 +- disable the temporary O_SYNC fix (glibc is fixed - #872366) + * Fri Nov 02 2012 Pavel Raiskup - 2.11-14 - fix bad changelog entries - allow to build in Fedora Rawhide (temporarily because of #872336) (the value