diff --git a/pinentry.spec b/pinentry.spec index bf9056e..98630fb 100644 --- a/pinentry.spec +++ b/pinentry.spec @@ -1,24 +1,28 @@ -Name: pinentry -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: 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) +Name: pinentry +Version: 0.7.2 +Release: 1%{?dist}.1 +Summary: Collection of simple PIN or passphrase entry dialogs + +Group: Applications/System +License: GPL +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch0: pinentry-info.patch 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} + +Provides: %{name}-curses = %{version}-%{release} %description Pinentry is a collection of simple PIN or passphrase entry dialogs which @@ -26,29 +30,27 @@ utilize the Assuan protocol as described by the aegypten project; see http://www.gnupg.org/aegypten/ for details. This package contains the curses (text) based version of the PIN entry dialog. -%package gtk -Summary: Passphrase/PIN entry dialog based on GTK+ -Group: Applications/System -Requires: %{name} = %{version}-%{release} +%package gtk +Summary: Passphrase/PIN entry dialog based on GTK+ +Group: Applications/System +Requires: %{name} = %{version}-%{release} +Provides: %{name}-gui = %{version}-%{release} Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives -Provides: %{name}-gui = %{version}-%{release} - -%description gtk +%description gtk 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. -%package qt -Summary: Passphrase/PIN entry dialog based on Qt -Group: Applications/System -Requires: %{name} = %{version}-%{release} +%package qt +Summary: Passphrase/PIN entry dialog based on Qt +Group: Applications/System +Requires: %{name} = %{version}-%{release} +Provides: %{name}-gui = %{version}-%{release} Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives -Provides: %{name}-gui = %{version}-%{release} - -%description qt +%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. @@ -57,22 +59,34 @@ This package contains the Qt GUI based version of the PIN entry dialog. %prep %setup -q + %patch0 -p1 %build -[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -%configure --disable-rpath --disable-dependency-tracking --disable-pinentry-gtk +unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include + +%configure \ + --disable-rpath \ + --disable-dependency-tracking \ + --disable-pinentry-gtk + make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT + make install DESTDIR=$RPM_BUILD_ROOT + # 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 + +# unpackaged files rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -81,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/pinentry.info %{_infodir}/dir || : if [ $1 -eq 1 ] ; then %{_sbindir}/update-alternatives --install %{_bindir}/pinentry \ pinentry %{_bindir}/pinentry-curses 10 @@ -101,8 +115,7 @@ fi %postun if [ $1 -eq 0 ] ; then - /sbin/install-info --delete %{_infodir}/%{name}.info \ - %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/pinentry.info %{_infodir}/dir || : %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses fi @@ -136,6 +149,9 @@ fi %changelog +* Fri Feb 10 2006 Rex Dieter +- fc5: gcc/glibc respin + * Tue Oct 18 2005 Ville Skyttä - 0.7.2-1 - 0.7.2, docs patch applied upstream. - Switch to GTK2 in -gtk.