Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/gpgme/patches/000-gpgme-config.in.patch
author Girish Moodalbail <Girish.Moodalbail@oracle.COM>
Wed, 01 Jul 2015 10:21:52 -0700
changeset 4582 cfdc60640ff6
parent 4296 f17a315fb096
permissions -rw-r--r--
21356776 evs-neutron migration script should exit gracefully if there is nothing to do
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4296
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
# Internal patch.
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
# GpgME can't find /usr/bin/gpg2 and /usr/bin/gpgsm,
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
# which are needed by gpgme-config. So, we have to find
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
# them instead.
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
# Not for upstream because they should fix this.
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
--- src/gpgme-config.in	2013-03-15 12:27:33.000000000 -0700
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
+++ src/gpgme-config.in	2015-05-14 12:28:27.296390126 -0700
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
@@ -179,10 +179,10 @@
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
 	    fi
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
 	    ;;
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
         --get-gpg)
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
-            output="$output @GPG@"
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
+            output="$output /usr/bin/gpg2"
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
             ;;
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
         --get-gpgsm)
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
-            output="$output @GPGSM@"
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
+            output="$output /usr/bin/gpgsm"
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
             ;;
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
 	*)
f17a315fb096 21091953 upgrade GPGME to 1.5.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
             usage 1 1>&2
upstream/oracle/userland-gate