瀏覽代碼

upgrading package: gsasl 0.2.29 -> 1.3.91

Ralf S. Engelschall 16 年之前
父節點
當前提交
d03d9ee690
共有 2 個文件被更改,包括 22 次插入20 次删除
  1. 18 18
      gsasl/gsasl.patch
  2. 4 2
      gsasl/gsasl.spec

+ 18 - 18
gsasl/gsasl.patch

@@ -1,33 +1,33 @@
 Index: Makefile.in
---- Makefile.in.orig	2008-10-21 18:21:20 +0200
-+++ Makefile.in	2009-01-30 21:04:18 +0100
-@@ -607,7 +607,7 @@
+--- Makefile.in.orig	2009-11-06 15:49:23 +0100
++++ Makefile.in	2009-11-06 20:22:53 +0100
+@@ -813,7 +813,7 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--SUBDIRS = po gl lib src examples gltests tests doc
+-SUBDIRS = lib po gl src examples tests doc gltests
 +SUBDIRS = po gl src
  EXTRA_DIST = cfg.mk maint.mk .clcopying
- ACLOCAL_AMFLAGS = -I m4 -I gl/m4
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-obsolete \
+ ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/m4 -I lib/gl/m4
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-obsolete
 Index: src/Makefile.in
---- src/Makefile.in.orig	2008-10-21 18:21:20 +0200
-+++ src/Makefile.in	2009-01-30 21:05:34 +0100
-@@ -121,7 +121,7 @@
- am_gsasl_OBJECTS = gsasl.$(OBJEXT) $(am__objects_1) imap.$(OBJEXT) \
- 	smtp.$(OBJEXT) callbacks.$(OBJEXT)
+--- src/Makefile.in.orig	2009-11-06 15:49:22 +0100
++++ src/Makefile.in	2009-11-06 20:23:58 +0100
+@@ -147,7 +147,7 @@
+ 	callbacks.$(OBJEXT)
  gsasl_OBJECTS = $(am_gsasl_OBJECTS)
--gsasl_DEPENDENCIES = ../lib/src/libgsasl.la ../gl/libgl.la
-+gsasl_DEPENDENCIES = ../gl/libgl.la
+ am__DEPENDENCIES_1 =
+-gsasl_DEPENDENCIES = ../lib/src/libgsasl.la ../gl/libgl.la \
++gsasl_DEPENDENCIES = ../gl/libgl.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libgsasl_cmd.la
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
- am__depfiles_maybe = depfiles
-@@ -608,7 +608,7 @@
+@@ -796,7 +796,7 @@
  	imap.c imap.h smtp.c smtp.h \
  	callbacks.h callbacks.c internal.h
  
 -gsasl_LDADD = ../lib/src/libgsasl.la ../gl/libgl.la \
 +gsasl_LDADD = @LDFLAGS@ @LIBS@ ../gl/libgl.la \
- 	@LTLIBREADLINE@ @LTLIBGNUTLS@
+ 	$(LTLIBREADLINE) $(LTLIBGNUTLS) $(LIBSOCKET) $(LTLIBINTL) \
+ 	libgsasl_cmd.la
  
- all: $(BUILT_SOURCES)

+ 4 - 2
gsasl/gsasl.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Cryptography
 License:      GPL
-Version:      0.2.29
-Release:      20090130
+Version:      1.3.91
+Release:      20091106
 
 #   package options
 %option       with_kerberos  no
@@ -70,10 +70,12 @@ AutoReqProv:  no
     %patch -p0
 
 %build
+    mv lib/build-aux .
     rm -rf lib/*
     ( echo "#!/bin/sh"
       echo "true"
     ) >lib/configure
+    mv build-aux lib/
     chmod a+x lib/configure
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \