rpms/python/devel python.spec,1.134,1.135
Jeremy Katz (katzj)
fedora-extras-commits at redhat.com
Thu Jul 17 14:24:29 UTC 2008
- Previous message: rpms/libkipi/F-9 .cvsignore, 1.6, 1.7 libkipi.spec, 1.17, 1.18 sources, 1.6, 1.7
- Next message: rpms/libkexiv2/F-9 .cvsignore, 1.6, 1.7 libkexiv2.spec, 1.10, 1.11 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: katzj
Update of /cvs/pkgs/rpms/python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18410
Modified Files:
python.spec
Log Message:
* Thu Jul 17 2008 Jeremy Katz <katzj at redhat.com> - 2.5.1-29
- Fix up the build for new rpm
Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- python.spec 17 Jul 2008 13:39:58 -0000 1.134
+++ python.spec 17 Jul 2008 14:23:34 -0000 1.135
@@ -2,6 +2,8 @@
#define __python_ver 25
%define unicode ucs4
+%define _default_patch_fuzz 2
+
%if "%{__python_ver}" != "EMPTY"
%define main_python 0
%define python python%{__python_ver}
@@ -20,7 +22,7 @@
Summary: An interpreted, interactive, object-oriented programming language.
Name: %{python}
Version: 2.5.1
-Release: 28%{?dist}
+Release: 29%{?dist}
License: Python
Group: Development/Languages
Provides: python-abi = %{pybasever}
@@ -80,7 +82,7 @@
BuildPrereq: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel
BuildPrereq: tix-devel bzip2-devel sqlite-devel
BuildPrereq: autoconf
-BuildPrereq: db4-devel >= 4.6
+BuildPrereq: db4-devel >= 4.7
URL: http://www.python.org/
@@ -199,7 +201,7 @@
#patch50 -p1 -b .egginfo
%patch60 -p1 -b .db47
-%if %{_lib} == lib64
+%if "%{_lib}" == "lib64"
%patch101 -p1 -b .lib64-regex
%patch102 -p1 -b .lib64
%endif
@@ -368,7 +370,7 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/email/test/data/audiotest.au $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/test/audiotest.au
# Fix bug #143667: python should own /usr/lib/python2.x on 64-bit machines
-%if %{_lib} == lib64
+%if "%{_lib}" == "lib64"
install -d $RPM_BUILD_ROOT/usr/lib/python%{pybasever}/site-packages
%endif
@@ -457,7 +459,7 @@
%{_libdir}/python%{pybasever}/test/__init__.py*
%{_libdir}/python%{pybasever}/wsgiref
%{_libdir}/python%{pybasever}/xml
-%if %{_lib} == lib64
+%if "%{_lib}" == "lib64"
%attr(0755,root,root) %dir /usr/lib/python%{pybasever}
%attr(0755,root,root) %dir /usr/lib/python%{pybasever}/site-packages
%endif
@@ -508,6 +510,9 @@
%{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
%changelog
+* Thu Jul 17 2008 Jeremy Katz <katzj at redhat.com> - 2.5.1-29
+- Fix up the build for new rpm
+
* Thu Jul 17 2008 Jeremy Katz <katzj at redhat.com> - 2.5.1-28
- And actually build against db4-4.7 (#455170)
- Previous message: rpms/libkipi/F-9 .cvsignore, 1.6, 1.7 libkipi.spec, 1.17, 1.18 sources, 1.6, 1.7
- Next message: rpms/libkexiv2/F-9 .cvsignore, 1.6, 1.7 libkexiv2.spec, 1.10, 1.11 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list