rpms/pinentry/F-11 .cvsignore, 1.6, 1.7 pinentry.spec, 1.22, 1.23 sources, 1.6, 1.7 pinentry-0.7.4-glib2.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/pinentry/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22603

Modified Files:
	.cvsignore pinentry.spec sources 
Removed Files:
	pinentry-0.7.4-glib2.patch 
Log Message:
* Mon Jun 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-1
- pinentry-0.7.6
- -qt switched qt4 version, where applicable (f9+, rhel6+)
- fixup scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Dec 2007 05:02:28 -0000	1.6
+++ .cvsignore	23 Jun 2009 15:40:31 -0000	1.7
@@ -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.6.tar.gz
+pinentry-0.7.6.tar.gz.sig


Index: pinentry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/F-11/pinentry.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- pinentry.spec	27 Feb 2009 00:30:36 -0000	1.22
+++ pinentry.spec	23 Jun 2009 15:40:31 -0000	1.23
@@ -1,31 +1,36 @@
 
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
+%define _enable_pinentry_qt4 --enable-pinentry-qt4
+%else
+%define _enable_pinentry_qt --enable-pinentry-qt 
+%endif
+
 Name:    pinentry
-Version: 0.7.4
-Release: 6%{?dist}
+Version: 0.7.6
+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
-
 BuildRequires: gtk2-devel
 BuildRequires: libcap-devel
 BuildRequires: ncurses-devel
-%if 0%{?fedora} > 8
-BuildRequires: qt3-devel
-%else
+%if 0%{?_enable_pinentry_qt:1}
 BuildRequires: qt-devel
 %endif
+%if 0%{?_enable_pinentry_qt4:1}
+BuildRequires: qt4-devel
+%endif
 
 Requires(post): %{_sbindir}/update-alternatives
 Requires(post): /sbin/install-info
 Requires(postun): %{_sbindir}/update-alternatives
-Requires(postun): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 Provides: %{name}-curses = %{version}-%{release}
 
@@ -46,10 +51,10 @@ Requires(postun): %{_sbindir}/update-alt
 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.
+This package contains the GTK GUI based version of the PIN entry dialog.
 
 %package qt
-Summary: Passphrase/PIN entry dialog based on Qt3
+Summary: Passphrase/PIN entry dialog based on Qt
 Group:   Applications/System
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gui = %{version}-%{release}
@@ -65,16 +70,25 @@ This package contains the Qt GUI based v
 %prep
 %setup -q
 
-%patch1 -p1 -b .glib2
-
+# hack around auto* madness, lack of proper support for moc
+%if %{?_enable_pinentry_qt4:1}
+pushd qt4
+moc-qt4 pinentrydialog.h > pinentrydialog.moc
+moc-qt4 qsecurelineedit.h > qsecurelineedit.moc
+popd
+%endif
 
 %build
+%if 0%{?_enable_pinentry_qt:1}
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+%endif
 
 %configure \
   --disable-rpath \
   --disable-dependency-tracking \
-  --disable-pinentry-gtk
+  --disable-pinentry-gtk \
+  %{?_enable_pinentry_qt} %{!?_enable_pinentry_qt:--disable-pinentry-qt} \
+  %{?_enable_pinentry_qt4} %{!?_enable_pinentry_qt4:--disable-pinentry-qt4} 
 
 make %{?_smp_mflags}
 
@@ -86,6 +100,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 # Backwards compatibility
 ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk
+%if 0%{?_enable_pinentry_qt4:1}
+ln -s pinentry-qt4 $RPM_BUILD_ROOT%{_bindir}/pinentry-qt
+%endif
 
 # Dummy symlink for %%ghost
 ln -sf %{_sysconfdir}/alternatives/pinentry $RPM_BUILD_ROOT%{_bindir}/pinentry
@@ -99,38 +116,36 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-/sbin/install-info %{_infodir}/pinentry.info %{_infodir}/dir || :
-if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
-    pinentry %{_bindir}/pinentry-curses 10
-fi
+/sbin/install-info %{_infodir}/pinentry.info %{_infodir}/dir 
+%{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
+  pinentry %{_bindir}/pinentry-curses %{?curses_priority}%{!?curses_priority:10} ||:
 
 %post gtk
-if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
-    pinentry %{_bindir}/pinentry-gtk 40
-fi
+%{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
+  pinentry %{_bindir}/pinentry-gtk %{?gtk_priority}%{!?gtk_priority:40} ||:
 
 %post qt
-if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
-    pinentry %{_bindir}/pinentry-qt 30
+%{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
+  pinentry %{_bindir}/pinentry-qt %{?qt_priority}%{!?qt_priority:30} ||:
+
+%preun
+if [ $1 -eq 0 ] ; then
+  /sbin/install-info --delete %{_infodir}/pinentry.info %{_infodir}/dir ||:
 fi
 
 %postun
 if [ $1 -eq 0 ] ; then
-  /sbin/install-info --delete %{_infodir}/pinentry.info %{_infodir}/dir || :
-  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses
+  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses ||:
 fi
 
 %postun gtk
 if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-gtk
+  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-gtk ||:
 fi
 
 %postun qt
 if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt
+  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt ||:
 fi
 
 
@@ -143,16 +158,28 @@ fi
 
 %files gtk
 %defattr(-,root,root,-)
-%{_bindir}/pinentry-gtk*
+%{_bindir}/pinentry-gtk
+%{_bindir}/pinentry-gtk-2
 %ghost %{_bindir}/pinentry
 
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/pinentry-qt
+%if 0%{?_enable_pinentry_qt4:1}
+%{_bindir}/pinentry-qt4
+%endif
 %ghost %{_bindir}/pinentry
 
 
 %changelog
+* Mon Jun 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-1
+- pinentry-0.7.6
+- -qt switched qt4 version, where applicable (f9+, rhel6+)
+- fixup scriptlets
+
+* Sat Apr 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.5-1
+- pinentry-0.7.5
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Dec 2007 05:02:28 -0000	1.6
+++ sources	23 Jun 2009 15:40:31 -0000	1.7
@@ -1,2 +1,2 @@
-d7709fe7c48a24c34c5948725cef7d93  pinentry-0.7.4.tar.gz
-300e7d19f60b6f10d004825e7e3be42f  pinentry-0.7.4.tar.gz.sig
+5a4f676375fa882009da02013d77210f  pinentry-0.7.6.tar.gz
+36cd76923724de5d10830346f4b0f915  pinentry-0.7.6.tar.gz.sig


--- pinentry-0.7.4-glib2.patch DELETED ---