rpms/pinentry/devel pinentry-info.patch, 1.2, 1.3 .cvsignore, 1.3, 1.4 pinentry.spec, 1.7, 1.8 sources, 1.3, 1.4 pinentry-0.7.0-docs.patch, 1.1, NONE pinentry-0.7.1.tar.gz.sig, 1.1, NONE

Ville Skytta (scop) fedora-extras-commits at redhat.com
Tue Oct 18 18:18:16 UTC 2005 

Author: scop

Update of /cvs/extras/rpms/pinentry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29021

Modified Files:
	.cvsignore pinentry.spec sources 
Added Files:
	pinentry-info.patch 
Removed Files:
	pinentry-0.7.0-docs.patch pinentry-0.7.1.tar.gz.sig 
Log Message:
* Tue Oct 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-1
- 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.


pinentry-info.patch:

Index: pinentry-info.patch
===================================================================
RCS file: pinentry-info.patch
diff -N pinentry-info.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pinentry-info.patch	18 Oct 2005 18:18:13 -0000	1.3
@@ -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.
+ 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pinentry/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:14:02 -0000	1.3
+++ .cvsignore	18 Oct 2005 18:18:13 -0000	1.4
@@ -1 +1,2 @@
-pinentry-0.7.1.tar.gz
+pinentry-0.7.2.tar.gz
+pinentry-0.7.2.tar.gz.sig


Index: pinentry.spec
===================================================================
RCS file: /cvs/extras/rpms/pinentry/devel/pinentry.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pinentry.spec	6 Apr 2005 22:13:29 -0000	1.7
+++ pinentry.spec	18 Oct 2005 18:18:13 -0000	1.8
@@ -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 @@
 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 @@
 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 @@
 
 %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 @@
 
 %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 <mschwendt[AT]users.sf.net>
+* Tue Oct 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 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 <mschwendt[AT]users.sf.net> - 0.7.1-4
 - rebuilt
 
 * Wed Jun 30 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.fdr.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pinentry/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:14:02 -0000	1.3
+++ sources	18 Oct 2005 18:18:13 -0000	1.4
@@ -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


--- pinentry-0.7.0-docs.patch DELETED ---


--- pinentry-0.7.1.tar.gz.sig DELETED ---

More information about the fedora-extras-commits mailing list