OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Jan-2008 15:55:57
Branch: HEAD Handle: 2008010314555600
Modified files:
openpkg-src/perl perl.spec
Log:
resolve file conflicts (with perl-module)
Summary:
Revision Changes Path
1.123 +6 -1 openpkg-src/perl/perl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl/perl.spec
============================================================================
$ cvs diff -u -r1.122 -r1.123 perl.spec
--- openpkg-src/perl/perl.spec 1 Jan 2008 15:02:27 -0000 1.122
+++ openpkg-src/perl/perl.spec 3 Jan 2008 14:55:56 -0000 1.123
@@ -32,7 +32,7 @@
Group: Perl
License: GPL/Artistic
Version: 5.10.0
-Release: 20080101
+Release: 20080103
# list of sources
Source0: ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
@@ -163,6 +163,11 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/enc2xs \
$RPM_BUILD_ROOT%{l_prefix}/bin/piconv
+ # resolve file conflicts (with perl-module)
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/corelist \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/config_data \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/config_data.1
+
# determine installed files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
