Mercurial > oi > oi-build

changeset 410:fdc3e8fcde4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7067219 libksba and libassuan conflict with gnupg
author Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
date Mon, 18 Jul 2011 07:15:35 -0700
parents 9f1b2b9b0fd9
children 47dc7d1d6551
files components/gnupg/gnupg.p5m components/gpgme/gpgme.p5m components/libassuan/libassuan.p5m components/libksba/libksba.p5m components/pinentry/pinentry.p5m
diffstat 5 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/components/gnupg/gnupg.p5m	Mon Jul 18 05:47:13 2011 -0700
+++ b/components/gnupg/gnupg.p5m	Mon Jul 18 07:15:35 2011 -0700
@@ -228,4 +228,4 @@
     desc="GnuPG - secure communication and data storage utility" \
     name="Gnu secure communication and data storage utility"
 #
-
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/pinentry type=require
--- a/components/gpgme/gpgme.p5m	Mon Jul 18 05:47:13 2011 -0700
+++ b/components/gpgme/gpgme.p5m	Mon Jul 18 07:15:35 2011 -0700
@@ -75,4 +75,4 @@
 #
 license gpgme.license license="GPLv2, LGPLv2"
 #
-
+depend type=optional fmri=crypto/gnupg@2.0.17-0.169
--- a/components/libassuan/libassuan.p5m	Mon Jul 18 05:47:13 2011 -0700
+++ b/components/libassuan/libassuan.p5m	Mon Jul 18 07:15:35 2011 -0700
@@ -54,4 +54,4 @@
 link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.1.0
 #
 license libassuan.license license="GPLv3, LGPLv2"
-
+depend type=optional fmri=crypto/gnupg@2.0.17-0.169
--- a/components/libksba/libksba.p5m	Mon Jul 18 05:47:13 2011 -0700
+++ b/components/libksba/libksba.p5m	Mon Jul 18 07:15:35 2011 -0700
@@ -54,4 +54,4 @@
 link path=usr/lib/$(MACH64)/libksba.so target=libksba.so.8.10.0
 #
 license libksba.license license="GPLv3"
-
+depend type=optional fmri=crypto/gnupg@2.0.17-0.169
--- a/components/pinentry/pinentry.p5m	Mon Jul 18 05:47:13 2011 -0700
+++ b/components/pinentry/pinentry.p5m	Mon Jul 18 07:15:35 2011 -0700
@@ -44,4 +44,4 @@
 link path=usr/lib/pinentry target=pinentry-gtk-2
 #
 license pinentry.license license="GPLv2"
-
+depend type=optional fmri=crypto/gnupg@2.0.17-0.169