Accepting request 41203 from home:coolo:branches:openSUSE:Factory

Copy from home:coolo:branches:openSUSE:Factory/cyrus-sasl via accept of submit request 41203 revision 2.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/41203
OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=13
This commit is contained in:
Pavol Rusnak 2010-06-07 09:52:59 +00:00 committed by Git OBS Bridge
parent 330ff8b66b
commit 96fcb7ad46
4 changed files with 29 additions and 11 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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

View File

@ -27,7 +27,7 @@ AutoReqProv: on
Provides: cyrus-sasl:/usr/sbin/saslauthd Provides: cyrus-sasl:/usr/sbin/saslauthd
Provides: cyrus-sasl2:/usr/sbin/saslauthd Provides: cyrus-sasl2:/usr/sbin/saslauthd
Summary: The SASL Authentication Server Summary: The SASL Authentication Server
Version: 2.1.23 Version: 2.1.23
Release: 6 Release: 6
Source: cyrus-sasl-%{version}.tar.bz2 Source: cyrus-sasl-%{version}.tar.bz2
Source1: cyrus-sasl-rc.tar.bz2 Source1: cyrus-sasl-rc.tar.bz2

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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

View File

@ -1,7 +1,7 @@
Index: cmulocal/cyrus.m4 Index: cmulocal/cyrus.m4
=================================================================== ===================================================================
--- cmulocal/cyrus.m4.orig --- cmulocal/cyrus.m4.orig 2010-06-07 08:12:01.970338718 +0200
+++ cmulocal/cyrus.m4 +++ cmulocal/cyrus.m4 2010-06-07 08:12:05.411368488 +0200
@@ -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 --- Makefile.am.orig 2010-06-07 08:12:01.970338718 +0200
+++ Makefile.am +++ Makefile.am 2010-06-07 08:12:05.412348032 +0200
@@ -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 --- configure.in.orig 2010-06-07 08:12:01.970338718 +0200
+++ configure.in +++ configure.in 2010-06-07 08:12:05.412348032 +0200
@@ -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 --- plugins/Makefile.am.orig 2010-06-07 08:12:01.970338718 +0200
+++ plugins/Makefile.am +++ plugins/Makefile.am 2010-06-07 08:12:05.413338170 +0200
@@ -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 --- sasldb/Makefile.am.orig 2010-06-07 08:12:02.020337539 +0200
+++ sasldb/Makefile.am +++ sasldb/Makefile.am 2010-06-07 08:12:47.433338361 +0200
@@ -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,3 +153,11 @@ Index: sasldb/Makefile.am
EXTRA_DIST = NTMakefile EXTRA_DIST = NTMakefile
noinst_LTLIBRARIES = libsasldb.la noinst_LTLIBRARIES = libsasldb.la
@@ -66,3 +67,7 @@ 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
+