- updated to 1.10.0

- updated python patch
- removed obsolete format patch

diff --git a/gpgme-format.patch b/gpgme-format.patch
deleted file mode 100644 (file)
index be7030f..0000000
--- a/gpgme-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpgme-1.9.0/lang/qt/src/dn.cpp.orig        2017-03-20 20:10:15.000000000 +0100
-+++ gpgme-1.9.0/lang/qt/src/dn.cpp     2017-03-29 20:58:29.893277570 +0200
-@@ -167,7 +167,7 @@
-     for (unsigned int i = 0; i < numOidMaps; ++i)
-         if (!strcasecmp((char *)p, oidmap[i].oid)) {
-             free(p);
--            gpgrt_asprintf(&p, oidmap[i].name);
-+            gpgrt_asprintf(&p, "%s", oidmap[i].name);
-             break;
-         }
-     array->key = p;

diff --git a/gpgme-python.patch b/gpgme-python.patch
index 7d87ef734682c1ee7a53cac01e112107d4f89599..fb0cb40211a6d73d677f423322dfba51fcd7caf5 100644 (file)
--- a/gpgme-python.patch
+++ b/gpgme-python.patch
@@ -1,21 +1,13 @@
---- gpgme-1.9.0/lang/python/Makefile.am.orig   2017-03-29 20:00:06.723317571 +0200
-+++ gpgme-1.9.0/lang/python/Makefile.am        2017-03-29 20:50:36.333282979 +0200
-@@ -105,7 +105,9 @@
-         PYTHON="$$1" ; shift ; \
-         cd python$${VERSION}-gpg ; \
-         $$PYTHON setup.py install \
--        --prefix $(DESTDIR)$(prefix) \
+--- gpgme-1.10.0/lang/python/Makefile.am.orig  2018-02-15 22:25:24.986373472 +0100
++++ gpgme-1.10.0/lang/python/Makefile.am       2018-02-16 16:21:07.485636511 +0100
+@@ -90,7 +90,9 @@
+         build \
+         --build-base="$$(basename "$${PYTHON}")-gpg" \
+         install \
+-        --prefix "$(DESTDIR)$(prefix)" \
 +        --prefix $(prefix) \
 +        --root $(DESTDIR) \
 +        --optimize=2 \
-         --record files.txt \
          --verbose ; \
-         cat files.txt >> ../install_files.txt ; \
-@@ -113,7 +115,6 @@
-         cd .. ; \
        done
-       $(MKDIR_P) $(DESTDIR)$(pythondir)/gpg
--      mv install_files.txt $(DESTDIR)$(pythondir)/gpg
  
- uninstall-local:
-       xargs <$(DESTDIR)$(pythondir)/gpg/install_files.txt -- rm -rf --

diff --git a/gpgme.spec b/gpgme.spec
index 91e39a17ad093a56694faa3b7515335850061c5b..f99da78a122030c06124abebea646e073d56e51b 100644 (file)
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -19,23 +19,22 @@
 Summary:       Library for accessing GnuPG
 Summary(pl.UTF-8):     Biblioteka dająca dostęp do funkcji GnuPG
 Name:          gpgme
-Version:       1.9.0
+Version:       1.10.0
 Release:       1
 Epoch:         1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2
-# Source0-md5: 1e00bb8ef04d1d05d5a0f19e143854c3
+# Source0-md5: 78b1533c593478982ee2fc548260c563
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-kill-tests.patch
 Patch2:                %{name}-largefile.patch
 Patch3:                %{name}-python.patch
-Patch4:                %{name}-format.patch
 URL:           http://www.gnupg.org/gpgme.html
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.14
-BuildRequires: libassuan-devel >= 1:2.0.2
-BuildRequires: libgpg-error-devel >= 1.17
+BuildRequires: libassuan-devel >= 1:2.4.2
+BuildRequires: libgpg-error-devel >= 1.24
 %{?with_cxx:BuildRequires:     libstdc++-devel >= 6:4.7}
 BuildRequires: libtool >= 2:2.2.6
 %{?with_python2:BuildRequires: python-devel >= 1:2.7}
@@ -55,8 +54,8 @@ BuildConflicts:       gnupg < 1.3.0
 Suggests:      gnupg >= 1.4.0
 Suggests:      gnupg-smime >= 1.9.8
 Suggests:      gnupg2 >= 2.0.4
-Requires:      libassuan >= 1:2.0.2
-Requires:      libgpg-error >= 1.17
+Requires:      libassuan >= 1:2.4.2
+Requires:      libgpg-error >= 1.24
 Obsoletes:     cryptplug
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,8 +70,8 @@ Summary:      Header files for GPGME library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki GPGME
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      libassuan-devel >= 1:2.0.2
-Requires:      libgpg-error-devel >= 1.17
+Requires:      libassuan-devel >= 1:2.4.2
+Requires:      libgpg-error-devel >= 1.24
 
 %description devel
 Header files for GPGME library, needed for compiling programs using
@@ -225,7 +224,6 @@ PyME to interfejs Pythona do biblioteki GPGME.
 %{!?with_tests:%patch1 -p1}
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}