diff --git a/.cvsignore b/.cvsignore index c4bdb85..2df5666 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1,2 @@ -pinentry-0.7.2.tar.gz -pinentry-0.7.2.tar.gz.sig -pinentry-0.7.3.tar.gz -pinentry-0.7.3.tar.gz.sig -pinentry-0.7.4.tar.gz -pinentry-0.7.4.tar.gz.sig +pinentry-0.7.5.tar.gz +pinentry-0.7.5.tar.gz.sig diff --git a/pinentry-0.7.4-glib2.patch b/pinentry-0.7.4-glib2.patch deleted file mode 100644 index 2788d73..0000000 --- a/pinentry-0.7.4-glib2.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up pinentry-0.7.4/gtk+-2/gtksecentry.c.glib2 pinentry-0.7.4/gtk+-2/gtksecentry.c ---- pinentry-0.7.4/gtk+-2/gtksecentry.c.glib2 2007-11-28 16:57:55.000000000 -0600 -+++ pinentry-0.7.4/gtk+-2/gtksecentry.c 2008-03-25 09:27:37.000000000 -0500 -@@ -270,7 +270,7 @@ gboolean g_use_secure_mem = FALSE; - - - gpointer --g_malloc(gulong size) -+g_malloc(gsize size) - { - gpointer p; - -@@ -282,13 +282,13 @@ g_malloc(gulong size) - else - p = (gpointer) malloc(size); - if (!p) -- g_error("could not allocate %ld bytes", size); -+ g_error("could not allocate %ui bytes", size); - - return p; - } - - gpointer --g_malloc0(gulong size) -+g_malloc0(gsize size) - { - gpointer p; - -@@ -302,13 +302,13 @@ g_malloc0(gulong size) - } else - p = (gpointer) calloc(size, 1); - if (!p) -- g_error("could not allocate %ld bytes", size); -+ g_error("could not allocate %ui bytes", size); - - return p; - } - - gpointer --g_realloc(gpointer mem, gulong size) -+g_realloc(gpointer mem, gsize size) - { - gpointer p; - diff --git a/pinentry.spec b/pinentry.spec index cffb98a..a5f9e2a 100644 --- a/pinentry.spec +++ b/pinentry.spec @@ -1,14 +1,20 @@ +%if 0%{?fedora} > 8 +%define qt3 qt3 +%else +%define qt3 qt +%endif + Name: pinentry -Version: 0.7.4 -Release: 6%{?dist} +Version: 0.7.5 +Release: 1%{?dist} Summary: Collection of simple PIN or passphrase entry dialogs Group: Applications/System License: GPLv2+ URL: http://www.gnupg.org/aegypten/ -Source0: http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz -Source1: http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz.sig +Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz +Source1: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: pinentry-0.7.4-glib2.patch @@ -16,11 +22,7 @@ Patch1: pinentry-0.7.4-glib2.patch BuildRequires: gtk2-devel BuildRequires: libcap-devel BuildRequires: ncurses-devel -%if 0%{?fedora} > 8 -BuildRequires: qt3-devel -%else -BuildRequires: qt-devel -%endif +BuildRequires: %{qt3}-devel Requires(post): %{_sbindir}/update-alternatives Requires(post): /sbin/install-info @@ -65,7 +67,7 @@ This package contains the Qt GUI based version of the PIN entry dialog. %prep %setup -q -%patch1 -p1 -b .glib2 +#patch1 -p1 -b .glib2 %build @@ -153,6 +155,9 @@ fi %changelog +* Sat Apr 25 2009 Rex Dieter - 0.7.5-1 +- pinentry-0.7.5 + * Thu Feb 26 2009 Fedora Release Engineering - 0.7.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 3c76824..86413d4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d7709fe7c48a24c34c5948725cef7d93 pinentry-0.7.4.tar.gz -300e7d19f60b6f10d004825e7e3be42f pinentry-0.7.4.tar.gz.sig +ca492afbbb59cd19f1c875533f18b269 pinentry-0.7.5.tar.gz +afe88ce56cd02924a292f9f5f6f40cd6 pinentry-0.7.5.tar.gz.sig