Hello community, here is the log from the commit of package pinentry for openSUSE:Factory checked in at Thu May 28 23:14:19 CEST 2009. -------- --- pinentry/pinentry.changes 2008-11-10 14:57:38.000000000 +0100 +++ pinentry/pinentry.changes 2009-05-28 17:22:33.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 28 17:10:50 CEST 2009 - puzel@suse.cz + +- pinentry-qt4 (bnc#505134) + - add pinentry-qt4.patch.bz2 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- pinentry-qt4.patch.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pinentry.spec ++++++ --- /var/tmp/diff_new_pack.t23326/_old 2009-05-28 23:06:59.000000000 +0200 +++ /var/tmp/diff_new_pack.t23326/_new 2009-05-28 23:06:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pinentry (Version 0.7.5) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,10 +19,10 @@ Name: pinentry -BuildRequires: gtk2-devel libdrm-devel libjpeg-devel ncurses-devel qt3-devel update-desktop-files +BuildRequires: cmake gtk2-devel libdrm-devel libjpeg-devel libqt4-devel ncurses-devel qt3-devel update-desktop-files Url: http://www.gnupg.org/aegypten/ Version: 0.7.5 -Release: 61 +Release: 62 PreReq: %install_info_prereq Summary: Collection of Simple PIN or Passphrase Entry Dialogs License: GPL v2 or later @@ -35,10 +35,9 @@ Patch3: %{name}-0.7.2-curses-utf-8.diff Patch5: pinentry-gsize.diff Patch6: pinentry-0.7.5-wrong-apostrophe.patch +Patch7: pinentry-qt4.patch.bz2 Group: Productivity/Other Provides: pinentry-dialog -# the requires is wrong as -curses is in the main package -#Requires: pinentry-dialog BuildRoot: %{_tmppath}/%{name}-%{version}-build %global ncursesw_config %(set -- %{_bindir}/ncursesw*-config; echo ${1}) @@ -58,7 +57,7 @@ %package -n pinentry-qt License: GPL v2 or later Version: %{version} -Release: 9 +Release: 10 Provides: pinentry-dialog Provides: pinentry:/usr/bin/pinentry-qt Requires: pinentry @@ -78,10 +77,33 @@ Steffen Hansen, Klar�lvdalens Datakonsult AB <steffen@klaralvdalens-datakonsult.se> Marcus Brinkmann, g10 Code GmbH <marcus@g10code.com> +%package -n pinentry-qt4 +License: GPL v2 or later +Version: %{version} +Release: 1 +Provides: pinentry-dialog +Provides: pinentry:/usr/bin/pinentry-qt4 +Requires: pinentry +Group: Productivity/Other +Summary: Collection of Simple PIN or Passphrase Entry Dialogs + +%description -n pinentry-qt4 +This is a collection of simple PIN or passphrase entry dialogs which +utilize the Assuan protocol as described by the Aegypten project. + + + +Authors: +-------- + Robert Bihlmeyer <robbe@orcus.priv.at> + Werner Koch, g10 Code GmbH <wk@gnupg.org> + Steffen Hansen, Klar�lvdalens Datakonsult AB <steffen@klaralvdalens-datakonsult.se> + Marcus Brinkmann, g10 Code GmbH <marcus@g10code.com> + %package -n pinentry-gtk2 License: GPL v2 or later Version: %{version} -Release: 9 +Release: 10 Provides: pinentry-dialog Provides: pinentry:/usr/bin/pinentry-gtk-2 Requires: pinentry @@ -109,6 +131,7 @@ %patch3 %patch5 %patch6 +%patch7 %build cp /usr/share/gettext/config.rpath . @@ -128,10 +151,17 @@ --with-qt-libraries=%{_libdir}/qt3/%_lib/ \ --without-ncurses-include-dir make +#build qt4 pinentry +mkdir _build +cd _build +export CFLAGS="-DHAVE_CONFIG_H" +cmake .. +make %install make DESTDIR=$RPM_BUILD_ROOT install -# remove simlink +install -D -m 0755 _build/pinentry-qt4 ${RPM_BUILD_ROOT}%{_bindir}/pinentry-qt4 +# remove symlink rm -rf ${RPM_BUILD_ROOT}%{_bindir}/pinentry cp %{S:1} ${RPM_BUILD_ROOT}%{_bindir} @@ -151,10 +181,16 @@ %files -n pinentry-qt %attr(755,root,root) %{_bindir}/pinentry-qt +%files -n pinentry-qt4 +%attr(755,root,root) %{_bindir}/pinentry-qt4 + %files -n pinentry-gtk2 %attr(755,root,root) %{_bindir}/pinentry-gtk-2 %changelog +* Thu May 28 2009 puzel@suse.cz +- pinentry-qt4 (bnc#505134) + - add pinentry-qt4.patch.bz2 * Mon Nov 10 2008 coolo@suse.de - revert the last entry (reopened the bug) * Wed Nov 05 2008 puzel@suse.cz @@ -191,7 +227,7 @@ - rewrite pinentry wrapper to use the right binary * Mon Nov 06 2006 pnemec@suse.cz - Fixed pinnentry wrapper #218257 -* Sun Oct 15 2006 schwab@suse.de +* Mon Oct 16 2006 schwab@suse.de - Make sure config.rpath is present. * Tue Oct 03 2006 pnemec@suse.cz - removed static simlink to pinentry-qt ++++++ pinentry ++++++ --- /var/tmp/diff_new_pack.t23326/_old 2009-05-28 23:06:59.000000000 +0200 +++ /var/tmp/diff_new_pack.t23326/_new 2009-05-28 23:06:59.000000000 +0200 @@ -8,8 +8,9 @@ # # Anna Bernathova <anicka@novell.com> 2006 # Pavel Nemec <pnemec@novell.com> 2006 -# -# use proper binary (pinentry-qt, pinentry-gtk-2 or pinentry-curses) +# Pavol Rusnak <prusnak@novell.com> 2009 +# +# use proper binary (pinentry-qt4, pinentry-qt, pinentry-gtk-2 or pinentry-curses) kde_running= if [ -n "$KDE_FULL_SESSION" ]; then @@ -39,25 +40,33 @@ fi fi +# if KDE is detected and pinentry-qt4 exists, use pinentry-qt4 +if [ -n "$kde_running" -a -f /usr/bin/pinentry-qt4 ] +then + export PINENTRY_BINARY="/usr/bin/pinentry-qt4" # if KDE is detected and pinentry-qt exists, use pinentry-qt -if [ -n "$kde_running" -a -f /usr/bin/pinentry-qt ] +elif [ -n "$kde_running" -a -f /usr/bin/pinentry-qt ] then export PINENTRY_BINARY="/usr/bin/pinentry-qt" # otherwise test if pinentry-gtk-2 is installed -elif [ -f /usr/bin/pinentry-gtk-2 ] +elif [ -f /usr/bin/pinentry-gtk-2 ] then export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2" +# otherwise test if pinentry-qt4 exists although KDE is not detected +elif [ -f /usr/bin/pinentry-qt4 ] +then + export PINENTRY_BINARY="/usr/bin/pinentry-qt4" # otherwise test if pinentry-qt exists although KDE is not detected elif [ -f /usr/bin/pinentry-qt ] then export PINENTRY_BINARY="/usr/bin/pinentry-qt" -# pinentry-curses is installed by default +# pinentry-curses is installed by default else #test if gui binary is required for opt in "$@"; do if [ "x$opt" = "x--display" ]; then # should not happen because of package dependencies - echo "Please install pinentry-qt or pinentry-gtk2" >&2 + echo "Please install pinentry-qt4, pinentry-qt or pinentry-gtk2" >&2 exit 1 fi done ++++++ pinentry-qt4.patch.bz2 ++++++ ++++ 4965 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org