packages: pinentry/pinentry-system-assuan.patch, pinentry/pinentry.spec - u...

[arekm]

Author: arekm                        Date: Sat Jul 25 22:08:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.7.6; qt4 version available now

---- Files affected:
packages/pinentry:
   pinentry-system-assuan.patch (1.3 -> 1.4) , pinentry.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/pinentry/pinentry-system-assuan.patch
diff -u packages/pinentry/pinentry-system-assuan.patch:1.3 packages/pinentry/pinentry-system-assuan.patch:1.4
--- packages/pinentry/pinentry-system-assuan.patch:1.3	Mon Feb 28 08:34:55 2005
+++ packages/pinentry/pinentry-system-assuan.patch	Sun Jul 26 00:08:47 2009
@@ -49,15 +49,15 @@
  
 --- pinentry-0.7.2/Makefile.am.orig	2004-12-22 11:48:43.000000000 +0100
 +++ pinentry-0.7.2/Makefile.am	2005-02-28 08:18:55.224700744 +0100
-@@ -53,7 +53,7 @@
+@@ -59,7 +59,7 @@
  pinentry_w32 = 
  endif
  
 -SUBDIRS = assuan secmem pinentry ${pinentry_curses} \
 +SUBDIRS = secmem pinentry ${pinentry_curses} \
- 	${pinentry_gtk} ${pinentry_gtk_2} ${pinentry_qt} ${pinentry_w32} doc
+ 	${pinentry_gtk} ${pinentry_gtk_2} ${pinentry_qt} ${pinentry_qt4} \
+ 	${pinentry_w32} doc
  
- signed-dist: $(distdir).tar.gz.sig
 --- pinentry-0.7.0/pinentry/pinentry.c.orig	2003-12-22 19:28:07.000000000 +0100
 +++ pinentry-0.7.0/pinentry/pinentry.c	2003-12-24 03:29:35.018915904 +0100
 @@ -37,6 +37,7 @@
@@ -88,3 +88,19 @@
  	$(LIBCAP) $(GTK2LIBS) $(libcurses)
  
  pinentry_gtk_2_SOURCES = pinentry-gtk-2.c \
+--- p/qt4/Makefile.am~	2009-04-03 16:44:01.000000000 +0200
++++ p/qt4/Makefile.am	2009-07-26 00:06:00.686756152 +0200
+@@ -31,11 +31,11 @@
+ endif
+ 
+ 
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem \
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/secmem \
+ 	$(ncurses_include) -I$(top_srcdir)/pinentry
+ AM_CXXFLAGS = $(QT4_CORE_CFLAGS) $(QT4_GUI_CFLAGS)
+ pinentry_qt4_LDADD = $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) \
+-	../pinentry/libpinentry.a $(top_builddir)/assuan/libassuan.a \
++	../pinentry/libpinentry.a -lassuan \
+ 	$(top_builddir)/secmem/libsecmem.a $(LIBCAP)
+ 
+ pinentry_qt4_SOURCES = pinentrydialog.h pinentrydialog.cpp \

================================================================
Index: packages/pinentry/pinentry.spec
diff -u packages/pinentry/pinentry.spec:1.29 packages/pinentry/pinentry.spec:1.30
--- packages/pinentry/pinentry.spec:1.29	Sat Mar  7 18:49:54 2009
+++ packages/pinentry/pinentry.spec	Sun Jul 26 00:08:47 2009
@@ -4,20 +4,21 @@
 %bcond_without	gtk	# without GTK+ 1.x dialog
 %bcond_without	gtk2	# without GTK+ 2 dialog
 %bcond_without	qt	# without Qt dialog
+%bcond_without	qt4	# without Qt4 dialog
 #
 Summary:	Simple PIN or passphrase entry dialogs
 Summary(pl.UTF-8):	Proste kontrolki dialogowe do wpisywania PIN-ów lub haseł
 Name:		pinentry
-Version:	0.7.5
-Release:	4
+Version:	0.7.6
+Release:	1
 License:	GPL v2+
 Group:		Applications
 Source0:	ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz
-# Source0-md5:	ca492afbbb59cd19f1c875533f18b269
+# Source0-md5:	5a4f676375fa882009da02013d77210f
 Patch0:		%{name}-system-assuan.patch
 Patch1:		%{name}-info.patch
-Patch2:		%{name}-types.patch
 URL:		http://www.gnupg.org/
+BuildRequires:	QtGui-devel
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1:1.7.6
 %{?with_gtk:BuildRequires:	gtk+-devel >= 1.2.0}
@@ -77,11 +78,28 @@
 %description qt -l pl.UTF-8
 Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt.
 
+%package qt4
+Summary:	Simple PIN or passphrase entry dialog for Qt4
+Summary(pl.UTF-8):	Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt4
+Group:		X11/Applications
+
+%description qt4
+Simple PIN or passphrase entry dialog for Qt4.
+
+%description qt4 -l pl.UTF-8
+Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt4.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+
+cd qt4
+%{_bindir}/moc-qt4 pinentrydialog.h  -o pinentrydialog.moc
+%{_bindir}/moc-qt4 qsecurelineedit.h -o qsecurelineedit.moc
+cd ..
+
+rm assuan/*.h
 
 %build
 %{__aclocal} -I m4
@@ -96,6 +114,7 @@
 	--%{!?with_gtk:dis}%{?with_gtk:en}able-pinentry-gtk \
 	--%{!?with_gtk2:dis}%{?with_gtk2:en}able-pinentry-gtk2 \
 	--%{!?with_qt:dis}%{?with_qt:en}able-pinentry-qt \
+	--%{!?with_qt4:dis}%{?with_qt4:en}able-pinentry-qt4 \
 	--with-qt-includes=/usr/include/qt
 
 %{__make}
@@ -161,12 +180,21 @@
 %attr(755,root,root) %{_bindir}/pinentry-qt
 %endif
 
+%if %{with qt4}
+%files qt4
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/pinentry-qt4
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2009/07/25 22:08:47  arekm
+- up to 0.7.6; qt4 version available now
+
 Revision 1.29  2009/03/07 17:49:54  arekm
 - rel 4; add pinentry-qt4 to pinentry script
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pinentry/pinentry-system-assuan.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pinentry/pinentry.spec?r1=1.29&r2=1.30&f=u