From 422db444a86588c4ded0d51d1f0ce1a117e6d702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 18 Oct 2005 18:18:13 +0000 Subject: [PATCH] - 0.7.2, docs patch applied upstream. - Fix info dir entry. - Switch to GTK2 in -gtk. - Fine tune dependencies. - Build with dependency tracking disabled. - Clean up obsolete pre-FC2 support. --- .cvsignore | 3 +- pinentry-0.7.0-docs.patch | 93 -------------------------------------- pinentry-0.7.1.tar.gz.sig | Bin 65 -> 0 bytes pinentry-info.patch | 22 +++++++++ pinentry.spec | 55 ++++++++++++---------- sources | 3 +- 6 files changed, 57 insertions(+), 119 deletions(-) delete mode 100644 pinentry-0.7.0-docs.patch delete mode 100644 pinentry-0.7.1.tar.gz.sig create mode 100644 pinentry-info.patch diff --git a/.cvsignore b/.cvsignore index c17696d..eeee0b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -pinentry-0.7.1.tar.gz +pinentry-0.7.2.tar.gz +pinentry-0.7.2.tar.gz.sig diff --git a/pinentry-0.7.0-docs.patch b/pinentry-0.7.0-docs.patch deleted file mode 100644 index 2fcf88b..0000000 --- a/pinentry-0.7.0-docs.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- doc/pinentry.texi~ 2003-12-22 19:05:32.000000000 +0200 -+++ doc/pinentry.texi 2003-12-26 17:19:37.000000000 +0200 -@@ -67,7 +67,7 @@ - This file documents the use and the internals of the @pinentry{}. - - This is edition @value{EDITION}, last updated @value{UPDATED}, of --@cite{The `PINEnrty' Manual}, for version @value{VERSION}. -+@cite{The `PINEntry' Manual}, for version @value{VERSION}. - @sp 1 - Published by g10 Code GmbH@* - Hüttenstr. 61@* -@@ -111,7 +111,7 @@ - @pinentry{} comes in 3 flavors to fit the look and feel of the used - GUI toolkit: A @sc{GTK+} based one named @code{pinentry-gtk}, a - @sc{Qt} based one named @code{pinentry-qt} and a non-graphical one based --on curser and named @code{pinentry-curses}. Not all of them might be -+on curses and named @code{pinentry-curses}. Not all of them might be - available on your installation. If curses is supported on your system, - the GUI based flavors fall back to curses when the @code{DISPLAY} - variable is not set. -@@ -128,7 +128,7 @@ - - * Copying:: GNU General Public License says - how you can copy and share PIN-Entry -- as well as this manulal. -+ as well as this manual. - - Indices - -@@ -141,7 +141,7 @@ - - @c man begin DESCRIPTION - --You may run @pinentry{} directly from the commandline and pass the -+You may run @pinentry{} directly from the command line and pass the - commands according to the Assuan protocol via stdin/stdout. - - -@@ -158,7 +158,7 @@ - - @item --help - @opindex help --Print a usage message summarizing the most usefule command-line options. -+Print a usage message summarizing the most useful command-line options. - - @item --debug - @itemx -d -@@ -199,7 +199,7 @@ - @opindex lc-type - @opindex lc-messa - These options are used to pass localization information to --@pinentry{}. They are required because @pinentry{} is usally called -+@pinentry{}. They are required because @pinentry{} is usually called - by some background process which does not have any information on the - locale and terminal to use. Assuan protocol options are an - alternative way to pass these information. -@@ -229,7 +229,7 @@ - - Note that all strings are expected to be encoded as UTF-8; @pinentry{} - takes care of converting it to the locally used codeset. To include --lienfeeds or other special characters, you may percent-escape them -+linefeeds or other special characters, you may percent-escape them - (i.e. a line feed is encoded as @code{%0A}, the percent sign itself - is encoded as @code{%25}). - -@@ -252,15 +252,15 @@ - @end example - - @item Set the button texts --There are two text with can be set to overide the English defaults: -+There are two text with can be set to override the English defaults: - --To set the text for the button signalling confirmation (in UTF-8). -+To set the text for the button signaling confirmation (in UTF-8). - @example - C: SETOK Yes - S: OK - @end example - --To set the text for the button signalling cancellation or disagreement -+To set the text for the button signaling cancellation or disagreement - (in UTF-8). - @example - C: SETCANCEL No -@@ -285,7 +285,7 @@ - S: OK - @end example - Note that the passphrase is transmitted in clear using standard data --responses. Expect it to be in utf-8. -+responses. Expect it to be in UTF-8. - - @item Ask for confirmation - To ask for a confirmation (yes or no), you can use this command: diff --git a/pinentry-0.7.1.tar.gz.sig b/pinentry-0.7.1.tar.gz.sig deleted file mode 100644 index 4143669c87fa6de496ad39de540b4286ed7330d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWf-KLZ5-K!(p2Xt%40S5%G75dxe30G~tQwKVWV*`X+4`7WecK#v7M@E8D} XXs!NGCew~Ifyy9y=vG&b{_5?hoqrzW diff --git a/pinentry-info.patch b/pinentry-info.patch new file mode 100644 index 0000000..ab73dbe --- /dev/null +++ b/pinentry-info.patch @@ -0,0 +1,22 @@ +--- pinentry-0.7.2/doc/pinentry.texi~ 2005-01-27 09:58:03.000000000 +0200 ++++ pinentry-0.7.2/doc/pinentry.texi 2005-10-18 21:03:51.000000000 +0300 +@@ -62,7 +62,7 @@ + @ifnottex + @dircategory GNU Utilities + @direntry +-* pinentry:: Ask securely for a passphrase or PIN. ++* pinentry: (pinentry). Ask securely for a passphrase or PIN. + @end direntry + This file documents the use and the internals of the @pinentry{}. + +--- pinentry-0.7.2/doc/pinentry.info~ 2005-01-27 10:06:25.000000000 +0200 ++++ pinentry-0.7.2/doc/pinentry.info 2005-10-18 21:04:11.000000000 +0300 +@@ -3,7 +3,7 @@ + + INFO-DIR-SECTION GNU Utilities + START-INFO-DIR-ENTRY +-* pinentry:: Ask securely for a passphrase or PIN. ++* pinentry: (pinentry). Ask securely for a passphrase or PIN. + END-INFO-DIR-ENTRY + This file documents the use and the internals of the PINENTRY. + diff --git a/pinentry.spec b/pinentry.spec index b4f5e2f..bf9056e 100644 --- a/pinentry.spec +++ b/pinentry.spec @@ -1,23 +1,23 @@ Name: pinentry -Version: 0.7.1 -Release: 4 - +Version: 0.7.2 +Release: 1%{?dist} Summary: Collection of simple PIN or passphrase entry dialogs Group: Applications/System License: GPL URL: http://www.gnupg.org/aegypten/ -Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-0.7.1.tar.gz -Source1: ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-0.7.1.tar.gz.sig -# http://bugs.gnupg.org/cgi-bin/gnatsweb.pl?cmd=view&pr=242 -Patch0: %{name}-0.7.0-docs.patch +Source0: http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz +Source1: http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz.sig +Patch0: %{name}-info.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glib-devel >= 1:1.2.0, gtk+-devel >= 1:1.2.0, ncurses-devel -%{!?_without-qt:BuildRequires: qt-devel >= 1:3.2} -# texinfo needed because of patch0 -BuildRequires: texinfo -Requires: %{_sbindir}/update-alternatives, /sbin/install-info +BuildRequires: gtk2-devel +BuildRequires: qt-devel +BuildRequires: ncurses-devel +Requires(post): %{_sbindir}/update-alternatives +Requires(post): /sbin/install-info +Requires(postun): %{_sbindir}/update-alternatives +Requires(postun): /sbin/install-info Provides: %{name}-curses = %{version}-%{release} %description @@ -30,7 +30,8 @@ This package contains the curses (text) based version of the PIN entry dialog. Summary: Passphrase/PIN entry dialog based on GTK+ Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: %{_sbindir}/update-alternatives +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-gui = %{version}-%{release} %description gtk @@ -43,7 +44,8 @@ This package contains the GTK+ GUI based version of the PIN entry dialog. Summary: Passphrase/PIN entry dialog based on Qt Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: %{_sbindir}/update-alternatives +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-gui = %{version}-%{release} %description qt @@ -55,22 +57,22 @@ This package contains the Qt GUI based version of the PIN entry dialog. %prep %setup -q -%patch0 -p0 +%patch0 -p1 %build -%if %{?_without_qt:0}%{?!_without_qt:1} [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -%endif -%configure --disable-rpath %{?_without_qt:--disable-pinentry-qt} +%configure --disable-rpath --disable-dependency-tracking --disable-pinentry-gtk make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# Dummy symlink for %ghost -ln -s %{_sysconfdir}/alternatives/pinentry $RPM_BUILD_ROOT%{_bindir}/pinentry +# Backwards compatibility +ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk +# Dummy symlink for %%ghost +ln -sf %{_sysconfdir}/alternatives/pinentry $RPM_BUILD_ROOT%{_bindir}/pinentry rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -124,19 +126,24 @@ fi %files gtk %defattr(-,root,root,-) -%{_bindir}/pinentry-gtk +%{_bindir}/pinentry-gtk* %ghost %{_bindir}/pinentry -%if %{?_without_qt:0}%{?!_without_qt:1} %files qt %defattr(-,root,root,-) %{_bindir}/pinentry-qt %ghost %{_bindir}/pinentry -%endif %changelog -* Fri Apr 7 2005 Michael Schwendt +* Tue Oct 18 2005 Ville Skyttä - 0.7.2-1 +- 0.7.2, docs patch applied upstream. +- Switch to GTK2 in -gtk. +- Fine tune dependencies. +- Build with dependency tracking disabled. +- Clean up obsolete pre-FC2 support. + +* Fri Apr 7 2005 Michael Schwendt - 0.7.1-4 - rebuilt * Wed Jun 30 2004 Ville Skyttä - 0:0.7.1-0.fdr.3 diff --git a/sources b/sources index aa3912e..d1ef4fa 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -7861d63dea6434a5a05da84e83f209e6 pinentry-0.7.1.tar.gz +55626ce13ed76d82ec5330d19bdf3ab4 pinentry-0.7.2.tar.gz +a0ef18a651f00328ef8d53c3c3e51eeb pinentry-0.7.2.tar.gz.sig