Wireshark-commits: [Wireshark-commits] master 1ffe32b: Fix building of RPMs and get RPM builds work

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 4 Dec 2014 02:24:42 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1ffe32b165daeac3b0e1d00fa7eca0ee967b2129
Submitter: Jeff Morriss (jeff.morriss.ws@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

1ffe32b by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):

    Fix building of RPMs and get RPM builds working with a prefix other than /usr again.
    
    (Change I567269d8e45e6543d9e39dbedc49830adf7edb9f made the desktop files
    install outside of /usr/share/ .)
    
    RPMs now build and work regardless of the prefix but the desktop integration stuff
    only works if the prefix is /usr or (if you're lucky) /usr/local .
    
    Change-Id: If20e0127a044eac1ba099f959a90d068c4bb2ae5
    Reviewed-on: https://code.wireshark.org/review/5600
    Reviewed-by: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    

Actions performed:

    from  44e2716   Tell the loader where to find our libraries if we're being installed someplace other than /usr .
    adds  1ffe32b   Fix building of RPMs and get RPM builds working with a prefix other than /usr again.


Summary of changes:
 packaging/rpm/SPECS/wireshark.spec.in |   48 +++++++++++++++++----------------
 1 file changed, 25 insertions(+), 23 deletions(-)