diff --git a/.cvsignore b/.cvsignore index d1b3ae8..c17696d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pinentry-0.6.8.tar.gz +pinentry-0.7.1.tar.gz diff --git a/pinentry-0.6.8.tar.gz.sig b/pinentry-0.6.8.tar.gz.sig deleted file mode 100644 index dc02007..0000000 --- a/pinentry-0.6.8.tar.gz.sig +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.1 (GNU/Linux) - -iD8DBQA+Q/KwwKTLuYeXhWkRAu8DAJ4qe8m4rEQApEcW5Ccz1/VZ+idpiwCfT2uJ -z9ZNCk+Jbq9DSOfCBkFyRHE= -=hGvy ------END PGP SIGNATURE----- diff --git a/pinentry-0.7.0-docs.patch b/pinentry-0.7.0-docs.patch new file mode 100644 index 0000000..2fcf88b --- /dev/null +++ b/pinentry-0.7.0-docs.patch @@ -0,0 +1,93 @@ +--- 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 new file mode 100644 index 0000000..4143669 Binary files /dev/null and b/pinentry-0.7.1.tar.gz.sig differ diff --git a/pinentry-info.patch b/pinentry-info.patch deleted file mode 100644 index 07109e0..0000000 --- a/pinentry-info.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- doc/pinentry.info~ 2003-02-07 19:33:02.000000000 +0200 -+++ doc/pinentry.info 2003-02-08 23:48:55.000000000 +0200 -@@ -3,13 +3,12 @@ - - INFO-DIR-SECTION GNU Utilities - START-INFO-DIR-ENTRY --* gpg: (gnupg). OpenPGP encryption and signing tool. --* gpgsm: (gnupg). S/MIME encryption and signing tool. -+* PINEntry: (pinentry). PIN or passphrase entry dialog. - END-INFO-DIR-ENTRY -- This file documents the use and the internals of the PINEnrty. -+ This file documents the use and the internals of the PINEntry. - - This is edition 0.6.8, last updated 11 October 2002, of `The --`PINEnrty' Manual', for version 0.6.8. -+`PINEntry' Manual', for version 0.6.8. - - Published by g10 Code GmbH - Remscheider Str. 22 ---- doc/pinentry.texi~ 2002-10-11 17:33:34.000000000 +0300 -+++ doc/pinentry.texi 2003-02-08 23:49:29.000000000 +0200 -@@ -60,13 +60,12 @@ - @ifnottex - @dircategory GNU Utilities - @direntry --* gpg: (gnupg). OpenPGP encryption and signing tool. --* gpgsm: (gnupg). S/MIME encryption and signing tool. -+* PINEntry: (pinentry). PIN or passphrase entry dialog. - @end direntry --This file documents the use and the internals of the PINEnrty. -+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@* - Remscheider Str. 22@* diff --git a/pinentry.spec b/pinentry.spec index d93fa71..e38e018 100644 --- a/pinentry.spec +++ b/pinentry.spec @@ -1,23 +1,56 @@ -Summary: PIN or passphrase entry dialog Name: pinentry -Version: 0.6.8 -Release: 0.fdr.1.1 +Version: 0.7.1 +Release: 0.fdr.3.2 Epoch: 0 -License: GPL +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/alpha/aegypten/pinentry-0.6.8.tar.gz -Source1: ftp://ftp.gnupg.org/gcrypt/alpha/aegypten/pinentry-0.6.8.tar.gz.sig -Patch0: %{name}-info.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: glib-devel >= 1:1.2.0, gtk+-devel >= 1:1.2.0, qt-devel -BuildRequires: ncurses-devel -Requires: chkconfig, info +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 +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 +Provides: %{name}-curses = %{epoch}:%{version}-%{release} %description -This is a collection of simple PIN or passphrase entry dialogs which +Pinentry is a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol as described by the aegypten project; see http://www.gnupg.org/aegypten/ for details. +This package contains the curses (text) based version of the PIN entry dialog. + +%package gtk +Summary: Passphrase/PIN entry dialog based on GTK+ +Group: Applications/System +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{_sbindir}/update-alternatives +Provides: %{name}-gui = %{epoch}:%{version}-%{release} + +%description gtk +Pinentry is a collection of simple PIN or passphrase entry dialogs which +utilize the Assuan protocol as described by the aegypten project; see +http://www.gnupg.org/aegypten/ for details. +This package contains the GTK+ GUI based version of the PIN entry dialog. + +%package qt +Summary: Passphrase/PIN entry dialog based on Qt +Group: Applications/System +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{_sbindir}/update-alternatives +Provides: %{name}-gui = %{epoch}:%{version}-%{release} + +%description qt +Pinentry is a collection of simple PIN or passphrase entry dialogs which +utilize the Assuan protocol as described by the aegypten project; see +http://www.gnupg.org/aegypten/ for details. +This package contains the Qt GUI based version of the PIN entry dialog. %prep @@ -26,53 +59,106 @@ http://www.gnupg.org/aegypten/ for details. %build -%configure +%if %{?_without_qt:0}%{?!_without_qt:1} +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh +%endif +%configure --disable-rpath %{?_without_qt:--disable-pinentry-qt} make %{?_smp_mflags} %install -rm -rf %{buildroot} -%makeinstall -touch %{buildroot}%{_bindir}/pinentry -rm -f %{buildroot}%{_infodir}/dir - - -%post -install-info %{_infodir}/pinentry.info.gz %{_infodir}/dir -update-alternatives --install %{_bindir}/pinentry \ - pinentry %{_bindir}/pinentry-curses 10 -update-alternatives --install %{_bindir}/pinentry \ - pinentry %{_bindir}/pinentry-gtk 40 -update-alternatives --install %{_bindir}/pinentry \ - pinentry %{_bindir}/pinentry-qt 30 - -%postun -if [ "$1" = "0" ]; then - install-info --delete %{_infodir}/pinentry.info.gz %{_infodir}/dir - update-alternatives --remove pinentry %{_bindir}/pinentry-curses - update-alternatives --remove pinentry %{_bindir}/pinentry-gtk - update-alternatives --remove pinentry %{_bindir}/pinentry-qt -fi +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 +rm -f $RPM_BUILD_ROOT%{_infodir}/dir %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT + + +%post +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || : +if [ $1 -eq 1 ] ; then + %{_sbindir}/update-alternatives --install %{_bindir}/pinentry \ + pinentry %{_bindir}/pinentry-curses 10 +fi + +%post gtk +if [ $1 -eq 1 ] ; then + %{_sbindir}/update-alternatives --install %{_bindir}/pinentry \ + pinentry %{_bindir}/pinentry-gtk 40 +fi + +%post qt +if [ $1 -eq 1 ] ; then + %{_sbindir}/update-alternatives --install %{_bindir}/pinentry \ + pinentry %{_bindir}/pinentry-qt 30 +fi + +%postun +if [ $1 -eq 0 ] ; then + /sbin/install-info --delete %{_infodir}/%{name}.info \ + %{_infodir}/dir 2>/dev/null || : + %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses +fi + +%postun gtk +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-gtk +fi + +%postun qt +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt +fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO -%{_bindir}/pinentry-* +%{_bindir}/pinentry-curses %ghost %{_bindir}/pinentry -%{_infodir}/* +%{_infodir}/pinentry.info* + +%files gtk +%defattr(-,root,root,-) +%{_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 -* Sat Mar 22 2003 Ville Skyttä - 0:0.6.8-0.fdr.1 +* Wed Jun 30 2004 Ville Skyttä - 0:0.7.1-0.fdr.3 +- BuildRequires qt-devel >= 3.2. + +* Sat May 22 2004 Ville Skyttä - 0:0.7.1-0.fdr.2 +- Spec cleanups. + +* Sat Apr 24 2004 Ville Skyttä - 0:0.7.1-0.fdr.1 +- Update to 0.7.1. + +* Fri Dec 26 2003 Ville Skyttä - 0:0.7.0-0.fdr.1 +- Update to 0.7.0. +- Split GTK+ and QT dialogs into subpackages. + +* Thu Jul 10 2003 Ville Skyttä - 0:0.6.9-0.fdr.1 +- Update to 0.6.9. +- Smoother experience with --excludedocs. +- Don't change alternative priorities on upgrade. + +* Sat Mar 22 2003 Ville Skyttä - 0:0.6.8-0.fdr.1 - Update to current Fedora guidelines. * Tue Feb 12 2003 Warren Togami 0.6.8-1.fedora.3 - info/dir temporary workaround -* Sat Feb 8 2003 Ville Skyttä - 0.6.8-1.fedora.1 +* Sat Feb 8 2003 Ville Skyttä - 0.6.8-1.fedora.1 - First Fedora release. diff --git a/sources b/sources index 6ab932a..aa3912e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be8460bc1ecc2596fabea931a48c5080 pinentry-0.6.8.tar.gz +7861d63dea6434a5a05da84e83f209e6 pinentry-0.7.1.tar.gz