- updated to 1.7.0

- updated info patch

diff --git a/scute-info.patch b/scute-info.patch
index c284d4c4b8c3e1c631a6df32631639fa06f09c37..1e90977684acc029b549ed76516c89fc03770698 100644 (file)
--- a/scute-info.patch
+++ b/scute-info.patch
@@ -1,14 +1,14 @@
---- scute-1.1.0/doc/manual/scute.texi.orig     2007-05-03 17:06:24.000000000 +0200
-+++ scute-1.1.0/doc/manual/scute.texi  2007-05-16 07:57:59.514981732 +0200
-@@ -2,9 +2,9 @@
- @setfilename scute.info
- @settitle The Scute Manual
+--- scute-1.7.0/doc/scute.texi.orig    2021-01-10 15:24:18.881528557 +0100
++++ scute-1.7.0/doc/scute.texi 2021-01-10 15:27:21.627205205 +0100
+@@ -31,9 +31,9 @@
+ @end copying
  
--@dircategory GNU Utilities
+ 
+-@dircategory GnuPG
 +@dircategory Miscellaneous:
  @direntry
--* Scute: (scute).          PKCS #11 module for the OpenPGP Card
-+* Scute: (scute).                     PKCS #11 module for the OpenPGP Card
+-* Scute: (scute).          PKCS#11 module for GnuPG supported tokens.
++* Scute: (scute).                     PKCS#11 module for GnuPG supported tokens
  @end direntry
  
- @include version.texi
+ @c A couple of macros with no effect on texinfo

diff --git a/scute.spec b/scute.spec
index c0484f57ba791f5d433e2f62bd608a796214bed2..d6845606bcd658030a09a542b4e5d99613cd45fc 100644 (file)
--- a/scute.spec
+++ b/scute.spec
@@ -1,19 +1,19 @@
 Summary:       PKCS#11 implementation of GnuPG Agent using the GnuPG Smart Card Daemon
 Summary(pl.UTF-8):     Implementacja PKCS#11 Agenta GnuPG przy użyciu GnuPG Smart Card Daemona
 Name:          scute
-Version:       1.6.0
+Version:       1.7.0
 Release:       1
 License:       GPL v2+
 Group:         Applications
 Source0:       ftp://ftp.gnupg.org/gcrypt/scute/%{name}-%{version}.tar.bz2
-# Source0-md5: e7142c94c0bbb12fbd9c04b35c09f52f
+# Source0-md5: eb0fc903761c63494ef74c1000a349de
 Patch0:                %{name}-info.patch
 URL:           http://www.gnupg.org/
 BuildRequires: ImageMagick
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.14
 BuildRequires: libassuan-devel >= 1:2.5.0
-BuildRequires: libgpg-error-devel >= 1.24
+BuildRequires: libgpg-error-devel >= 1.38
 BuildRequires: libtool >= 2:2.2.6
 BuildRequires: texinfo
 # epstopdf
@@ -21,7 +21,7 @@ BuildRequires:        texlive-pdftex
 Requires(post,postun): /sbin/ldconfig
 Requires:      gnupg-smime >= 1.9.6
 Requires:      libassuan >= 1:2.5.0
-Requires:      libgpg-error >= 1.24
+Requires:      libgpg-error >= 1.38
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,12 +48,12 @@ klientów przy użyciu SSL w Mozilli.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure \
-       --with-gpg-agent=/usr/bin/gpg-agent \
-       --with-gpg-connect-agent=/usr/bin/gpg-connect-agent \
-       --with-gpgsm=/usr/bin/gpgsm
+%configure
+
 %{__make}
 
+%{__make} -C doc scute.html
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -75,6 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO doc/website
+%doc AUTHORS ChangeLog NEWS README TODO doc/{scute.html/*.html,*.png}
 %attr(755,root,root) %{_libdir}/scute.so
 %{_infodir}/scute.info*
+%{_mandir}/man7/scute.7*