Wireshark-commits: [Wireshark-commits] master-3.0 363f240: rpm: unconditionally add doc files.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 05 Feb 2019 11:23:38 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=363f240e426b98e0e8771339d561667742dfe798
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

363f240 by Dario Lombardo (lomato@xxxxxxxxx):

    rpm: unconditionally add doc files.
    
    The doc files have been added in v2.9.1rc0-618-g1bb1ffa9ca, and since
    then, rpm builds complain:
    
    RPM build errors:
        File listed twice: /usr/local/bin/dumpcap
        Installed (but unpackaged) file(s) found:
        /usr/local/share/doc/wireshark/androiddump.html
        /usr/local/share/doc/wireshark/capinfos.html
        /usr/local/share/doc/wireshark/captype.html
        [cut]
    
    The "with ninja" condition has been removed as well since it leads to a
    dead end.
    
    Change-Id: I95185ba8cb0d488a7fd222c04ff7ff2a637a817a
    Reviewed-on: https://code.wireshark.org/review/31873
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Dario Lombardo <lomato@xxxxxxxxx>
    (cherry picked from commit ac77bcc61e345b35581d73b58246da0662500d1d)
    Reviewed-on: https://code.wireshark.org/review/31891
    

Actions performed:

    from  2b6ce9d   NSIS: Remove a duplicate definition.
     add  363f240   rpm: unconditionally add doc files.


Summary of changes:
 packaging/rpm/wireshark.spec.in | 8 --------
 1 file changed, 8 deletions(-)