packages: pinentry/pinentry-system-assuan.patch - adjust for libassuan1

[shadzik]

Author: shadzik                      Date: Tue Mar 30 22:37:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjust for libassuan1

---- Files affected:
packages/pinentry:
   pinentry-system-assuan.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/pinentry/pinentry-system-assuan.patch
diff -u packages/pinentry/pinentry-system-assuan.patch:1.4 packages/pinentry/pinentry-system-assuan.patch:1.5
--- packages/pinentry/pinentry-system-assuan.patch:1.4	Sun Jul 26 00:08:47 2009
+++ packages/pinentry/pinentry-system-assuan.patch	Wed Mar 31 00:37:05 2010
@@ -16,7 +16,7 @@
  AM_CPPFLAGS = $(NCURSES_INCLUDE) -I$(top_srcdir)/pinentry
  LDADD = ../pinentry/libpinentry.a ../pinentry/libpinentry-curses.a \
 -	../assuan/libassuan.a ../secmem/libsecmem.a \
-+	-lassuan ../secmem/libsecmem.a \
++	-lassuan1 ../secmem/libsecmem.a \
  	$(LIBCAP) $(LIBCURSES) $(LIBICONV)
  
  pinentry_curses_SOURCES = pinentry-curses.c
@@ -27,7 +27,7 @@
  AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(ncurses_include) \
  	-I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
 -LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
-+LDADD = ../pinentry/libpinentry.a -lassuan ../secmem/libsecmem.a \
++LDADD = ../pinentry/libpinentry.a -lassuan1 ../secmem/libsecmem.a \
  	$(LIBCAP) $(GTK_LIBS) $(libcurses)
  
  pinentry_gtk_SOURCES = pinentry-gtk.c \
@@ -43,7 +43,7 @@
  AM_CXXFLAGS = $(QT_CXXFLAGS)
  pinentry_qt_LDADD = $(QT_LIBS) $(libcurses) ../pinentry/libpinentry.a \
 -	$(top_builddir)/assuan/libassuan.a \
-+	-lassuan \
++	-lassuan1 \
  	$(top_builddir)/secmem/libsecmem.a $(LIBCAP)
  pinentry_qt_LDFLAGS = $(QT_LDFLAGS) $(QT_RPATH)
  
@@ -84,7 +84,7 @@
  AM_CPPFLAGS = $(GTK2CFLAGS) $(ncurses_include) \
  	-I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
 -LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
-+LDADD = ../pinentry/libpinentry.a -lassuan ../secmem/libsecmem.a \
++LDADD = ../pinentry/libpinentry.a -lassuan1 ../secmem/libsecmem.a \
  	$(LIBCAP) $(GTK2LIBS) $(libcurses)
  
  pinentry_gtk_2_SOURCES = pinentry-gtk-2.c \
@@ -100,7 +100,7 @@
  AM_CXXFLAGS = $(QT4_CORE_CFLAGS) $(QT4_GUI_CFLAGS)
  pinentry_qt4_LDADD = $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) \
 -	../pinentry/libpinentry.a $(top_builddir)/assuan/libassuan.a \
-+	../pinentry/libpinentry.a -lassuan \
++	../pinentry/libpinentry.a -lassuan1 \
  	$(top_builddir)/secmem/libsecmem.a $(LIBCAP)
  
  pinentry_qt4_SOURCES = pinentrydialog.h pinentrydialog.cpp \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pinentry/pinentry-system-assuan.patch?r1=1.4&r2=1.5&f=u