rpms/ogmrip/F-13 ogmrip-0.13.4-build_fix.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 ogmrip.spec, 1.6, 1.7 sources, 1.5, 1.6
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29928
Modified Files:
.cvsignore ogmrip.spec sources
Added Files:
ogmrip-0.13.4-build_fix.patch
Log Message:
* Mon Mar 22 2010 Gianluca Sforna <giallu gmail com> - 0.13.4-1
- New upstream release
- Add patch to compile against GTK 2.19
ogmrip-0.13.4-build_fix.patch:
ogmrip-source-chooser-widget.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE ogmrip-0.13.4-build_fix.patch ---
diff --git a/libogmrip-gtk/ogmrip-source-chooser-widget.c b/libogmrip-gtk/ogmrip-source-chooser-widget.c
index 2b56a36..87e69c2 100644
--- a/libogmrip-gtk/ogmrip-source-chooser-widget.c
+++ b/libogmrip-gtk/ogmrip-source-chooser-widget.c
@@ -543,7 +543,7 @@ ogmrip_source_chooser_widget_changed (GtkComboBox *combo_box)
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (chooser));
- if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel))
+ if (gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel))
{
if (GTK_WINDOW (toplevel) != gtk_window_get_transient_for (GTK_WINDOW (chooser->priv->dialog)))
gtk_window_set_transient_for (GTK_WINDOW (chooser->priv->dialog), GTK_WINDOW (toplevel));
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 24 Dec 2009 16:02:21 -0000 1.5
+++ .cvsignore 23 Mar 2010 21:13:59 -0000 1.6
@@ -1 +1 @@
-ogmrip-0.13.3.tar.gz
+ogmrip-0.13.4.tar.gz
Index: ogmrip.spec
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-13/ogmrip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ogmrip.spec 24 Dec 2009 16:02:21 -0000 1.6
+++ ogmrip.spec 23 Mar 2010 21:13:59 -0000 1.7
@@ -1,5 +1,5 @@
Name: ogmrip
-Version: 0.13.3
+Version: 0.13.4
Release: 1%{?dist}
Summary: DVD ripping and encoding graphical user interface
@@ -32,6 +32,7 @@
Requires(post): GConf2
Requires(postun): GConf2
+Patch0: ogmrip-0.13.4-build_fix.patch
%description
OGMRip is an application and a set of libraries for ripping and encoding DVDs
@@ -58,7 +59,7 @@
%prep
%setup -q
-
+%patch0 -p1
%build
%configure \
@@ -135,6 +136,10 @@
%changelog
+* Mon Mar 22 2010 Gianluca Sforna <giallu gmail com> - 0.13.4-1
+- New upstream release
+- Add patch to compile against GTK 2.19
+
* Thu Dec 24 2009 Gianluca Sforna <giallu gmail com> - 0.13.3-1
- New upstream release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-13/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 24 Dec 2009 16:02:21 -0000 1.5
+++ sources 23 Mar 2010 21:13:59 -0000 1.6
@@ -1 +1 @@
-5c74da4e53e94d3bf2d57a3068cea151 ogmrip-0.13.3.tar.gz
+cf4b970312a4cb03864b498c02b68837 ogmrip-0.13.4.tar.gz
14 years, 8 months
rpms/mythtv/devel mythbackend.init.in,1.2,1.3
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30773
Modified Files:
mythbackend.init.in
Log Message:
Fix service mythbackend status exit code
Index: mythbackend.init.in
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythbackend.init.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythbackend.init.in 11 Feb 2010 19:31:38 -0000 1.2
+++ mythbackend.init.in 23 Mar 2010 04:15:54 -0000 1.3
@@ -59,6 +59,7 @@
;;
status)
status $prog
+ RETVAL=$?
;;
*)
echo $"Usage: $prog {start|stop|status|restart}"
14 years, 8 months
rpms/mythtv/F-13 mythbackend.init.in, 1.2, 1.3 mythtv.spec, 1.69, 1.70 sources, 1.43, 1.44
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30742
Modified Files:
mythbackend.init.in mythtv.spec sources
Log Message:
* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1
- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less)
Index: mythbackend.init.in
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-13/mythbackend.init.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythbackend.init.in 11 Feb 2010 19:31:38 -0000 1.2
+++ mythbackend.init.in 23 Mar 2010 04:15:21 -0000 1.3
@@ -59,6 +59,7 @@
;;
status)
status $prog
+ RETVAL=$?
;;
*)
echo $"Usage: $prog {start|stop|status|restart}"
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-13/mythtv.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- mythtv.spec 9 Mar 2010 18:35:55 -0000 1.69
+++ mythtv.spec 23 Mar 2010 04:15:21 -0000 1.70
@@ -65,7 +65,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r23702
+%define _svnrev r23781
%define branch trunk
#
@@ -79,7 +79,8 @@
# Version/Release info
Version: 0.23
%if "%{branch}" == "trunk"
-Release: 0.1.svn.%{_svnrev}%{?dist}
+#Release: 0.1.svn.%{_svnrev}%{?dist}
+Release: 0.2.rc1%{?dist}
%else
Release: 1%{?dist}
%endif
@@ -1484,6 +1485,12 @@
################################################################################
%changelog
+* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1
+- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less)
+
+* Thu Mar 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23718
+- Update to svn trunk, revision 23718
+
* Tue Mar 09 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23702
- Update to svn trunk, revision 23702
- Add missing Requires: python-MythTV to mythvideo and mythnetvision plugins
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-13/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 9 Mar 2010 18:35:55 -0000 1.43
+++ sources 23 Mar 2010 04:15:21 -0000 1.44
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-444c04102545b08c8949192f8094ed05 mythplugins-0.23.tar.bz2
-a067129bbaf6e5b5cbfaa654bd599d1e mythtv-0.23.tar.bz2
+55ecf27cbca2b74e42d9cb59b8fb8ff6 mythtv-0.23.tar.bz2
+8a1b570ac6bf9f54077b8d2350fcc91e mythplugins-0.23.tar.bz2
14 years, 8 months
rpms/mythtv-themes/F-13 mythtv-themes.spec, 1.27, 1.28 sources, 1.21, 1.22
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv-themes/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30603
Modified Files:
mythtv-themes.spec sources
Log Message:
* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1
- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less)
Index: mythtv-themes.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/F-13/mythtv-themes.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mythtv-themes.spec 9 Mar 2010 18:38:50 -0000 1.27
+++ mythtv-themes.spec 23 Mar 2010 04:14:09 -0000 1.28
@@ -17,7 +17,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r23702
+%define _svnrev r23781
%define branch trunk
#
@@ -32,8 +32,8 @@
# Version/Release info
Version: 0.23
%if "%{branch}" == "trunk"
-#Release: 0.1.rc2%{?dist}
-Release: 0.1.svn.%{_svnrev}%{?dist}
+#Release: 0.1.svn.%{_svnrev}%{?dist}
+Release: 0.2.rc1%{?dist}
%else
Release: 1%{?dist}
%endif
@@ -112,6 +112,9 @@
%{_datadir}/fonts/%{name}/*.otf
%changelog
+* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1
+- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less)
+
* Tue Mar 09 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23702
- Update to pre-0.23 svn trunk, rev 23702
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/F-13/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 9 Mar 2010 18:38:50 -0000 1.21
+++ sources 23 Mar 2010 04:14:09 -0000 1.22
@@ -1,2 +1,2 @@
a5f00f152fb430a20c70aaa3bf456347 myththemes-0.22.tar.bz2
-748b160aa6c272656c260b8014190c55 myththemes-0.23.tar.bz2
+f04bfb1fcd3c21b0905f15b76be08ae2 myththemes-0.23.tar.bz2
14 years, 8 months
rpms/mythtv/devel mythtv.spec,1.69,1.70 sources,1.43,1.44
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30450
Modified Files:
mythtv.spec sources
Log Message:
* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1
- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less)
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- mythtv.spec 9 Mar 2010 18:35:55 -0000 1.69
+++ mythtv.spec 23 Mar 2010 04:12:49 -0000 1.70
@@ -65,7 +65,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r23702
+%define _svnrev r23781
%define branch trunk
#
@@ -79,7 +79,8 @@
# Version/Release info
Version: 0.23
%if "%{branch}" == "trunk"
-Release: 0.1.svn.%{_svnrev}%{?dist}
+#Release: 0.1.svn.%{_svnrev}%{?dist}
+Release: 0.2.rc1%{?dist}
%else
Release: 1%{?dist}
%endif
@@ -1484,6 +1485,12 @@
################################################################################
%changelog
+* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1
+- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less)
+
+* Thu Mar 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23718
+- Update to svn trunk, revision 23718
+
* Tue Mar 09 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23702
- Update to svn trunk, revision 23702
- Add missing Requires: python-MythTV to mythvideo and mythnetvision plugins
14 years, 8 months
rpms/ogmrip/devel ogmrip-0.13.4-build_fix.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 ogmrip.spec, 1.6, 1.7 sources, 1.5, 1.6
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1072
Modified Files:
.cvsignore ogmrip.spec sources
Added Files:
ogmrip-0.13.4-build_fix.patch
Log Message:
* Mon Mar 22 2010 Gianluca Sforna <giallu gmail com> - 0.13.4-1
- New upstream release
- Add patch to compile against GTK 2.19
ogmrip-0.13.4-build_fix.patch:
ogmrip-source-chooser-widget.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE ogmrip-0.13.4-build_fix.patch ---
diff --git a/libogmrip-gtk/ogmrip-source-chooser-widget.c b/libogmrip-gtk/ogmrip-source-chooser-widget.c
index 2b56a36..87e69c2 100644
--- a/libogmrip-gtk/ogmrip-source-chooser-widget.c
+++ b/libogmrip-gtk/ogmrip-source-chooser-widget.c
@@ -543,7 +543,7 @@ ogmrip_source_chooser_widget_changed (GtkComboBox *combo_box)
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (chooser));
- if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel))
+ if (gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel))
{
if (GTK_WINDOW (toplevel) != gtk_window_get_transient_for (GTK_WINDOW (chooser->priv->dialog)))
gtk_window_set_transient_for (GTK_WINDOW (chooser->priv->dialog), GTK_WINDOW (toplevel));
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ogmrip/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 24 Dec 2009 16:02:21 -0000 1.5
+++ .cvsignore 22 Mar 2010 09:02:28 -0000 1.6
@@ -1 +1 @@
-ogmrip-0.13.3.tar.gz
+ogmrip-0.13.4.tar.gz
Index: ogmrip.spec
===================================================================
RCS file: /cvs/free/rpms/ogmrip/devel/ogmrip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ogmrip.spec 24 Dec 2009 16:02:21 -0000 1.6
+++ ogmrip.spec 22 Mar 2010 09:02:28 -0000 1.7
@@ -1,5 +1,5 @@
Name: ogmrip
-Version: 0.13.3
+Version: 0.13.4
Release: 1%{?dist}
Summary: DVD ripping and encoding graphical user interface
@@ -32,6 +32,7 @@
Requires(post): GConf2
Requires(postun): GConf2
+Patch0: ogmrip-0.13.4-build_fix.patch
%description
OGMRip is an application and a set of libraries for ripping and encoding DVDs
@@ -58,7 +59,7 @@
%prep
%setup -q
-
+%patch0 -p1
%build
%configure \
@@ -135,6 +136,10 @@
%changelog
+* Mon Mar 22 2010 Gianluca Sforna <giallu gmail com> - 0.13.4-1
+- New upstream release
+- Add patch to compile against GTK 2.19
+
* Thu Dec 24 2009 Gianluca Sforna <giallu gmail com> - 0.13.3-1
- New upstream release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ogmrip/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 24 Dec 2009 16:02:21 -0000 1.5
+++ sources 22 Mar 2010 09:02:28 -0000 1.6
@@ -1 +1 @@
-5c74da4e53e94d3bf2d57a3068cea151 ogmrip-0.13.3.tar.gz
+cf4b970312a4cb03864b498c02b68837 ogmrip-0.13.4.tar.gz
14 years, 8 months
rpms/compat-python24/F-11 compat-python-2.4-config-db48.patch, NONE, 1.1 compat-python-2.4-db48.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 compat-python-2.4.5-db47.patch, 1.1, 1.2 compat-python24.spec, 1.8, 1.9 sources, 1.2, 1.3 compat-python-2.4.4-db46.patch, 1.1, NONE
by Jonathan Steffan
Author: jsteffan
Update of /cvs/free/rpms/compat-python24/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13381/F-11
Modified Files:
.cvsignore compat-python-2.4.5-db47.patch compat-python24.spec
sources
Added Files:
compat-python-2.4-config-db48.patch
compat-python-2.4-db48.patch
Removed Files:
compat-python-2.4.4-db46.patch
Log Message:
Update to python 2.4.6 w/db4 4.8 support.
compat-python-2.4-config-db48.patch:
Setup.dist | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE compat-python-2.4-config-db48.patch ---
diff -up Python-2.4.6/Modules/Setup.dist.orig Python-2.4.6/Modules/Setup.dist
--- Python-2.4.6/Modules/Setup.dist.orig 2010-03-20 17:13:42.304650556 -0600
+++ Python-2.4.6/Modules/Setup.dist 2010-03-20 17:13:48.316900339 -0600
@@ -398,7 +398,7 @@ gdbm gdbmmodule.c -I/usr/local/include -
#
# Edit the variables DB and DBLIBVERto point to the db top directory
# and the subdirectory of PORT where you built it.
-DBLIBVER=4.7
+DBLIBVER=4.8
DBINC=/usr/include/db4
DBLIB=/usr/lib
_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
compat-python-2.4-db48.patch:
_bsddb.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE compat-python-2.4-db48.patch ---
diff -up Python-2.4.6/Modules/_bsddb.c.orig Python-2.4.6/Modules/_bsddb.c
--- Python-2.4.6/Modules/_bsddb.c.orig 2010-03-20 16:47:14.718678928 -0600
+++ Python-2.4.6/Modules/_bsddb.c 2010-03-20 16:48:10.013649515 -0600
@@ -4317,9 +4317,9 @@ DBTxn_prepare(DBTxnObject* self, PyObjec
if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size))
return NULL;
- if (gid_size != DB_XIDDATASIZE) {
+ if (gid_size != DB_GID_SIZE) {
PyErr_SetString(PyExc_TypeError,
- "gid must be DB_XIDDATASIZE bytes long");
+ "gid must be DB_GID_SIZE bytes long");
return NULL;
}
@@ -4892,7 +4892,6 @@ DL_EXPORT(void) init_bsddb(void)
/* allow apps to be written using DB_RPCCLIENT on older BerkeleyDB */
_addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT);
#endif
- ADD_INT(d, DB_XA_CREATE);
ADD_INT(d, DB_CREATE);
ADD_INT(d, DB_NOMMAP);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Aug 2008 20:39:35 -0000 1.2
+++ .cvsignore 20 Mar 2010 23:57:59 -0000 1.3
@@ -1,2 +1,2 @@
JapaneseCodecs-1.4.11.tar.gz
-Python-2.4.5.tar.bz2
+Python-2.4.6.tar.bz2
compat-python-2.4.5-db47.patch:
Modules/_bsddb.c | 27 +++++++++++++++++++++++++--
setup.py | 4 ++--
2 files changed, 27 insertions(+), 4 deletions(-)
Index: compat-python-2.4.5-db47.patch
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-11/compat-python-2.4.5-db47.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-python-2.4.5-db47.patch 27 Sep 2008 20:30:21 -0000 1.1
+++ compat-python-2.4.5-db47.patch 20 Mar 2010 23:58:00 -0000 1.2
@@ -101,7 +101,7 @@
# http://www.sleepycat.com/update/index.html
- max_db_ver = (4, 4)
-+ max_db_ver = (4, 7)
++ max_db_ver = (4, 8)
min_db_ver = (3, 2)
db_setup_debug = False # verbose debug prints from this script?
@@ -110,7 +110,7 @@
]
# 4.x minor number specific paths
- for x in (0,1,2,3,4):
-+ for x in (0,1,2,3,4,5,6,7):
++ for x in (0,1,2,3,4,5,6,7,8):
db_inc_paths.append('/usr/include/db4%d' % x)
db_inc_paths.append('/usr/include/db4.%d' % x)
db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
Index: compat-python24.spec
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-11/compat-python24.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- compat-python24.spec 2 Apr 2009 10:07:50 -0000 1.8
+++ compat-python24.spec 20 Mar 2010 23:58:00 -0000 1.9
@@ -12,8 +12,8 @@
Summary: An interpreted, interactive, object-oriented programming language
Name: compat-python24
-Version: %{pybasever}.5
-Release: 6%{?dist}
+Version: %{pybasever}.6
+Release: 1%{?dist}
License: Python Software Foundation License v2
Group: Development/Languages
Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -34,7 +34,8 @@
Patch18: compat-python-2.4.3-cflags.patch
Patch19: compat-python-2.4.3-locale.patch
Patch20: compat-python-2.4.5-db47.patch
-#Patch21: compat-python-2.4.4-db4-debug.patch
+Patch21: compat-python-2.4-db48.patch
+Patch22: compat-python-2.4-config-db48.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
@@ -43,7 +44,13 @@
BuildRequires: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel
BuildRequires: tix-devel bzip2-devel
BuildRequires: autoconf
+# Make sure db4 4.8 is used if fedora >= 13
+%if 0%{?fedora} >= 13
+BuildRequires: db4-devel >= 4.8
+%else
BuildRequires: db4-devel >= 4.3
+%endif
+
URL: http://www.python.org/
Provides: python-abi = 2.4, python(abi) = 2.4
@@ -125,7 +132,12 @@
%patch18 -p1 -b .cflags
%patch19 -p2 -b .locale
%patch20 -p1 -b .db4
-#%%patch21 -p1 -b .db-debug
+# Conditionally patch for db4 4.8
+%if 0%{?fedora} >= 13
+%patch21 -p1 -b .db48
+%patch22 -p1 -b .db48
+%endif
+
# This shouldn't be necesarry, but is right now (2.2a3)
find -name "*~" |xargs rm -f
@@ -370,6 +382,13 @@
%{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
%changelog
+* Sat Mar 20 2010 Jonathan Steffan <jonathansteffan a gmail.com> - 2.4.6-1
+- Update to 2.4.6
+- Add a patch for bdb 4.8
+
+* Sat Oct 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.4.5-7
+- rebuilt
+
* Thu Apr 2 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4.5-6
- Link db4 module against db-4.7 not 4.6 (oops)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Aug 2008 20:39:35 -0000 1.2
+++ sources 20 Mar 2010 23:58:00 -0000 1.3
@@ -1,2 +1,2 @@
e4f2ed866f4ce978fb54bb962eab4fdf JapaneseCodecs-1.4.11.tar.gz
-aade3958cb097cc1c69ae0074297d359 Python-2.4.5.tar.bz2
+76083277f6c7e4d78992f36d7ad9018d Python-2.4.6.tar.bz2
--- compat-python-2.4.4-db46.patch DELETED ---
14 years, 8 months
rpms/compat-python24/F-13 compat-python-2.4-config-db48.patch, NONE, 1.1 compat-python-2.4-db48.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 compat-python-2.4.5-db47.patch, 1.1, 1.2 compat-python24.spec, 1.9, 1.10 sources, 1.2, 1.3 compat-python-2.4.4-db46.patch, 1.1, NONE
by Jonathan Steffan
Author: jsteffan
Update of /cvs/free/rpms/compat-python24/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12741/F-13
Modified Files:
.cvsignore compat-python-2.4.5-db47.patch compat-python24.spec
sources
Added Files:
compat-python-2.4-config-db48.patch
compat-python-2.4-db48.patch
Removed Files:
compat-python-2.4.4-db46.patch
Log Message:
Update to python 2.4.6 w/db4 4.8 support.
compat-python-2.4-config-db48.patch:
Setup.dist | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE compat-python-2.4-config-db48.patch ---
diff -up Python-2.4.6/Modules/Setup.dist.orig Python-2.4.6/Modules/Setup.dist
--- Python-2.4.6/Modules/Setup.dist.orig 2010-03-20 17:13:42.304650556 -0600
+++ Python-2.4.6/Modules/Setup.dist 2010-03-20 17:13:48.316900339 -0600
@@ -398,7 +398,7 @@ gdbm gdbmmodule.c -I/usr/local/include -
#
# Edit the variables DB and DBLIBVERto point to the db top directory
# and the subdirectory of PORT where you built it.
-DBLIBVER=4.7
+DBLIBVER=4.8
DBINC=/usr/include/db4
DBLIB=/usr/lib
_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
compat-python-2.4-db48.patch:
_bsddb.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE compat-python-2.4-db48.patch ---
diff -up Python-2.4.6/Modules/_bsddb.c.orig Python-2.4.6/Modules/_bsddb.c
--- Python-2.4.6/Modules/_bsddb.c.orig 2010-03-20 16:47:14.718678928 -0600
+++ Python-2.4.6/Modules/_bsddb.c 2010-03-20 16:48:10.013649515 -0600
@@ -4317,9 +4317,9 @@ DBTxn_prepare(DBTxnObject* self, PyObjec
if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size))
return NULL;
- if (gid_size != DB_XIDDATASIZE) {
+ if (gid_size != DB_GID_SIZE) {
PyErr_SetString(PyExc_TypeError,
- "gid must be DB_XIDDATASIZE bytes long");
+ "gid must be DB_GID_SIZE bytes long");
return NULL;
}
@@ -4892,7 +4892,6 @@ DL_EXPORT(void) init_bsddb(void)
/* allow apps to be written using DB_RPCCLIENT on older BerkeleyDB */
_addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT);
#endif
- ADD_INT(d, DB_XA_CREATE);
ADD_INT(d, DB_CREATE);
ADD_INT(d, DB_NOMMAP);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Aug 2008 20:39:35 -0000 1.2
+++ .cvsignore 20 Mar 2010 23:53:22 -0000 1.3
@@ -1,2 +1,2 @@
JapaneseCodecs-1.4.11.tar.gz
-Python-2.4.5.tar.bz2
+Python-2.4.6.tar.bz2
compat-python-2.4.5-db47.patch:
Modules/_bsddb.c | 27 +++++++++++++++++++++++++--
setup.py | 4 ++--
2 files changed, 27 insertions(+), 4 deletions(-)
Index: compat-python-2.4.5-db47.patch
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-13/compat-python-2.4.5-db47.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-python-2.4.5-db47.patch 27 Sep 2008 20:30:21 -0000 1.1
+++ compat-python-2.4.5-db47.patch 20 Mar 2010 23:53:22 -0000 1.2
@@ -101,7 +101,7 @@
# http://www.sleepycat.com/update/index.html
- max_db_ver = (4, 4)
-+ max_db_ver = (4, 7)
++ max_db_ver = (4, 8)
min_db_ver = (3, 2)
db_setup_debug = False # verbose debug prints from this script?
@@ -110,7 +110,7 @@
]
# 4.x minor number specific paths
- for x in (0,1,2,3,4):
-+ for x in (0,1,2,3,4,5,6,7):
++ for x in (0,1,2,3,4,5,6,7,8):
db_inc_paths.append('/usr/include/db4%d' % x)
db_inc_paths.append('/usr/include/db4.%d' % x)
db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
Index: compat-python24.spec
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-13/compat-python24.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- compat-python24.spec 10 Oct 2009 09:26:16 -0000 1.9
+++ compat-python24.spec 20 Mar 2010 23:53:22 -0000 1.10
@@ -12,8 +12,8 @@
Summary: An interpreted, interactive, object-oriented programming language
Name: compat-python24
-Version: %{pybasever}.5
-Release: 7%{?dist}
+Version: %{pybasever}.6
+Release: 1%{?dist}
License: Python Software Foundation License v2
Group: Development/Languages
Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -34,7 +34,8 @@
Patch18: compat-python-2.4.3-cflags.patch
Patch19: compat-python-2.4.3-locale.patch
Patch20: compat-python-2.4.5-db47.patch
-#Patch21: compat-python-2.4.4-db4-debug.patch
+Patch21: compat-python-2.4-db48.patch
+Patch22: compat-python-2.4-config-db48.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
@@ -43,7 +44,13 @@
BuildRequires: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel
BuildRequires: tix-devel bzip2-devel
BuildRequires: autoconf
+# Make sure db4 4.8 is used if fedora >= 13
+%if 0%{?fedora} >= 13
+BuildRequires: db4-devel >= 4.8
+%else
BuildRequires: db4-devel >= 4.3
+%endif
+
URL: http://www.python.org/
Provides: python-abi = 2.4, python(abi) = 2.4
@@ -125,7 +132,12 @@
%patch18 -p1 -b .cflags
%patch19 -p2 -b .locale
%patch20 -p1 -b .db4
-#%%patch21 -p1 -b .db-debug
+# Conditionally patch for db4 4.8
+%if 0%{?fedora} >= 13
+%patch21 -p1 -b .db48
+%patch22 -p1 -b .db48
+%endif
+
# This shouldn't be necesarry, but is right now (2.2a3)
find -name "*~" |xargs rm -f
@@ -370,6 +382,10 @@
%{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
%changelog
+* Sat Mar 20 2010 Jonathan Steffan <jonathansteffan a gmail.com> - 2.4.6-1
+- Update to 2.4.6
+- Add a patch for bdb 4.8
+
* Sat Oct 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.4.5-7
- rebuilt
Index: sources
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Aug 2008 20:39:35 -0000 1.2
+++ sources 20 Mar 2010 23:53:22 -0000 1.3
@@ -1,2 +1,2 @@
e4f2ed866f4ce978fb54bb962eab4fdf JapaneseCodecs-1.4.11.tar.gz
-aade3958cb097cc1c69ae0074297d359 Python-2.4.5.tar.bz2
+76083277f6c7e4d78992f36d7ad9018d Python-2.4.6.tar.bz2
--- compat-python-2.4.4-db46.patch DELETED ---
14 years, 8 months
rpms/compat-python24/F-12 compat-python-2.4-config-db48.patch, NONE, 1.1 compat-python-2.4-db48.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 compat-python-2.4.5-db47.patch, 1.1, 1.2 compat-python24.spec, 1.9, 1.10 sources, 1.2, 1.3 compat-python-2.4.4-db46.patch, 1.1, NONE
by Jonathan Steffan
Author: jsteffan
Update of /cvs/free/rpms/compat-python24/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12043/F-12
Modified Files:
.cvsignore compat-python-2.4.5-db47.patch compat-python24.spec
sources
Added Files:
compat-python-2.4-config-db48.patch
compat-python-2.4-db48.patch
Removed Files:
compat-python-2.4.4-db46.patch
Log Message:
Update to python 2.4.6 w/db4 4.8 support.
compat-python-2.4-config-db48.patch:
Setup.dist | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE compat-python-2.4-config-db48.patch ---
diff -up Python-2.4.6/Modules/Setup.dist.orig Python-2.4.6/Modules/Setup.dist
--- Python-2.4.6/Modules/Setup.dist.orig 2010-03-20 17:13:42.304650556 -0600
+++ Python-2.4.6/Modules/Setup.dist 2010-03-20 17:13:48.316900339 -0600
@@ -398,7 +398,7 @@ gdbm gdbmmodule.c -I/usr/local/include -
#
# Edit the variables DB and DBLIBVERto point to the db top directory
# and the subdirectory of PORT where you built it.
-DBLIBVER=4.7
+DBLIBVER=4.8
DBINC=/usr/include/db4
DBLIB=/usr/lib
_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
compat-python-2.4-db48.patch:
_bsddb.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE compat-python-2.4-db48.patch ---
diff -up Python-2.4.6/Modules/_bsddb.c.orig Python-2.4.6/Modules/_bsddb.c
--- Python-2.4.6/Modules/_bsddb.c.orig 2010-03-20 16:47:14.718678928 -0600
+++ Python-2.4.6/Modules/_bsddb.c 2010-03-20 16:48:10.013649515 -0600
@@ -4317,9 +4317,9 @@ DBTxn_prepare(DBTxnObject* self, PyObjec
if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size))
return NULL;
- if (gid_size != DB_XIDDATASIZE) {
+ if (gid_size != DB_GID_SIZE) {
PyErr_SetString(PyExc_TypeError,
- "gid must be DB_XIDDATASIZE bytes long");
+ "gid must be DB_GID_SIZE bytes long");
return NULL;
}
@@ -4892,7 +4892,6 @@ DL_EXPORT(void) init_bsddb(void)
/* allow apps to be written using DB_RPCCLIENT on older BerkeleyDB */
_addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT);
#endif
- ADD_INT(d, DB_XA_CREATE);
ADD_INT(d, DB_CREATE);
ADD_INT(d, DB_NOMMAP);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Aug 2008 20:39:35 -0000 1.2
+++ .cvsignore 20 Mar 2010 23:49:45 -0000 1.3
@@ -1,2 +1,2 @@
JapaneseCodecs-1.4.11.tar.gz
-Python-2.4.5.tar.bz2
+Python-2.4.6.tar.bz2
compat-python-2.4.5-db47.patch:
Modules/_bsddb.c | 27 +++++++++++++++++++++++++--
setup.py | 4 ++--
2 files changed, 27 insertions(+), 4 deletions(-)
Index: compat-python-2.4.5-db47.patch
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-12/compat-python-2.4.5-db47.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-python-2.4.5-db47.patch 27 Sep 2008 20:30:21 -0000 1.1
+++ compat-python-2.4.5-db47.patch 20 Mar 2010 23:49:45 -0000 1.2
@@ -101,7 +101,7 @@
# http://www.sleepycat.com/update/index.html
- max_db_ver = (4, 4)
-+ max_db_ver = (4, 7)
++ max_db_ver = (4, 8)
min_db_ver = (3, 2)
db_setup_debug = False # verbose debug prints from this script?
@@ -110,7 +110,7 @@
]
# 4.x minor number specific paths
- for x in (0,1,2,3,4):
-+ for x in (0,1,2,3,4,5,6,7):
++ for x in (0,1,2,3,4,5,6,7,8):
db_inc_paths.append('/usr/include/db4%d' % x)
db_inc_paths.append('/usr/include/db4.%d' % x)
db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
Index: compat-python24.spec
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-12/compat-python24.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- compat-python24.spec 10 Oct 2009 09:26:16 -0000 1.9
+++ compat-python24.spec 20 Mar 2010 23:49:45 -0000 1.10
@@ -12,8 +12,8 @@
Summary: An interpreted, interactive, object-oriented programming language
Name: compat-python24
-Version: %{pybasever}.5
-Release: 7%{?dist}
+Version: %{pybasever}.6
+Release: 1%{?dist}
License: Python Software Foundation License v2
Group: Development/Languages
Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -34,7 +34,8 @@
Patch18: compat-python-2.4.3-cflags.patch
Patch19: compat-python-2.4.3-locale.patch
Patch20: compat-python-2.4.5-db47.patch
-#Patch21: compat-python-2.4.4-db4-debug.patch
+Patch21: compat-python-2.4-db48.patch
+Patch22: compat-python-2.4-config-db48.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
@@ -43,7 +44,13 @@
BuildRequires: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel
BuildRequires: tix-devel bzip2-devel
BuildRequires: autoconf
+# Make sure db4 4.8 is used if fedora >= 13
+%if 0%{?fedora} >= 13
+BuildRequires: db4-devel >= 4.8
+%else
BuildRequires: db4-devel >= 4.3
+%endif
+
URL: http://www.python.org/
Provides: python-abi = 2.4, python(abi) = 2.4
@@ -125,7 +132,12 @@
%patch18 -p1 -b .cflags
%patch19 -p2 -b .locale
%patch20 -p1 -b .db4
-#%%patch21 -p1 -b .db-debug
+# Conditionally patch for db4 4.8
+%if 0%{?fedora} >= 13
+%patch21 -p1 -b .db48
+%patch22 -p1 -b .db48
+%endif
+
# This shouldn't be necesarry, but is right now (2.2a3)
find -name "*~" |xargs rm -f
@@ -370,6 +382,10 @@
%{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
%changelog
+* Sat Mar 20 2010 Jonathan Steffan <jonathansteffan a gmail.com> - 2.4.6-1
+- Update to 2.4.6
+- Add a patch for bdb 4.8
+
* Sat Oct 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.4.5-7
- rebuilt
Index: sources
===================================================================
RCS file: /cvs/free/rpms/compat-python24/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Aug 2008 20:39:35 -0000 1.2
+++ sources 20 Mar 2010 23:49:45 -0000 1.3
@@ -1,2 +1,2 @@
e4f2ed866f4ce978fb54bb962eab4fdf JapaneseCodecs-1.4.11.tar.gz
-aade3958cb097cc1c69ae0074297d359 Python-2.4.5.tar.bz2
+76083277f6c7e4d78992f36d7ad9018d Python-2.4.6.tar.bz2
--- compat-python-2.4.4-db46.patch DELETED ---
14 years, 8 months
rpms/compat-python24/devel compat-python-2.4-config-db48.patch, NONE, 1.1 compat-python-2.4-db48.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 compat-python-2.4.5-db47.patch, 1.1, 1.2 compat-python24.spec, 1.9, 1.10 sources, 1.2, 1.3 compat-python-2.4.4-db46.patch, 1.1, NONE
by Jonathan Steffan
Author: jsteffan
Update of /cvs/free/rpms/compat-python24/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11310/devel
Modified Files:
.cvsignore compat-python-2.4.5-db47.patch compat-python24.spec
sources
Added Files:
compat-python-2.4-config-db48.patch
compat-python-2.4-db48.patch
Removed Files:
compat-python-2.4.4-db46.patch
Log Message:
Update to python 2.4.6 w/db4 4.8 support.
compat-python-2.4-config-db48.patch:
Setup.dist | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE compat-python-2.4-config-db48.patch ---
diff -up Python-2.4.6/Modules/Setup.dist.orig Python-2.4.6/Modules/Setup.dist
--- Python-2.4.6/Modules/Setup.dist.orig 2010-03-20 17:13:42.304650556 -0600
+++ Python-2.4.6/Modules/Setup.dist 2010-03-20 17:13:48.316900339 -0600
@@ -398,7 +398,7 @@ gdbm gdbmmodule.c -I/usr/local/include -
#
# Edit the variables DB and DBLIBVERto point to the db top directory
# and the subdirectory of PORT where you built it.
-DBLIBVER=4.7
+DBLIBVER=4.8
DBINC=/usr/include/db4
DBLIB=/usr/lib
_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
compat-python-2.4-db48.patch:
_bsddb.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE compat-python-2.4-db48.patch ---
diff -up Python-2.4.6/Modules/_bsddb.c.orig Python-2.4.6/Modules/_bsddb.c
--- Python-2.4.6/Modules/_bsddb.c.orig 2010-03-20 16:47:14.718678928 -0600
+++ Python-2.4.6/Modules/_bsddb.c 2010-03-20 16:48:10.013649515 -0600
@@ -4317,9 +4317,9 @@ DBTxn_prepare(DBTxnObject* self, PyObjec
if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size))
return NULL;
- if (gid_size != DB_XIDDATASIZE) {
+ if (gid_size != DB_GID_SIZE) {
PyErr_SetString(PyExc_TypeError,
- "gid must be DB_XIDDATASIZE bytes long");
+ "gid must be DB_GID_SIZE bytes long");
return NULL;
}
@@ -4892,7 +4892,6 @@ DL_EXPORT(void) init_bsddb(void)
/* allow apps to be written using DB_RPCCLIENT on older BerkeleyDB */
_addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT);
#endif
- ADD_INT(d, DB_XA_CREATE);
ADD_INT(d, DB_CREATE);
ADD_INT(d, DB_NOMMAP);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/compat-python24/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Aug 2008 20:39:35 -0000 1.2
+++ .cvsignore 20 Mar 2010 23:45:09 -0000 1.3
@@ -1,2 +1,2 @@
JapaneseCodecs-1.4.11.tar.gz
-Python-2.4.5.tar.bz2
+Python-2.4.6.tar.bz2
compat-python-2.4.5-db47.patch:
Modules/_bsddb.c | 27 +++++++++++++++++++++++++--
setup.py | 4 ++--
2 files changed, 27 insertions(+), 4 deletions(-)
Index: compat-python-2.4.5-db47.patch
===================================================================
RCS file: /cvs/free/rpms/compat-python24/devel/compat-python-2.4.5-db47.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-python-2.4.5-db47.patch 27 Sep 2008 20:30:21 -0000 1.1
+++ compat-python-2.4.5-db47.patch 20 Mar 2010 23:45:09 -0000 1.2
@@ -101,7 +101,7 @@
# http://www.sleepycat.com/update/index.html
- max_db_ver = (4, 4)
-+ max_db_ver = (4, 7)
++ max_db_ver = (4, 8)
min_db_ver = (3, 2)
db_setup_debug = False # verbose debug prints from this script?
@@ -110,7 +110,7 @@
]
# 4.x minor number specific paths
- for x in (0,1,2,3,4):
-+ for x in (0,1,2,3,4,5,6,7):
++ for x in (0,1,2,3,4,5,6,7,8):
db_inc_paths.append('/usr/include/db4%d' % x)
db_inc_paths.append('/usr/include/db4.%d' % x)
db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
Index: compat-python24.spec
===================================================================
RCS file: /cvs/free/rpms/compat-python24/devel/compat-python24.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- compat-python24.spec 10 Oct 2009 09:26:16 -0000 1.9
+++ compat-python24.spec 20 Mar 2010 23:45:09 -0000 1.10
@@ -12,8 +12,8 @@
Summary: An interpreted, interactive, object-oriented programming language
Name: compat-python24
-Version: %{pybasever}.5
-Release: 7%{?dist}
+Version: %{pybasever}.6
+Release: 1%{?dist}
License: Python Software Foundation License v2
Group: Development/Languages
Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -34,7 +34,8 @@
Patch18: compat-python-2.4.3-cflags.patch
Patch19: compat-python-2.4.3-locale.patch
Patch20: compat-python-2.4.5-db47.patch
-#Patch21: compat-python-2.4.4-db4-debug.patch
+Patch21: compat-python-2.4-db48.patch
+Patch22: compat-python-2.4-config-db48.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
@@ -43,7 +44,13 @@
BuildRequires: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel
BuildRequires: tix-devel bzip2-devel
BuildRequires: autoconf
+# Make sure db4 4.8 is used if fedora >= 13
+%if 0%{?fedora} >= 13
+BuildRequires: db4-devel >= 4.8
+%else
BuildRequires: db4-devel >= 4.3
+%endif
+
URL: http://www.python.org/
Provides: python-abi = 2.4, python(abi) = 2.4
@@ -125,7 +132,12 @@
%patch18 -p1 -b .cflags
%patch19 -p2 -b .locale
%patch20 -p1 -b .db4
-#%%patch21 -p1 -b .db-debug
+# Conditionally patch for db4 4.8
+%if 0%{?fedora} >= 13
+%patch21 -p1 -b .db48
+%patch22 -p1 -b .db48
+%endif
+
# This shouldn't be necesarry, but is right now (2.2a3)
find -name "*~" |xargs rm -f
@@ -370,6 +382,10 @@
%{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
%changelog
+* Sat Mar 20 2010 Jonathan Steffan <jonathansteffan a gmail.com> - 2.4.6-1
+- Update to 2.4.6
+- Add a patch for bdb 4.8
+
* Sat Oct 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.4.5-7
- rebuilt
Index: sources
===================================================================
RCS file: /cvs/free/rpms/compat-python24/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Aug 2008 20:39:35 -0000 1.2
+++ sources 20 Mar 2010 23:45:09 -0000 1.3
@@ -1,2 +1,2 @@
e4f2ed866f4ce978fb54bb962eab4fdf JapaneseCodecs-1.4.11.tar.gz
-aade3958cb097cc1c69ae0074297d359 Python-2.4.5.tar.bz2
+76083277f6c7e4d78992f36d7ad9018d Python-2.4.6.tar.bz2
--- compat-python-2.4.4-db46.patch DELETED ---
14 years, 8 months