Wireshark-commits: [Wireshark-commits] master 290214a: tarball+RPM: Fetch our version from CMake.
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: Mon, 14 Jan 2019 17:41:50 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=290214adc986cc5f8bbbf87df023c290f32d982d
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

290214a by Gerald Combs (gerald@xxxxxxxxxxxxx):

    tarball+RPM: Fetch our version from CMake.
    
    Move git-export-release.sh to packaging/source. Have the source and RPM
    packaging derive version information from CMake's VERSION variable. This
    brings them in line with the rest of our packaging and avoids having to
    read chicken entrails^W^Wgit output.
    
    Make sure we always generate wireshark.spec.
    
    Bug: 15359
    Change-Id: I188efda489c94449a10a612abebf9c2872c305cb
    Reviewed-on: https://code.wireshark.org/review/31504
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  c3d198c   dfilter: add string() function.
     add  290214a   tarball+RPM: Fetch our version from CMake.


Summary of changes:
 CMakeLists.txt                            | 37 +++-----------
 packaging/rpm/wireshark.spec.in           |  3 +-
 packaging/source/git-export-release.sh.in | 60 ++++++++++++++++++++++
 tools/git-export-release.sh               | 85 -------------------------------
 4 files changed, 69 insertions(+), 116 deletions(-)
 create mode 100755 packaging/source/git-export-release.sh.in
 delete mode 100755 tools/git-export-release.sh