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 19:18:34
Branch: HEAD Handle: 2008010318183200
Modified files:
openpkg-src/perl perl.spec
Log:
resolve more file conflicts
Summary:
Revision Changes Path
1.124 +10 -0 openpkg-src/perl/perl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl/perl.spec
============================================================================
$ cvs diff -u -r1.123 -r1.124 perl.spec
--- openpkg-src/perl/perl.spec 3 Jan 2008 14:55:56 -0000 1.123
+++ openpkg-src/perl/perl.spec 3 Jan 2008 18:18:32 -0000 1.124
@@ -168,6 +168,16 @@
$RPM_BUILD_ROOT%{l_prefix}/bin/config_data \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/config_data.1
+ # resolve file conflicts (with perl-sys)
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/ptar \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/ptardiff \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptar.1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptardiff.1
+
+ # resolve file conflicts (with perl-crypto)
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/shasum \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/shasum.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]
