[arch-commits] Commit in wireshark/trunk (PKGBUILD do_not_use_svn_version.patch)

Anatol Pomozov anatolik at archlinux.org
Mon Jan 4 18:14:32 UTC 2016


    Date: Monday, January 4, 2016 @ 19:14:32
  Author: anatolik
Revision: 155464

upgpkg: wireshark 2.0.1-1

Remove undefined SVN revision from version string

Added:
  wireshark/trunk/do_not_use_svn_version.patch
Modified:
  wireshark/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   17 +++++++++++++----
 do_not_use_svn_version.patch |   13 +++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-04 16:33:32 UTC (rev 155463)
+++ PKGBUILD	2016-01-04 18:14:32 UTC (rev 155464)
@@ -4,8 +4,8 @@
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-common' 'wireshark-gtk' 'wireshark-qt')
 pkgbase=wireshark
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.0.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('qt5-base' 'gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
@@ -12,9 +12,18 @@
              'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
 options=(!emptydirs)
 url='http://www.wireshark.org/'
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('f8b226b40e36e4c431b4f70bc3f523b6dd53a501')
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+        do_not_use_svn_version.patch)
+sha1sums=('6703221128305ac33802f0da13d368476ce90688'
+          '489a176a7b90f7ae6f0985510c0c9038de54d9d6')
 
+prepare() {
+  cd ${pkgbase}-${pkgver}
+
+  # Avoid ugly "svn rev unknown from unknown" version string
+  patch -p1 < "$srcdir"/do_not_use_svn_version.patch
+}
+
 build() {
   cd ${pkgbase}-${pkgver}
 

Added: do_not_use_svn_version.patch
===================================================================
--- do_not_use_svn_version.patch	                        (rev 0)
+++ do_not_use_svn_version.patch	2016-01-04 18:14:32 UTC (rev 155464)
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index e2a3cc5..b6ec684 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -711,7 +711,7 @@ am__v_PERL_0 = @echo "  PERL    " $@;
+ am__v_PERL_1 =
+ 
+ version.h: FORCE
+-	$(AM_V_PERL)$(PERL) $(srcdir)/make-version.pl $(srcdir)
++	touch $@
+ 
+ #
+ # Build shell scripts by doing variable substitution.



More information about the arch-commits mailing list