- updated to 2.12

- removed obsolete crc-is-32-bit,stdio.in patches

diff --git a/cpio-crc-is-32-bit.patch b/cpio-crc-is-32-bit.patch
deleted file mode 100644 (file)
index 7b6213c..0000000
--- a/cpio-crc-is-32-bit.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-> The header stores only 4 bytes for crc, so it is quite reasonable.
-
-Then I would suggest something like this, though it could be made more
-efficient.
-
---- orig/configure.ac
-+++ mod/configure.ac
-@@ -51,6 +51,9 @@
- AC_CHECK_TYPE(gid_t, int)
- AC_HEADER_STDC
- AC_HEADER_DIRENT
-+AC_CHECK_TYPES(uint32_t)
-+AC_CHECK_SIZEOF(unsigned long)
-+AC_CHECK_SIZEOF(unsigned int)
- 
- AC_CHECK_FUNCS([fchmod fchown])
- # This is needed for mingw build
---- orig/src/extern.h
-+++ mod/src/extern.h
-@@ -66,7 +66,17 @@
- extern int archive_des;
- extern char *archive_name;
- extern char *rsh_command_option;
-+#ifdef HAVE_UINT32_T
-+extern uint32_t crc;
-+#else
-+# if SIZEOF_UNSIGNED_LONG == 4
- extern unsigned long crc;
-+# elif SIZEOF_UNSIGNED_INT == 4
-+extern unsigned int crc;
-+# else
-+# error Wrong size for crc
-+# endif
-+#endif
- extern int delayed_seek_count;
- #ifdef DEBUG_CPIO
- extern int debug_flag;
-
-
---- orig/src/global.c
-+++ mod/src/global.c
-@@ -139,7 +139,17 @@
- char *rsh_command_option = NULL;
- 
- /* CRC checksum.  */
-+#ifdef HAVE_UINT32_T
-+uint32_t crc;
-+#else
-+# if SIZEOF_UNSIGNED_LONG == 4
- unsigned long crc;
-+# elif SIZEOF_UNSIGNED_INT == 4
-+unsigned int crc;
-+# else
-+# error Wrong size for crc
-+# endif
-+#endif
- 
- /* Input and output buffers.  */
- char *input_buffer, *output_buffer;
-
-
-
-
-

diff --git a/cpio-stdio.in.patch b/cpio-stdio.in.patch
deleted file mode 100644 (file)
index f7016ba..0000000
--- a/cpio-stdio.in.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urNp cpio-2.11-orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h
---- cpio-2.11-orig/gnu/stdio.in.h      2010-03-10 10:27:03.000000000 +0100
-+++ cpio-2.11/gnu/stdio.in.h   2012-06-04 10:23:23.804471185 +0200
-@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not 
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

diff --git a/cpio.spec b/cpio.spec
index 1da8d621bc54796d0d097acfe4fb8763c9ad7252..c3063319a6f9fddf6282a334b01a6223f769d3de 100644 (file)
--- a/cpio.spec
+++ b/cpio.spec
@@ -8,22 +8,20 @@ Summary(ru.UTF-8):    Архивная программа GNU
 Summary(tr.UTF-8):     GNU cpio arşivleme programı
 Summary(uk.UTF-8):     Архівна програма GNU
 Name:          cpio
-Version:       2.11
-Release:       4
+Version:       2.12
+Release:       1
 License:       GPL v3+
 Group:         Applications/Archiving
 Source0:       http://ftp.gnu.org/gnu/cpio/%{name}-%{version}.tar.bz2
-# Source0-md5: 20fc912915c629e809f80b96b2e75d7d
+# Source0-md5: 93eea9f07c0058c097891c73e4955456
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 027552f4053477462a09fadc162a5e65
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-ifdef.patch
-Patch2:                %{name}-crc-is-32-bit.patch
-Patch3:                %{name}-stdio.in.patch
 URL:           http://www.gnu.org/software/cpio/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11.1
-BuildRequires: gettext-tools >= 0.16
+BuildRequires: gettext-tools >= 0.19
 BuildRequires: texinfo
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -106,8 +104,6 @@ cpio копіює файли в або з архіву cpio або tar, який
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__gettextize}
@@ -127,10 +123,12 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.cpio-non-english-man-pages
 
 # in PLD rmt is built from tar.spec
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/rmt
-%{__rm} $RPM_BUILD_ROOT%{_mandir}{,/es,/ja}/man1/mt.1*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/rmt.8*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{es,ja}/man1/mt.1*
 
 %find_lang %{name}