Author: dmacvicar Date: Mon Jun 18 09:47:27 2007 New Revision: 5762 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5762&view=rev Log: Use gpg2 in KeyRing and make the package depend on it (#284211) Modified: trunk/libzypp/libzypp.spec.cmake trunk/libzypp/zypp/KeyRing.cc Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=5762&r1=5761&r2=5762&view=diff ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Mon Jun 18 09:47:27 2007 @@ -26,7 +26,7 @@ BuildRequires: sqlite sqlite-devel BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ graphviz hal-devel libxml2-devel rpm-devel gettext-devel BuildRequires: update-desktop-files - +Requires: gpg2 %description Package, Patch, Pattern, and Product Management Modified: trunk/libzypp/zypp/KeyRing.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/KeyRing.cc?rev=5762&r1=5761&r2=5762&view=diff ============================================================================== --- trunk/libzypp/zypp/KeyRing.cc (original) +++ trunk/libzypp/zypp/KeyRing.cc Mon Jun 18 09:47:27 2007 @@ -32,6 +32,8 @@ #undef ZYPP_BASE_LOGGER_LOGGROUP #define ZYPP_BASE_LOGGER_LOGGROUP "zypp::KeyRing" +#define GPG_BINARY "/usr/bin/gpg2" + /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// @@ -262,7 +264,7 @@ { const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--quiet", "--no-tty", @@ -397,7 +399,7 @@ const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--quiet", "--list-public-keys", @@ -476,7 +478,7 @@ const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--quiet", "--no-tty", @@ -503,7 +505,7 @@ { const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--yes", "--quiet", @@ -537,7 +539,7 @@ const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--quiet", "--no-tty", @@ -580,7 +582,7 @@ { const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--quiet", "--no-tty", -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org