Browse Source

remove file conflict

Ralf S. Engelschall 13 years ago
parent
commit
0ad3a40756
1 changed files with 2 additions and 1 deletions
  1. 2 1
      cpio/cpio.spec

+ 2 - 1
cpio/cpio.spec

@@ -32,7 +32,7 @@ Class:        BASE
 Group:        Archiver
 License:      GPL
 Version:      2.11
-Release:      20100311
+Release:      20130105
 
 #   list of sources
 Source0:      ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz
@@ -73,6 +73,7 @@ PreReq:       OpenPKG, openpkg >= 20100101
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/locale
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/charset.alias
     mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/mt.1 \
        $RPM_BUILD_ROOT%{l_prefix}/man/man1/rmt.1
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true