diff --git a/.gitignore b/.gitignore index 18e418c..86619c6 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,5 @@ gnupg-2.0.16.tar.bz2.sig /gnupg-2.2.0.tar.bz2.sig /gnupg-2.2.1.tar.bz2 /gnupg-2.2.1.tar.bz2.sig +/gnupg-2.2.2.tar.bz2 +/gnupg-2.2.2.tar.bz2.sig diff --git a/gnupg-2.1.22-build.patch b/gnupg-2.1.22-build.patch deleted file mode 100644 index 4b9e423..0000000 --- a/gnupg-2.1.22-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up gnupg-2.1.22/configure.ac.build gnupg-2.1.22/configure.ac ---- gnupg-2.1.22/configure.ac.build 2017-07-25 15:31:56.000000000 +0200 -+++ gnupg-2.1.22/configure.ac 2017-08-09 16:24:48.466263808 +0200 -@@ -89,8 +89,8 @@ AC_GNU_SOURCE - # CFLAGS (they are restored at the end of the configure script). This - # is because some configure checks don't work with -Werror, but we'd - # like to use -Werror with our build. --CFLAGS_orig=$CFLAGS --CFLAGS= -+#CFLAGS_orig=$CFLAGS -+#CFLAGS= - - # Some status variables. - have_gpg_error=no -@@ -1682,7 +1682,7 @@ fi - # - # Add user CFLAGS. - # --CFLAGS="$CFLAGS $CFLAGS_orig" -+# CFLAGS="$CFLAGS $CFLAGS_orig" - - # - # Decide what to build -diff -up gnupg-2.1.22/configure.build gnupg-2.1.22/configure ---- gnupg-2.1.22/configure.build 2017-07-28 19:10:42.000000000 +0200 -+++ gnupg-2.1.22/configure 2017-08-09 16:24:48.467263833 +0200 -@@ -5100,8 +5100,8 @@ $as_echo "$ac_cv_safe_to_define___extens - # CFLAGS (they are restored at the end of the configure script). This - # is because some configure checks don't work with -Werror, but we'd - # like to use -Werror with our build. --CFLAGS_orig=$CFLAGS --CFLAGS= -+#CFLAGS_orig=$CFLAGS -+#CFLAGS= - - # Some status variables. - have_gpg_error=no -@@ -15676,7 +15676,7 @@ fi - # - # Add user CFLAGS. - # --CFLAGS="$CFLAGS $CFLAGS_orig" -+# CFLAGS="$CFLAGS $CFLAGS_orig" - - # - # Decide what to build diff --git a/gnupg2.spec b/gnupg2.spec index 08d246b..1c472e5 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -1,7 +1,7 @@ Summary: Utility for secure communication and data storage Name: gnupg2 -Version: 2.2.1 -Release: 1%{?dist} +Version: 2.2.2 +Release: 2%{?dist} License: GPLv3+ Group: Applications/System @@ -18,7 +18,6 @@ Patch3: gnupg-2.1.10-secmem.patch Patch4: gnupg-2.2.0-file-is-digest.patch Patch5: gnupg-2.1.1-ocsp-keyusage.patch Patch6: gnupg-2.1.1-fips-algo.patch -Patch7: gnupg-2.1.22-build.patch # allow 8192 bit RSA keys in keygen UI with large RSA Patch9: gnupg-2.1.21-large-rsa.patch @@ -98,7 +97,6 @@ to the base GnuPG package %patch4 -p1 -b .file-is-digest %patch5 -p1 -b .keyusage %patch6 -p1 -b .fips -%patch7 -p1 -b .build %patch9 -p1 -b .large-rsa # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) @@ -214,6 +212,9 @@ fi %changelog +* Wed Nov 8 2017 Tomáš Mráz - 2.2.2-1 +- upgrade to 2.2.2 + * Tue Oct 3 2017 Tomáš Mráz - 2.2.1-1 - upgrade to 2.2.1 diff --git a/sources b/sources index 3a0f679..22e8d47 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gnupg-2.2.1.tar.bz2) = fcda7ea360d9928bf9e410afe3806ee0692dd533443b0c0e050605a9e2e37ec16f3c60a30b30ab137155327bc1f5d2107f1e792582e3ad245b47bf39a1a61a8f -SHA512 (gnupg-2.2.1.tar.bz2.sig) = d6852b45be1e9b5a0ba92613a739087f4b0ff69b595e5c130e9631e2afd70b1d86c0e91e028f554d444e630f764053e0d5bdca94c4e58cee17d17665f68373f5 +SHA512 (gnupg-2.2.2.tar.bz2) = 3a390b8da21bef0584f39fb8f4b86ec10c78efc64dd1634377b8637042db5f8da462f2881e12fa509b0322d71cba464e0400b91869a4b9fe6189daa4b1386cc1 +SHA512 (gnupg-2.2.2.tar.bz2.sig) = 9e3bdd6f205d1b160acbeb803bb490f2aaa4f818797f321c97d873830661b3165ec101dc7fb65e1e66dd1fb5367fd14a9a2f9830a97fdeaa59bcb8aa7aab42be