- updated to 1.5.4

diff --git a/gpgme-texinfo.patch b/gpgme-texinfo.patch
deleted file mode 100644 (file)
index f8aae76..0000000
--- a/gpgme-texinfo.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- gpgme-1.4.3/doc/gpl.texi.orig      2012-09-25 16:03:53.000000000 +0200
-+++ gpgme-1.4.3/doc/gpl.texi   2013-08-22 20:25:32.166976482 +0200
-@@ -2,7 +2,8 @@
- @unnumbered GNU General Public License
- @center Version 3, 29 June 2007
- 
--@c This file is intended to be included in another file.
-+@c This file is intended to be included within another document,
-+@c hence no sectioning command or @node.
- 
- @display
- Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
-@@ -11,7 +12,7 @@
- license document, but changing it is not allowed.
- @end display
- 
--@section Preamble
-+@heading Preamble
- 
- The GNU General Public License is a free, copyleft license for
- software and other kinds of works.
-@@ -19,7 +20,7 @@
- The licenses for most software and other practical works are designed
- to take away your freedom to share and change the works.  By contrast,
- the GNU General Public License is intended to guarantee your freedom
--to share and change all versions of a program--to make sure it remains
-+to share and change all versions of a program---to make sure it remains
- free software for all its users.  We, the Free Software Foundation,
- use the GNU General Public License for most of our software; it
- applies also to any other work released this way by its authors.  You
-@@ -76,12 +77,7 @@
- The precise terms and conditions for copying, distribution and
- modification follow.
- 
--@iftex
--@section TERMS AND CONDITIONS
--@end iftex
--@ifinfo
--@center TERMS AND CONDITIONS
--@end ifinfo
-+@heading TERMS AND CONDITIONS
- 
- @enumerate 0
- @item Definitions.
-@@ -227,7 +223,7 @@
- conditions:
- 
- @enumerate a
--@item 
-+@item
- The work must carry prominent notices stating that you modified it,
- and giving a relevant date.
- 
-@@ -658,13 +654,11 @@
- Program, unless a warranty or assumption of liability accompanies a
- copy of the Program in return for a fee.
- 
--@iftex
-+@end enumerate
-+
- @heading END OF TERMS AND CONDITIONS
--@end iftex
--@ifinfo
--@center END OF TERMS AND CONDITIONS
--@end ifinfo
--@section How to Apply These Terms to Your New Programs
-+
-+@heading How to Apply These Terms to Your New Programs
- 
- If you develop a new program, and you want it to be of the greatest
- possible use to the public, the best way to achieve this is to make it
-@@ -675,8 +669,9 @@
- to attach them to the start of each source file to most effectively
- state the exclusion of warranty; and each file should have at least
- the ``copyright'' line and a pointer to where the full notice is found.
-+
- @smallexample
--@var{one line to give the program's name and a brief idea of what it does.}  
-+@var{one line to give the program's name and a brief idea of what it does.}
- Copyright (C) @var{year} @var{name of author}
- 
- This program is free software: you can redistribute it and/or modify
-@@ -699,9 +694,10 @@
- notice like this when it starts in an interactive mode:
- 
- @smallexample
--@var{program} Copyright (C) @var{year} @var{name of author} 
-+@var{program} Copyright (C) @var{year} @var{name of author}
- This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
--This is free software, and you are welcome to redistribute it under certain conditions; type @samp{show c} for details.
-+This is free software, and you are welcome to redistribute it
-+under certain conditions; type @samp{show c} for details.
- @end smallexample
- 
- The hypothetical commands @samp{show w} and @samp{show c} should show
-@@ -720,5 +716,3 @@
- applications with the library.  If this is what you want to do, use
- the GNU Lesser General Public License instead of this License.  But
- first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
--
--@end enumerate

diff --git a/gpgme.spec b/gpgme.spec
index 195bd5e9335e24d3ed6c6f5ebf9c8e63fc188e06..26fe6216405a9ae5971596f1ca24691c13bfd134 100644 (file)
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -11,20 +11,19 @@
 Summary:       Library for accessing GnuPG
 Summary(pl.UTF-8):     Biblioteka dająca dostęp do funkcji GnuPG
 Name:          gpgme
-Version:       1.5.3
+Version:       1.5.4
 Release:       1
 Epoch:         1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2
-# Source0-md5: 082ab2632e7f051f5c09bafd5c4bfacf
+# Source0-md5: feafa03ea064e1d1dc11bc2b88404623
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-kill-tests.patch
 Patch2:                %{name}-1.2.0-largefile.patch
-Patch3:                %{name}-texinfo.patch
 URL:           http://www.gnupg.org/gpgme.html
 BuildRequires: autoconf >= 2.59
-BuildRequires: automake >= 1:1.11
+BuildRequires: automake >= 1:1.14
 BuildRequires: libassuan-devel >= 1:2.0.2
 BuildRequires: libgpg-error-devel >= 1.11
 BuildRequires: libtool >= 2:2.2.6
@@ -77,7 +76,6 @@ Statyczna wersja biblioteki GPGME.
 %patch0 -p1
 %{!?with_tests:%patch1 -p1}
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}