rpms/pinentry/F-13 pinentry.spec,1.30,1.31

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/pinentry/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12825

Modified Files:
	pinentry.spec 
Log Message:
* Thu Apr 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.8.0-2
- -qt: build as qt4 version, and drop qt3 support (f13+ only)



Index: pinentry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/F-13/pinentry.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- pinentry.spec	27 Apr 2010 08:57:21 -0000	1.30
+++ pinentry.spec	30 Apr 2010 12:20:59 -0000	1.31
@@ -2,15 +2,22 @@
 %if 0%{?fedora} > 8 || 0%{?rhel} > 5
 %define _enable_pinentry_qt4 --enable-pinentry-qt4
 %define _enable_pinentry_qt --enable-pinentry-qt
+%define qt_major 3
 %define qt3 qt3
 %else
 %define qt3 qt
 %define _enable_pinentry_qt --enable-pinentry-qt 
 %endif
 
+%if 0%{?fedora} && 0%{?fedora} > 12
+%define _enable_pinentry_qt4 --enable-pinentry-qt4
+%define qt_major 4
+%undefine _enable_pinentry_qt
+%endif
+
 Name:    pinentry
 Version: 0.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 Group:   Applications/System
@@ -61,15 +68,19 @@ http://www.gnupg.org/aegypten/ for detai
 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%{?qt_major}
 Group:   Applications/System
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gui = %{version}-%{release}
+%if ! 0%{?_enable_pinentry_qt}
+Obsoletes: %{name}-qt4 < 0.8.0-2
+Provides:  %{name}-qt4 = %{version}-%{release}
+%endif
 %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 Qt3 GUI based version of the PIN entry dialog.
+This package contains the Qt%{?qt_major} GUI based version of the PIN entry dialog.
 
 %package qt4
 Summary: Passphrase/PIN entry dialog based on Qt4
@@ -120,6 +131,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 # Backwards compatibility
 ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk
+%if ! 0%{?_enable_pinentry_qt}
+ln -s pinentry-qt4 $RPM_BUILD_ROOT%{_bindir}/pinentry-qt
+%endif
 
 install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pinentry
 
@@ -163,15 +177,22 @@ fi
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/pinentry-qt
+%if ! 0%{?_enable_pinentry_qt}
+%{_bindir}/pinentry-qt4
+%else
 
 %if 0%{?_enable_pinentry_qt4:1}
 %files qt4
 %defattr(-,root,root,-)
 %{_bindir}/pinentry-qt4
 %endif
+%endif
 
 
 %changelog
+* Thu Apr 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.8.0-2
+- -qt: build as qt4 version, and drop qt3 support (f13+ only)
+
 * Tue Apr 27 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0.8.0-1
 - pinentry-0.8.0
 - pinentry-gtk keyboard grab fail results in SIGABRT (#585422)