From 5ce52dbafcedc071899612bde1d4517b2872f166dc32bf0746664b2395ec0a6b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 26 Jun 2008 16:55:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=45 --- db.diff | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ rpm-python.spec | 2 +- rpm.changes | 5 +++++ rpm.spec | 9 ++++---- 4 files changed, 71 insertions(+), 5 deletions(-) diff --git a/db.diff b/db.diff index e608601..741de66 100644 --- a/db.diff +++ b/db.diff @@ -53,6 +53,66 @@ if test "$db_cv_cxx" = "yes"; then AC_MSG_ERROR( [--with-uniquename is not compatible with --enable-cxx]) +--- db/dist/configure.ac ++++ db/dist/configure.ac +@@ -690,14 +690,14 @@ LTLIBOBJS=`echo "$LIB@&t@OBJS" | + AC_SUBST(LTLIBOBJS) + + # Initial output file list. +-CREATE_LIST="Makefile +- db_cxx.h:$srcdir/../dbinc/db_cxx.in +- db_int.h:$srcdir/../dbinc/db_int.in ++CREATE_LIST="Makefile \ ++ db_cxx.h:$srcdir/../dbinc/db_cxx.in \ ++ db_int.h:$srcdir/../dbinc/db_int.in \ + include.tcl:$srcdir/../test/include.tcl" + + # MinGW needs win_db.h. + if test "$db_cv_mingw" = "yes"; then +-CREATE_LIST="$CREATE_LIST ++CREATE_LIST="$CREATE_LIST \ + win_db.h:$srcdir/win_db.in" + fi + +@@ -705,10 +705,10 @@ fi + # prototypes, and, if configured for unique names, a list of #defines + # to do DB_VERSION_UNIQUE_NAME substitution. + if test "$db_cv_uniquename" = "yes"; then +- CREATE_LIST="$CREATE_LIST ++ CREATE_LIST="$CREATE_LIST \ + db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/ext_def.in:$srcdir/../dbinc_auto/ext_prot.in" + else +- CREATE_LIST="$CREATE_LIST ++ CREATE_LIST="$CREATE_LIST \ + db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/ext_prot.in" + fi + +@@ -716,7 +716,7 @@ fi + # does the DB_VERSION_UNIQUE_NAME substitution), which is included by + # the db_int.h file. + if test "$db_cv_uniquename" = "yes"; then +- CREATE_LIST="$CREATE_LIST ++ CREATE_LIST="$CREATE_LIST \ + db_int_def.h:$srcdir/../dbinc_auto/int_def.in" + db_int_def='#include "db_int_def.h"' + fi +@@ -726,12 +726,12 @@ fi + # of #defines to do DB_VERSION_UNIQUE_NAME substitution. + if test "$db_cv_compat185" = "yes"; then + if test "$db_cv_uniquename" = "yes"; then +- CREATE_LIST="$CREATE_LIST +- db_185.h:$srcdir/../dbinc/db_185.in:$srcdir/../dbinc_auto/ext_185_def.in:$srcdir/../dbinc_auto/ext_185_prot.in ++ CREATE_LIST="$CREATE_LIST \ ++ db_185.h:$srcdir/../dbinc/db_185.in:$srcdir/../dbinc_auto/ext_185_def.in:$srcdir/../dbinc_auto/ext_185_prot.in \ + db185_int.h:$srcdir/../db185/db185_int.in:$srcdir/../dbinc_auto/ext_185_def.in:$srcdir/../dbinc_auto/ext_185_prot.in" + else +- CREATE_LIST="$CREATE_LIST +- db_185.h:$srcdir/../dbinc/db_185.in:$srcdir/../dbinc_auto/ext_185_prot.in ++ CREATE_LIST="$CREATE_LIST \ ++ db_185.h:$srcdir/../dbinc/db_185.in:$srcdir/../dbinc_auto/ext_185_prot.in \ + db185_int.h:$srcdir/../db185/db185_int.in:$srcdir/../dbinc_auto/ext_185_prot.in" + fi + fi --- db/dist/s_config +++ db/dist/s_config @@ -8,7 +8,8 @@ trap 'rm -f aclocal.m4 ; exit 0' 0 1 2 3 diff --git a/rpm-python.spec b/rpm-python.spec index 81ee893..d364953 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -17,7 +17,7 @@ License: GPL v2 or later Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 243 +Release: 249 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.changes b/rpm.changes index ac9c00d..61e73fb 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 26 18:40:46 CEST 2008 - schwab@suse.de + +- Fix db configure script. + ------------------------------------------------------------------- Thu May 15 14:31:51 CEST 2008 - dmueller@suse.de diff --git a/rpm.spec b/rpm.spec index c9c1e3c..6d6d4a6 100644 --- a/rpm.spec +++ b/rpm.spec @@ -8,7 +8,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: rpm @@ -21,7 +20,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 196 +Release: 201 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -353,7 +352,7 @@ Summary: A C library for parsing command line parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 424 +Release: 429 # %description -n popt @@ -376,7 +375,7 @@ Summary: C Library for Parsing Command Line Parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 424 +Release: 429 Requires: popt = 1.7 Requires: glibc-devel @@ -411,6 +410,8 @@ Authors: %doc %{_mandir}/man3/popt.3* %changelog +* Thu Jun 26 2008 schwab@suse.de +- Fix db configure script. * Thu May 15 2008 dmueller@suse.de - remove references to brp-strip-comment-note (bnc#390163) * Tue May 06 2008 mls@suse.de