Pārlūkot izejas kodu

resolve more file conflicts

Ralf S. Engelschall 18 gadi atpakaļ
vecāks
revīzija
3aed71d095
1 mainītis faili ar 10 papildinājumiem un 0 dzēšanām
  1. 10 0
      perl/perl.spec

+ 10 - 0
perl/perl.spec

@@ -168,6 +168,16 @@ AutoReqProv:  no
           $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}