Mailinglist Archive: opensuse-commit (999 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package pinentry for openSUSE:Factory
checked in at Wed Jul 8 21:07:11 CEST 2009.


--------
--- pinentry/pinentry.changes   2009-06-24 13:48:00.000000000 +0200
+++ pinentry/pinentry.changes   2009-06-30 14:16:27.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 30 14:13:52 CEST 2009 - puzel@xxxxxxxxxx
+
+- improve pinentry script: prefer pinentry-qt in KDE3 environment
+  (bnc#514688)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pinentry.spec ++++++
--- /var/tmp/diff_new_pack.8iiSmh/_old  2009-07-08 21:05:47.000000000 +0200
+++ /var/tmp/diff_new_pack.8iiSmh/_new  2009-07-08 21:05:47.000000000 +0200
@@ -29,7 +29,7 @@
 BuildRequires:  update-desktop-files
 Url:            http://www.gnupg.org/aegypten/
 Version:        0.7.6
-Release:        1
+Release:        2
 PreReq:         %install_info_prereq
 Summary:        Collection of Simple PIN or Passphrase Entry Dialogs
 License:        GPL v2 or later
@@ -59,7 +59,7 @@
 %package -n pinentry-qt
 License:        GPL v2 or later
 Version:        %{version}
-Release:        11
+Release:        12
 Provides:       pinentry-dialog
 Provides:       pinentry:/usr/bin/pinentry-qt
 Requires:       pinentry
@@ -80,7 +80,7 @@
 %package -n pinentry-qt4
 License:        GPL v2 or later
 Version:        %{version}
-Release:        2
+Release:        3
 Provides:       pinentry-dialog
 Provides:       pinentry:/usr/bin/pinentry-qt4
 Requires:       pinentry
@@ -101,7 +101,7 @@
 %package -n pinentry-gtk2
 License:        GPL v2 or later
 Version:        %{version}
-Release:        11
+Release:        12
 Provides:       pinentry-dialog
 Provides:       pinentry:/usr/bin/pinentry-gtk-2
 Requires:       pinentry

++++++ pinentry ++++++
--- /var/tmp/diff_new_pack.8iiSmh/_old  2009-07-08 21:05:47.000000000 +0200
+++ /var/tmp/diff_new_pack.8iiSmh/_new  2009-07-08 21:05:47.000000000 +0200
@@ -38,12 +38,13 @@
         DISPLAY="$display" xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 
2>/dev/null
         if test $? -eq 0; then
             kde_running=1
+            kde_ver="`DISPLAY="$display" xprop -root | sed -n 
's/KDE_SESSION_VERSION(CARDINAL) = //p'`" 2>/dev/null
         fi
     fi
 fi
 
 # if KDE is detected and pinentry-qt4 exists, use pinentry-qt4
-if [ -n "$kde_running" -a -f /usr/bin/pinentry-qt4 ]
+if [ -n "$kde_running" -a "$kde_ver"x = 4x -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


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx