OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Nov-2004 10:59:28
Branch: HEAD Handle: 2004112409592800
Modified files:
openpkg-src/perl perl.spec
Log:
resolve conflicts with perl-locale (which has the newer versions of
the files)
Summary:
Revision Changes Path
1.95 +5 -1 openpkg-src/perl/perl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl/perl.spec
============================================================================
$ cvs diff -u -r1.94 -r1.95 perl.spec
--- openpkg-src/perl/perl.spec 15 Nov 2004 12:42:33 -0000 1.94
+++ openpkg-src/perl/perl.spec 24 Nov 2004 09:59:28 -0000 1.95
@@ -34,7 +34,7 @@
Group: Language
License: GPL/Artistic
Version: 5.8.5
-Release: 20041115
+Release: 20041124
# list of sources
Source0: ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
@@ -147,6 +147,10 @@
# strip binary files
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+ # resolve file conflicts (with perl-locale)
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/enc2xs \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/piconv
+
# determine installed files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
