rpm/cyrus-sasl
SHA256
1
0
Fork 0
forked from pool/cyrus-sasl
Code Pull Requests Activity

Accepting request 41224 from network

Browse Source 
checked in (request 41224)

OBS-URL: https://build.opensuse.org/request/show/41224
OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=15
This commit is contained in:
OBS User autobuild 2010-06-09 14:42:08 +00:00 committed by Git OBS Bridge
parent 620ed2d85f
commit e398ddfa31
4 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cyrus-sasl-saslauthd.changes
View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
Mon Jun 7 06:15:02 UTC 2010 - coolo@novell.com
- add dependency to avoid broken parallel make
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 10 12:53:14 UTC 2010 - rhafer@novell.com Mon May 10 12:53:14 UTC 2010 - rhafer@novell.com

5
cyrus-sasl.changes
View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
Mon Jun 7 06:15:02 UTC 2010 - coolo@novell.com
- add dependency to avoid broken parallel make
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 10 12:53:14 UTC 2010 - rhafer@novell.com Mon May 10 12:53:14 UTC 2010 - rhafer@novell.com

29
cyrus-sasl.dif
View File

@ -1,7 +1,7 @@
Index: cmulocal/cyrus.m4 Index: cmulocal/cyrus.m4
=================================================================== ===================================================================
--- cmulocal/cyrus.m4.orig 2009-04-28 17:09:13.000000000 +0200 --- cmulocal/cyrus.m4.orig
+++ cmulocal/cyrus.m4 2010-06-07 15:27:08.000000000 +0200 +++ cmulocal/cyrus.m4
@@ -37,7 +37,7 @@ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [ @@ -37,7 +37,7 @@ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
SAVE_LDFLAGS="${LDFLAGS}" SAVE_LDFLAGS="${LDFLAGS}"
LDFLAGS="-R /usr/lib" LDFLAGS="-R /usr/lib"
@ -13,8 +13,8 @@ Index: cmulocal/cyrus.m4
]) ])
Index: Makefile.am Index: Makefile.am
=================================================================== ===================================================================
--- Makefile.am.orig 2006-05-19 16:45:21.000000000 +0200 --- Makefile.am.orig
+++ Makefile.am 2010-06-07 15:27:08.000000000 +0200 +++ Makefile.am
@@ -43,6 +43,7 @@ AUTOMAKE_OPTIONS = 1.7 @@ -43,6 +43,7 @@ AUTOMAKE_OPTIONS = 1.7
# #
################################################################ ################################################################
@ -25,8 +25,8 @@ Index: Makefile.am
else else
Index: configure.in Index: configure.in
=================================================================== ===================================================================
--- configure.in.orig 2009-04-28 17:18:04.000000000 +0200 --- configure.in.orig
+++ configure.in 2010-06-07 15:27:08.000000000 +0200 +++ configure.in
@@ -52,6 +52,7 @@ AC_CACHE_LOAD @@ -52,6 +52,7 @@ AC_CACHE_LOAD
fi fi
@ -37,8 +37,8 @@ Index: configure.in
Index: plugins/Makefile.am Index: plugins/Makefile.am
=================================================================== ===================================================================
--- plugins/Makefile.am.orig 2009-04-28 17:09:17.000000000 +0200 --- plugins/Makefile.am.orig
+++ plugins/Makefile.am 2010-06-07 15:27:08.000000000 +0200 +++ plugins/Makefile.am
@@ -46,23 +46,10 @@ @@ -46,23 +46,10 @@
# Library version info - here at the top, for sanity # Library version info - here at the top, for sanity
@ -143,8 +143,8 @@ Index: plugins/Makefile.am
Index: sasldb/Makefile.am Index: sasldb/Makefile.am
=================================================================== ===================================================================
--- sasldb/Makefile.am.orig 2009-04-28 17:09:18.000000000 +0200 --- sasldb/Makefile.am.orig
+++ sasldb/Makefile.am 2010-06-07 15:28:37.000000000 +0200 +++ sasldb/Makefile.am
@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top @@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
@ -153,12 +153,3 @@ Index: sasldb/Makefile.am
EXTRA_DIST = NTMakefile EXTRA_DIST = NTMakefile
noinst_LTLIBRARIES = libsasldb.la noinst_LTLIBRARIES = libsasldb.la
@@ -66,3 +67,8 @@ libsasldb.a: libsasldb.la $(SASL_DB_BACK
$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
+# avoid these two files created at the same time, they use both the same
+# dep file
+db_berkeley.lo: db_berkeley.o
+allockey.lo: allockey.o
+