OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=47

2008-08-08 15:23:33 +00:00 · 2008-08-08 15:23:33 +00:00 · 87bfedae71
commit 87bfedae71
parent 28974b8436
4 changed files with 46 additions and 13 deletions
--- a/build.diff
+++ b/build.diff
@ -167,12 +167,24 @@ Index: Makefile.am
 dnl TVM:
 dnl horrible *temporary* hack to make sure that if we found gettext() in
 dnl -lintl that we add -lintl *back* to $LIBS.
-@@ -943,54 +919,74 @@ withval=auto
+@@ -943,54 +919,86 @@ withval=auto
 AC_ARG_WITH(python, [  --with-python           build rpm python bindings ])
 
 WITH_PYTHON_VERSION=$withval
 -if test $withval = auto ; then
 
+if test "$WITH_PYTHON_VERSION" = auto ; then
+AC_MSG_CHECKING(for python 2.6)
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <python2.6/Python.h>
+main() {
+  exit(strncmp("2.6", PY_VERSION, 3));
+} ]])],[withval=yes],[withval=no],[withval=yes])
+AC_MSG_RESULT($withval)
+if test $withval = yes ; then
+  WITH_PYTHON_VERSION="2.6"
+fi
+fi
 +if test "$WITH_PYTHON_VERSION" = auto ; then
 +AC_MSG_CHECKING(for python 2.5)
 +AC_RUN_IFELSE([AC_LANG_SOURCE([[
@ -283,7 +295,7 @@ Index: Makefile.am
 fi
 
 if test "$WITH_PYTHON_VERSION" != no ; then
-@@ -1283,6 +1279,7 @@ arm*)		RPMCANONCOLOR=0; RPMCANONARCH="${
+@@ -1283,6 +1291,7 @@ arm*)		RPMCANONCOLOR=0; RPMCANONARCH="${
 mipsel*)	RPMCANONCOLOR=0; RPMCANONARCH=mipsel ;;
 mips*)		RPMCANONCOLOR=0; RPMCANONARCH=mips ;;
 m68k*)		RPMCANONCOLOR=0; RPMCANONARCH=m68k ;;
@ -291,7 +303,7 @@ Index: Makefile.am
 *)		RPMCANONCOLOR=0; RPMCANONARCH=unknown ;;
 esac
 case "${build_os_noversion}" in
-@@ -1290,7 +1287,8 @@ mint)		RPMCANONARCH=m68kmint ;;
+@@ -1290,7 +1299,8 @@ mint)		RPMCANONARCH=m68kmint ;;
 esac
 RPMCANONVENDOR="$build_vendor"
 case "${build_vendor}" in
@ -301,7 +313,7 @@ Index: Makefile.am
 	test -f /etc/redhat-release &&		RPMCANONVENDOR=redhat
 	test -f /etc/pld-release &&		RPMCANONVENDOR=pld
 	test -f /etc/mandrake-release &&	RPMCANONVENDOR=mandrake
-@@ -1372,7 +1370,7 @@ dnl XXX this causes popt to depend on zl
+@@ -1372,7 +1382,7 @@ dnl XXX this causes popt to depend on zl
 dnl # XXX Propagate -lucb to popt ...
 dnl export LIBS INCPATH CONFIG_SITE
 
--- a/rpm-python.changes
+++ b/rpm-python.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug  7 16:05:51 CEST 2008 - dmueller@suse.de
+
+- fix build against python 2.6
+
 -------------------------------------------------------------------
 Thu Mar 27 14:47:18 CET 2008 - coolo@suse.de

--- a/rpm-python.spec
+++ b/rpm-python.spec
@ -2,9 +2,16 @@
 # spec file for package rpm-python (Version 4.4.2)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

@ -17,7 +24,7 @@ License:        GPL v2 or later
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        251
+Release:        265
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec
@ -62,13 +69,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/python*

 %changelog
+* Thu Aug 07 2008 dmueller@suse.de
+- fix build against python 2.6
 * Thu Mar 27 2008 coolo@suse.de
 - fix buildrequires
 * Fri May 25 2007 mls@suse.de
 - fix unicode queries
 * Fri Mar 30 2007 rguenther@suse.de
 - add ncurses-devel and zlib-devel BuildRequires.
-* Wed Oct 18 2006 mls@suse.de
+* Thu Oct 19 2006 mls@suse.de
 - use rpm.spec for building instead of duplication everything
 - delete superfluous .a and .la files [#202604]
 - create .pyc and .pyo files [#205711]
--- a/rpm.spec
+++ b/rpm.spec
@ -2,9 +2,16 @@
 # spec file for package rpm (Version 4.4.2)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

@ -20,7 +27,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        203
+Release:        209
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@ -353,7 +360,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        431
+Release:        437
 #

 %description -n popt
@ -376,7 +383,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        431
+Release:        437
 Requires:       popt = 1.7
 Requires:       glibc-devel