- build only old pinentry-gtk and pinentry-qt dialogs from this spec

diff --git a/pinentry.spec b/pinentry.spec
deleted file mode 100644 (file)
index a10be21..0000000
--- a/pinentry.spec
+++ /dev/null
@@ -1,201 +0,0 @@
-# TODO: use system libassuan 2 instead of included libassuan 1
-#
-# Conditional build:
-%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.8.4
-Release:       2
-License:       GPL v2+
-Group:         Applications
-Source0:       ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2
-# Source0-md5: e2b6f94471ba1e978f6e5bf6b275189b
-Patch0:                %{name}-system-assuan.patch
-Patch1:                %{name}-info.patch
-Patch2:                %{name}-am.patch
-Patch3:                %{name}-doc.patch
-Patch4:                %{name}-activate.patch
-URL:           http://www.gnupg.org/
-%{?with_qt4:BuildRequires:     QtGui-devel}
-BuildRequires: autoconf >= 2.57
-BuildRequires: automake >= 1:1.10
-BuildRequires: gettext-devel
-%{?with_gtk:BuildRequires:     gtk+-devel >= 1.2.0}
-%{?with_gtk2:BuildRequires:    gtk+2-devel >= 2:2.4.0}
-#BuildRequires:        libassuan-devel
-BuildRequires: libcap-devel
-BuildRequires: libstdc++-devel
-BuildRequires: ncurses-devel
-BuildRequires: pkgconfig
-%{?with_qt:BuildRequires:      qt-devel}
-%{?with_qt4:BuildRequires:     qt4-build}
-BuildRequires: texinfo
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%description
-This 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. Base package contains
-curses-based dialog.
-
-%description -l pl.UTF-8
-Jest to zestaw prostych kontrolek dialogowych do wpisywania PIN-ów lub
-haseł, używające protokołu Assuan opisanego w projekcie aegypten;
-więcej szczegółów pod adresem http://www.gnupg.org/aegypten/.
-Podstawowy pakiet zawiera kontrolkę opartą na curses.
-
-%package gtk
-Summary:       Simple PIN or passphrase entry dialog for GTK+ 1.x
-Summary(pl.UTF-8):     Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GTK+ 1.x
-Group:         X11/Applications
-
-%description gtk
-Simple PIN or passphrase entry dialog for GTK+ 1.x.
-
-%description gtk -l pl.UTF-8
-Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GTK+
-1.x.
-
-%package gtk2
-Summary:       Simple PIN or passphrase entry dialog for GTK+ 2
-Summary(pl.UTF-8):     Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GTK+ 2
-Group:         X11/Applications
-Requires:      gtk+2 >= 2:2.4.0
-
-%description gtk2
-Simple PIN or passphrase entry dialog for GTK+ 2.
-
-%description gtk2 -l pl.UTF-8
-Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GTK+ 2.
-
-%package qt
-Summary:       Simple PIN or passphrase entry dialog for Qt
-Summary(pl.UTF-8):     Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt
-Group:         X11/Applications
-
-%description qt
-Simple PIN or passphrase entry dialog for Qt.
-
-%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
-%patch3 -p1
-%patch4 -p1
-
-%if %{with qt4}
-cd qt4
-%{_bindir}/moc-qt4 pinentrydialog.h  -o pinentrydialog.moc
-%{_bindir}/moc-qt4 pinentryconfirm.h -o pinentryconfirm.moc
-%{_bindir}/moc-qt4 qsecurelineedit.h -o qsecurelineedit.moc
-cd ..
-%endif
-
-#%{__rm} assuan/*.h
-
-%build
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
-%configure \
-       --enable-maintainer-mode \
-       --enable-fallback-curses \
-       --enable-pinentry-curses \
-       --enable-pinentry-gtk%{!?with_gtk:=no} \
-       --enable-pinentry-gtk2%{!?with_gtk2:=no} \
-       --enable-pinentry-qt%{!?with_qt:=no} \
-       --enable-pinentry-qt4%{!?with_qt4:=no} \
-       --enable-pinentry-tty \
-       --with-qt-includes=%{_includedir}/qt
-
-%{__make}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/pinentry
-cat >$RPM_BUILD_ROOT%{_bindir}/pinentry <<'EOF'
-#!/bin/sh
-
-if [ -n "$PINENTRY_PROGRAM" ]; then
-       exec $PINENTRY_PROGRAM "$@"
-elif [ -z "$DISPLAY" ]; then
-       exec %{_bindir}/pinentry-curses "$@"
-elif [ -x %{_bindir}/pinentry-gtk-2 ]; then
-       exec %{_bindir}/pinentry-gtk-2 "$@"
-elif [ -x %{_bindir}/pinentry-gtk ]; then
-       exec %{_bindir}/pinentry-gtk "$@"
-elif [ -x %{_bindir}/pinentry-qt4 ]; then
-       exec %{_bindir}/pinentry-qt4 "$@"
-elif [ -x %{_bindir}/pinentry-qt ]; then
-       exec %{_bindir}/pinentry-qt "$@"
-else
-       exec %{_bindir}/pinentry-curses "$@"
-fi
-EOF
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post  -p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
-
-%postun        -p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
-
-%files
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/pinentry
-%attr(755,root,root) %{_bindir}/pinentry-curses
-%attr(755,root,root) %{_bindir}/pinentry-tty
-%{_infodir}/pinentry.info*
-
-%if %{with gtk}
-%files gtk
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/pinentry-gtk
-%endif
-
-%if %{with gtk2}
-%files gtk2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/pinentry-gtk-2
-%endif
-
-%if %{with qt}
-%files qt
-%defattr(644,root,root,755)
-%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

diff --git a/pinentry0.8.spec b/pinentry0.8.spec
new file mode 100644 (file)
index 0000000..53c6df6
--- /dev/null
+++ b/pinentry0.8.spec
@@ -0,0 +1,126 @@
+# TODO: use system libassuan 2 instead of included libassuan 1
+#
+# Conditional build:
+%bcond_without gtk     # without GTK+ 1.x dialog
+%bcond_without qt      # without Qt 3.x dialog
+#
+Summary:       Simple PIN or passphrase entry dialogs (old frontends)
+Summary(pl.UTF-8):     Proste kontrolki dialogowe do wpisywania PIN-ów lub haseł (stare interfejsy)
+Name:          pinentry0.8
+Version:       0.8.4
+Release:       3
+License:       GPL v2+
+Group:         Applications
+Source0:       ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-%{version}.tar.bz2
+# Source0-md5: e2b6f94471ba1e978f6e5bf6b275189b
+Patch0:                pinentry-system-assuan.patch
+Patch1:                pinentry-info.patch
+Patch2:                pinentry-am.patch
+Patch3:                pinentry-doc.patch
+Patch4:                pinentry-activate.patch
+URL:           http://www.gnupg.org/
+BuildRequires: autoconf >= 2.57
+BuildRequires: automake >= 1:1.10
+BuildRequires: gettext-devel
+%{?with_gtk:BuildRequires:     gtk+-devel >= 1.2.0}
+#BuildRequires:        libassuan-devel
+BuildRequires: libcap-devel
+BuildRequires: libstdc++-devel
+BuildRequires: ncurses-devel
+BuildRequires: pkgconfig
+%{?with_qt:BuildRequires:      qt-devel >= 3}
+BuildRequires: texinfo
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This 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 is an older version of pinentry, the last which contained GTK+
+1.x and Qt 3.x based dialogs.
+
+%description -l pl.UTF-8
+Jest to zestaw prostych kontrolek dialogowych do wpisywania PIN-ów lub
+haseł, używające protokołu Assuan opisanego w projekcie aegypten;
+więcej szczegółów pod adresem http://www.gnupg.org/aegypten/.
+
+Ten pakiet to starsza wersja pinentry, ostatnia zawierająca kontrolki
+oparte na bibliotekach GTK+ 1.x oraz Qt 3.x
+
+%package -n pinentry-gtk
+Summary:       Simple PIN or passphrase entry dialog for GTK+ 1.x
+Summary(pl.UTF-8):     Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GTK+ 1.x
+Group:         X11/Applications
+
+%description -n pinentry-gtk
+Simple PIN or passphrase entry dialog for GTK+ 1.x.
+
+%description -n pinentry-gtk -l pl.UTF-8
+Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GTK+
+1.x.
+
+%package -n pinentry-qt
+Summary:       Simple PIN or passphrase entry dialog for Qt 3
+Summary(pl.UTF-8):     Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt 3
+Group:         X11/Applications
+
+%description -n pinentry-qt
+Simple PIN or passphrase entry dialog for Qt 3.
+
+%description -n pinentry-qt -l pl.UTF-8
+Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt 3.
+
+%prep
+%setup -q -n pinentry-%{version}
+#patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+#%{__rm} assuan/*.h
+
+%build
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
+%configure \
+       --enable-maintainer-mode \
+       --enable-pinentry-curses=no \
+       --enable-pinentry-gtk%{!?with_gtk:=no} \
+       --enable-pinentry-gtk2=no \
+       --enable-pinentry-qt%{!?with_qt:=no} \
+       --enable-pinentry-qt4=no \
+       --enable-pinentry-tty=no \
+       --with-qt-includes=%{_includedir}/qt
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/pinentry \
+       $RPM_BUILD_ROOT%{_infodir}/pinentry.info
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%if %{with gtk}
+%files -n pinentry-gtk
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
+%attr(755,root,root) %{_bindir}/pinentry-gtk
+%endif
+
+%if %{with qt}
+%files -n pinentry-qt
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
+%attr(755,root,root) %{_bindir}/pinentry-qt
+%endif