packages (DEVEL): python3/python3-ac_fixes.patch, python3/python3.spec - st...

wrobell wrobell at pld-linux.org
Sun Dec 12 17:23:16 CET 2010 

Author: wrobell                      Date: Sun Dec 12 16:23:16 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- started updating to python 3.2b1
- removed junk from ac_fixes patch which was later corrected in the spec
  file (as well, python provides now python3 link/binary)

---- Files affected:
packages/python3:
   python3-ac_fixes.patch (1.2 -> 1.2.2.1) , python3.spec (1.36 -> 1.36.2.1) 

---- Diffs:

================================================================
Index: packages/python3/python3-ac_fixes.patch
diff -u packages/python3/python3-ac_fixes.patch:1.2 packages/python3/python3-ac_fixes.patch:1.2.2.1
--- packages/python3/python3-ac_fixes.patch:1.2	Fri Jan 23 14:03:58 2009
+++ packages/python3/python3-ac_fixes.patch	Sun Dec 12 17:23:10 2010
@@ -1,10 +1,10 @@
---- Python-2.5b2/configure.in.orig	2006-07-06 11:13:35.000000000 +0100
-+++ Python-2.5b2/configure.in	2006-07-12 16:30:30.000000000 +0100
-@@ -753,13 +753,13 @@
+--- Python-3.2b1/configure.in.orig	2010-12-12 16:18:42.000000000 +0000
++++ Python-3.2b1/configure.in	2010-12-12 16:20:34.000000000 +0000
+@@ -879,13 +879,13 @@
  	    if test "$Py_DEBUG" = 'true' ; then
  		# Optimization messes up debuggers, so turn it off for
  		# debug builds.
--		OPT="-g -Wall $STRICT_PROTO"
+-		OPT="-g -O0 -Wall $STRICT_PROTO"
 +		OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
  	    else
 -		OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
@@ -17,14 +17,3 @@
  	    ;;
  	esac
  	case $ac_sys_system in
---- Python-2.5c1.orig/Makefile.pre.in	2006-07-30 17:20:10.000000000 +0100
-+++ Python-2.5c1/Makefile.pre.in	2006-08-25 17:51:05.000000000 +0100
-@@ -852,7 +852,7 @@
- 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
- 	# Substitution happens here, as the completely-expanded BINDIR
- 	# is not available in configure
--	sed -e "s, at EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
-+	sed -e "s, at EXENAME@,$(BINDIR)/python$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
- 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
- 	rm python-config
- 	@if [ -s Modules/python.exp -a \

================================================================
Index: packages/python3/python3.spec
diff -u packages/python3/python3.spec:1.36 packages/python3/python3.spec:1.36.2.1
--- packages/python3/python3.spec:1.36	Mon Nov  8 20:00:47 2010
+++ packages/python3/python3.spec	Sun Dec 12 17:23:10 2010
@@ -17,9 +17,9 @@
 # tests which fail because of some unknown/unresolved reason (this list should be empty)
 %define		broken_tests test_httpservers test_distutils test_cmd_line test_pydoc test_telnetlib test_zlib
 
-%define	beta		%{nil}
+%define	beta		b1
 
-%define py_ver		3.1
+%define py_ver		3.2
 %define py_prefix	%{_prefix}
 %define py_libdir	%{py_prefix}/%{_lib}/python%{py_ver}
 %define py_incdir	%{_includedir}/python%{py_ver}
@@ -35,13 +35,13 @@
 Summary(tr.UTF-8):	X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
 Summary(uk.UTF-8):	Мова програмування дуже високого рівня з X-інтерфейсом
 Name:		python3
-Version:	%{py_ver}.2
-Release:	3
+Version:	%{py_ver}
+Release:	0.%{beta}.1
 Epoch:		1
 License:	PSF
 Group:		Applications
 Source0:	http://www.python.org/ftp/python/%{version}/Python-%{version}%{beta}.tar.bz2
-# Source0-md5:	45350b51b58a46b029fb06c61257e350
+# Source0-md5:	3ad06a5b080d7b32958b4af2e44b64d3
 Patch0:		%{name}-pythonpath.patch
 Patch1:		%{name}-ac_fixes.patch
 Patch2:		%{name}-lib64.patch
@@ -356,59 +356,6 @@
 %description static -l pl.UTF-8
 Statyczna biblioteka Pythona.
 
-%package doc
-Summary:	Documentation on Python
-Summary(de.UTF-8):	Dokumentation zu Python
-Summary(es.UTF-8):	Documentación para Python
-Summary(fr.UTF-8):	Documentation sur Python
-Summary(pl.UTF-8):	Dokumentacja do Pythona
-Summary(pt_BR.UTF-8):	Documentação para a linguagem de programação Python
-Summary(ru.UTF-8):	Документация по языку Python
-Summary(tr.UTF-8):	Python belgeleri
-Summary(uk.UTF-8):	Документація по мові Python
-Group:		Documentation
-
-%description doc
-This package contains documentation on the Python language and
-interpretor as a mix of plain ASCII files and LaTeX sources.
-
-%description doc -l de.UTF-8
-Dieses Paket enthält Dokumentationen zu Python (Sprache und
-Interpreter) in Form von einfachen ASCII-Dateien und LaTeX-Quellen.
-
-%description doc -l es.UTF-8
-Documentación para Python. Contiene archivos en texto y PostScript.
-
-%description doc -l fr.UTF-8
-Ce paquetage contient la documentation sur le langage python et sur
-son interpréteur sous forme de fichiers ASCII et LaTeX.
-
-%description doc -l pl.UTF-8
-Oficjalna dokumentacja do Pythona. Zawiera przykładowe programy,
-narzędzia i dokumentację. Strony podręcznika man znajdują się w
-głównym pakiecie. Ten pakiet nie zawiera źródeł dokumentacji
-napisanych w LaTeXu, tylko gotowe do wykorzystania pliki postscriptowe
-i HTML.
-
-%description doc -l pt_BR.UTF-8
-O pacote python-doc contém documentação para a linguagem de
-programação e para o interpretador Python. Fornecida em arquivos texto
-e Postcript.
-
-%description doc -l ru.UTF-8
-Этот пакет содержит документацию по собственно языку Python и по
-исполняющему его интерпретатору в виде набора текстовых файлов и
-исходных текстов в формате LaTeX.
-
-%description doc -l tr.UTF-8
-Bu paket, Python dili ile ilgili belgeleri ve düz ASCII dosyaları ve
-LaTeX kaynaklarının bir karışımı olan yorumlayıcıyı içerir.
-
-%description doc -l uk.UTF-8
-Цей пакет містить документацію по власне мові Python та по виконуючому
-її інтерпретатору у вигляді набора текстових файлів та вихідних
-текстів у форматі LaTeX.
-
 %package doc-info
 Summary:	Documentation on Python in texinfo format
 Summary(pl.UTF-8):	Dokumentacja do Pythona w formacie texinfo
@@ -484,11 +431,10 @@
 %prep
 %setup -q -n Python-%{version}%{beta}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-sed -i -e 's=@EXENAME@=%{_bindir}/python3=' Misc/python-config.in
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
+#%patch4 -p1
 
 %build
 sed -i -e 's#-ltermcap#-ltinfo#g' configure*
@@ -549,12 +495,6 @@
 install Doc/info/python*info* $RPM_BUILD_ROOT%{_infodir}
 %endif
 
-install Makefile.pre.in $RPM_BUILD_ROOT%{py_libdir}/config
-
-mv $RPM_BUILD_ROOT{%{py_libdir}/config,%{_libdir}}/libpython%{py_ver}.a
-ln -sf libpython%{py_ver}.a $RPM_BUILD_ROOT%{_libdir}/libpython.a
-ln -sf libpython%{py_ver}.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libpython%{py_ver}.so
-
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a Tools Demo $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -964,6 +904,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36.2.1  2010/12/12 16:23:10  wrobell
+- started updating to python 3.2b1
+- removed junk from ac_fixes patch which was later corrected in the spec
+  file (as well, python provides now python3 link/binary)
+
 Revision 1.36  2010/11/08 19:00:47  shadzik
 - rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python3/python3-ac_fixes.patch?r1=1.2&r2=1.2.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python3/python3.spec?r1=1.36&r2=1.36.2.1&f=u

More information about the pld-cvs-commit mailing list