Mercurial Mercurial > upstream > spec-files-extra / 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.
patches/gnupg2-04-keyserver-sm-Makefile.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 1402 4b8e841da99c
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1402
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
     1
 
Index: gnupg-2.0.8/keyserver/Makefile.in
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
     2
 
===================================================================
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
     3
 
--- gnupg-2.0.8-orig/keyserver/Makefile.in	(revision 2578)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
     4
 
+++ gnupg-2.0.8/keyserver/Makefile.in	(working copy)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
     5
 
@@ -397,13 +397,13 @@
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
     6
 
 	$(am__append_8)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
     7
 
 @FAKE_CURL_FALSE@gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
     8
 
 @FAKE_CURL_TRUE@gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
     9
 
-@FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    10
 
+@FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(LIBCURL) $(GETOPT) $(NETLIBS) $(DNSLIBS) $(other_libs)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    11
 
 @FAKE_CURL_TRUE@gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    12
 
 @FAKE_CURL_TRUE@	              $(other_libs)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    13
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    14
 
 @FAKE_CURL_FALSE@gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    15
 
 @FAKE_CURL_TRUE@gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    16
 
-@FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    17
 
+@FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(LIBCURL) $(GETOPT) $(NETLIBS) $(DNSLIBS) $(other_libs)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    18
 
 @FAKE_CURL_TRUE@gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    19
 
 @FAKE_CURL_TRUE@	             $(other_libs)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    20
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    21
 
Index: gnupg-2.0.8/keyserver/Makefile.am
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    22
 
===================================================================
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    23
 
--- gnupg-2.0.8-orig/keyserver/Makefile.am	(revision 2578)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    24
 
+++ gnupg-2.0.8/keyserver/Makefile.am	(working copy)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    25
 
@@ -61,9 +61,9 @@
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    26
 
 	             $(other_libs)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    27
 
 else
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    28
 
 gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    29
 
-gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    30
 
+gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(LIBCURL) $(GETOPT) $(NETLIBS) $(DNSLIBS) $(other_libs)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    31
 
 gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    32
 
-gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    33
 
+gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(LIBCURL) $(GETOPT) $(NETLIBS) $(DNSLIBS) $(other_libs)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    34
 
 endif
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    35
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    36
 
 # Make sure that all libs are build before we use them.  This is
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    37
 
Index: gnupg-2.0.8/sm/Makefile.in
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    38
 
===================================================================
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    39
 
--- gnupg-2.0.8-orig/sm/Makefile.in	(revision 2578)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    40
 
+++ gnupg-2.0.8/sm/Makefile.in	(working copy)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    41
 
@@ -366,7 +366,7 @@
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    42
 
 	certreqgen-ui.c \
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    43
 
 	qualified.c
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    44
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    45
 
-common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    46
 
+common_libs = $(libcommon) ../kbx/keybox-blob.o ../kbx/keybox-file.o ../kbx/keybox-init.o ../kbx/keybox-openpgp.o ../kbx/keybox-search.o ../kbx/keybox-update.o ../kbx/keybox-util.o ../jnlib/libjnlib.a \
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    47
 
               ../gl/libgnu.a
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    48
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    49
 
 gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    50
 
Index: gnupg-2.0.8/sm/Makefile.am
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    51
 
===================================================================
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    52
 
--- gnupg-2.0.8-orig/sm/Makefile.am	(revision 2578)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    53
 
+++ gnupg-2.0.8/sm/Makefile.am	(working copy)
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    54
 
@@ -52,7 +52,7 @@
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    55
 
 	qualified.c
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    56
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    57
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    58
 
-common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    59
 
+common_libs = $(libcommon) ../kbx/keybox-blob.o ../kbx/keybox-file.o ../kbx/keybox-init.o ../kbx/keybox-openpgp.o ../kbx/keybox-search.o ../kbx/keybox-update.o ../kbx/keybox-util.o ../jnlib/libjnlib.a \
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    60
 
               ../gl/libgnu.a
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    61
4b8e841da99c * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
markwright
parents:
diff changeset 
    62
 
 gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
upstream/spec-files-extra