commit 0b8c07a263c0fef1b113cdfd5b99c41bf1dd6859
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu May 3 20:17:31 2018 +0200
- rel 1; make it default as it is default stable version at upstream
gnupg2-nogit.patch | 18 ++++++++++++++++++
gnupg2.spec | 15 ++++++++++++---
2 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/gnupg2.spec b/gnupg2.spec
index b1a4bd4..8b16a78 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -2,7 +2,7 @@
# Conditional build:
%bcond_without tests # testsuite on build
%bcond_without dirmngr # dirmngr packages build
-%bcond_with default_gpg # install as gpg/gpgv instead of gpg2/gpgv2
+%bcond_without default_gpg # install as gpg/gpgv instead of gpg2/gpgv2
%bcond_with gnutls # GnuTLS instead of NTBTLS
%bcond_with selinux # "SELinux hacks"
#
@@ -11,14 +11,14 @@ Summary(pl.UTF-8): GnuPG - narzędzie do bezpiecznej
komunikacji i bezpiecznego
Name: gnupg2
# 2.1.x is development version unfortunately (see gpg2 --version)
Version: 2.2.7
-Release: 0.1
+Release: 1
License: GPL v3+
Group: Applications/File
Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
# Source0-md5: fc13424af7747a5dd6edb6086ec0cb2f
Source1: gnupg-agent.sh
Patch0: %{name}-info.patch
-
+Patch1: %{name}-nogit.patch
Patch2: %{name}-disable_tests.patch
Patch3: %{name}-pl.po-update.patch
URL: http://www.gnupg.org/
@@ -46,6 +46,8 @@ Requires: gnupg2-common = %{version}-%{release}
Requires: sqlite3 >= 3.7
%if %{with default_gpg}
Obsoletes: gnupg < 2
+Obsoletes: gnupg-plugin-keys_curl < 2
+Obsoletes: gnupg-plugin-keys_hkp < 2
Provides: gnupg = %{version}-%{release}
%endif
Suggests: gnupg-agent
@@ -166,6 +168,7 @@ wywoływany przez gpgsm i nie używany bezpośrednio.
%prep
%setup -q -n gnupg-%{version}
%patch0 -p1
+%patch1 -p1
%{!?with_tests:%patch2 -p1}
#%patch3 -p1
@@ -178,6 +181,12 @@ wywoływany przez gpgsm i nie używany bezpośrednio.
%{__autoconf}
%{__autoheader}
%{__automake}
+if (grep -q ^development_version=yes configure); then
+ echo "configure incorrectly rebuild with messed up development status
and likely version and revision." >&2
+ echo "Consider fixing nogit.patch" >&2
+ exit 1
+fi
+
%configure \
--libexecdir=%{pkglibexecdir} \
%{!?with_dirmngr:--disable-dirmngr} \
diff --git a/gnupg2-nogit.patch b/gnupg2-nogit.patch
new file mode 100644
index 0000000..b17850b
--- /dev/null
+++ b/gnupg2-nogit.patch
@@ -0,0 +1,18 @@
+--- gnupg-2.2.7/autogen.sh.org 2018-05-03 20:55:20.709894555 +0200
++++ gnupg-2.2.7/autogen.sh 2018-05-03 20:57:36.847624695 +0200
+@@ -244,11 +244,10 @@
+ rev=$(git rev-parse --short HEAD | tr -d '\n\r')
+ rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
+ else
+- ingit=no
+- beta=yes
+- tmp="-unknown"
+- rev="0000000"
+- rvd="0"
++ ingit=yes
++ tmp=""
++ rev=$(grep "^BUILD_REVISION=" configure | sed -e
's#^BUILD_REVISION=\"\(.*\)\"#\1#g')
++ rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
+ fi
+
+ echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnupg2.git/commitdiff/0b8c07a263c0fef1b113cdfd5b99c41bf1dd6859
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
