rpms/python2
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed trailing whitespace in spec

Browse Source
This commit is contained in:
Tomas Radej 2013-11-12 13:53:47 +01:00
parent c86b2c6e57
commit 8adf4f656c
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
python.spec
View File

@ -62,7 +62,7 @@
# #
# These errors are ignored by the normal python build, and aren't normally a # These errors are ignored by the normal python build, and aren't normally a
# problem in the buildroots since /usr/bin/python isn't present. # problem in the buildroots since /usr/bin/python isn't present.
# #
# However, for the case where we're rebuilding the python srpm on a machine # However, for the case where we're rebuilding the python srpm on a machine
# that does have python installed we need to set this to avoid # that does have python installed we need to set this to avoid
# brp-python-bytecompile treating these as fatal errors: # brp-python-bytecompile treating these as fatal errors:
@ -75,7 +75,7 @@
# patch 52 (valgrind) # patch 52 (valgrind)
# patch 55 (systemtap) # patch 55 (systemtap)
# patch 145 (linux2) # patch 145 (linux2)
# #
# For patch 55 (systemtap), we need to get a new header for configure to use # For patch 55 (systemtap), we need to get a new header for configure to use
# #
# configure.in requires autoconf-2.65, but the version in Fedora is currently # configure.in requires autoconf-2.65, but the version in Fedora is currently
@ -228,7 +228,7 @@ Source7: pynche
# - unicodedata unicodedata.c # static Unicode character database # - unicodedata unicodedata.c # static Unicode character database
# - _locale _localemodule.c # - _locale _localemodule.c
# - fcntl fcntlmodule.c # fcntl(2) and ioctl(2) # - fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
# - spwd spwdmodule.c # spwd(3) # - spwd spwdmodule.c # spwd(3)
# - grp grpmodule.c # grp(3) # - grp grpmodule.c # grp(3)
# - select selectmodule.c # select(2); not on ancient System V # - select selectmodule.c # select(2); not on ancient System V
# - mmap mmapmodule.c # Memory-mapped files # - mmap mmapmodule.c # Memory-mapped files
@ -285,22 +285,22 @@ Patch4: python-2.5-cflags.patch
# though the proposed upstream patches are, alas, different # though the proposed upstream patches are, alas, different
Patch6: python-2.5.1-plural-fix.patch Patch6: python-2.5.1-plural-fix.patch
# This patch was listed in the changelog as: # This patch was listed in the changelog as:
# * Fri Sep 14 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-11 # * Fri Sep 14 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-11
# - fix encoding of sqlite .py files to work around weird encoding problem # - fix encoding of sqlite .py files to work around weird encoding problem
# in Turkish (#283331) # in Turkish (#283331)
# A traceback attached to rhbz 244016 shows the problem most clearly: a # A traceback attached to rhbz 244016 shows the problem most clearly: a
# traceback on attempting to import the sqlite module, with: # traceback on attempting to import the sqlite module, with:
# "SyntaxError: encoding problem: with BOM (__init__.py, line 1)" # "SyntaxError: encoding problem: with BOM (__init__.py, line 1)"
# This seems to come from Parser/tokenizer.c:check_coding_spec # This seems to come from Parser/tokenizer.c:check_coding_spec
# Our patch changes two source files within sqlite3, removing the # Our patch changes two source files within sqlite3, removing the
# "coding: ISO-8859-1" specs and character E4 = U+00E4 = # "coding: ISO-8859-1" specs and character E4 = U+00E4 =
# LATIN SMALL LETTER A WITH DIAERESIS from in ghaering's surname. # LATIN SMALL LETTER A WITH DIAERESIS from in ghaering's surname.
# #
# It may be that the conversion of "ISO-8859-1" to "iso-8859-1" is thwarted # It may be that the conversion of "ISO-8859-1" to "iso-8859-1" is thwarted
# by the implementation of "tolower" in the Turkish locale; see: # by the implementation of "tolower" in the Turkish locale; see:
# https://bugzilla.redhat.com/show_bug.cgi?id=191096#c9 # https://bugzilla.redhat.com/show_bug.cgi?id=191096#c9
# #
# TODO: Not yet sent upstream, and appears to me (dmalcolm 2010-01-29) that # TODO: Not yet sent upstream, and appears to me (dmalcolm 2010-01-29) that
# it may be papering over a symptom # it may be papering over a symptom
Patch7: python-2.5.1-sqlite-encoding.patch Patch7: python-2.5.1-sqlite-encoding.patch
@ -370,9 +370,9 @@ Patch111: 00111-no-static-lib.patch
# the same .py and .pyc files, using "_d.so" to signify a debug build of an # the same .py and .pyc files, using "_d.so" to signify a debug build of an
# extension module. # extension module.
# #
# Based on Debian's patch for the same, # Based on Debian's patch for the same,
# http://patch-tracker.debian.org/patch/series/view/python2.6/2.6.5-2/debug-build.dpatch # http://patch-tracker.debian.org/patch/series/view/python2.6/2.6.5-2/debug-build.dpatch
# #
# (which was itself based on the upstream Windows build), but with some # (which was itself based on the upstream Windows build), but with some
# changes: # changes:
# #
@ -391,7 +391,7 @@ Patch111: 00111-no-static-lib.patch
# to add the _d there, when building an extension. This way, "make sharedlibs" # to add the _d there, when building an extension. This way, "make sharedlibs"
# can build ctypes, by finding the sysmtem libffi.so (rather than failing to # can build ctypes, by finding the sysmtem libffi.so (rather than failing to
# find "libffi_d.so"), and builds the module as _ctypes_d.so # find "libffi_d.so"), and builds the module as _ctypes_d.so
# #
# * Similarly, update build_ext:get_libraries handling of Py_ENABLE_SHARED by # * Similarly, update build_ext:get_libraries handling of Py_ENABLE_SHARED by
# appending "_d" to the python library's name for the debug configuration # appending "_d" to the python library's name for the debug configuration
# #
@ -885,7 +885,7 @@ Patch5000: 05000-autotool-intermediates.patch
%if %{main_python} %if %{main_python}
Obsoletes: Distutils Obsoletes: Distutils
Provides: Distutils Provides: Distutils
Obsoletes: python2 Obsoletes: python2
Provides: python2 = %{version} Provides: python2 = %{version}
Obsoletes: python-elementtree <= 1.2.6 Obsoletes: python-elementtree <= 1.2.6
Obsoletes: python-sqlite < 2.3.2 Obsoletes: python-sqlite < 2.3.2
@ -982,9 +982,9 @@ Provides: python2-tools = %{version}
%endif %endif
%description tools %description tools
This package includes several tools to help with the development of Python This package includes several tools to help with the development of Python
programs, including IDLE (an IDE with editing and debugging facilities), a programs, including IDLE (an IDE with editing and debugging facilities), a
color editor (pynche), and a python gettext program (pygettext.py). color editor (pynche), and a python gettext program (pygettext.py).
%package -n %{tkinter} %package -n %{tkinter}
Summary: A graphical user interface for the Python scripting language Summary: A graphical user interface for the Python scripting language
@ -1261,7 +1261,7 @@ exit 1
# Define a function, for how to perform a "build" of python for a given # Define a function, for how to perform a "build" of python for a given
# configuration: # configuration:
BuildPython() { BuildPython() {
ConfName=$1 ConfName=$1
BinaryName=$2 BinaryName=$2
SymlinkName=$3 SymlinkName=$3
ExtraConfigArgs=$4 ExtraConfigArgs=$4
@ -1357,7 +1357,7 @@ done
InstallPython() { InstallPython() {
ConfName=$1 ConfName=$1
BinaryName=$2 BinaryName=$2
PyInstSoName=$3 PyInstSoName=$3
@ -1382,7 +1382,7 @@ make install DESTDIR=%{buildroot}
# #
# See https://fedoraproject.org/wiki/Features/EasierPythonDebugging for more # See https://fedoraproject.org/wiki/Features/EasierPythonDebugging for more
# information # information
# #
# Initially I tried: # Initially I tried:
# /usr/lib/libpython2.6.so.1.0-gdb.py # /usr/lib/libpython2.6.so.1.0-gdb.py
# but doing so generated noise when ldconfig was rerun (rhbz:562980) # but doing so generated noise when ldconfig was rerun (rhbz:562980)
@ -1424,7 +1424,7 @@ InstallPython optimized \
%{py_INSTSONAME_optimized} %{py_INSTSONAME_optimized}
# Fix the interpreter path in binaries installed by distutils # Fix the interpreter path in binaries installed by distutils
# (which changes them by itself) # (which changes them by itself)
# Make sure we preserve the file permissions # Make sure we preserve the file permissions
for fixed in %{buildroot}%{_bindir}/pydoc; do for fixed in %{buildroot}%{_bindir}/pydoc; do
@ -1578,7 +1578,7 @@ for Module in %{buildroot}/%{dynload_dir}/*.so ; do
*_d.so) *_d.so)
ldd $Module | grep %{py_INSTSONAME_optimized} && ldd $Module | grep %{py_INSTSONAME_optimized} &&
(echo Debug module $Module linked against optimized %{py_INSTSONAME_optimized} ; exit 1) (echo Debug module $Module linked against optimized %{py_INSTSONAME_optimized} ; exit 1)
;; ;;
*) *)
ldd $Module | grep %{py_INSTSONAME_debug} && ldd $Module | grep %{py_INSTSONAME_debug} &&
@ -2015,15 +2015,15 @@ rm -fr %{buildroot}
# We put the debug-gdb.py file inside /usr/lib/debug to avoid noise from # We put the debug-gdb.py file inside /usr/lib/debug to avoid noise from
# ldconfig (rhbz:562980). # ldconfig (rhbz:562980).
# #
# The /usr/lib/rpm/redhat/macros defines the __debug_package macro to use # The /usr/lib/rpm/redhat/macros defines the __debug_package macro to use
# debugfiles.list, and it appears that everything below /usr/lib/debug and # debugfiles.list, and it appears that everything below /usr/lib/debug and
# (/usr/src/debug) gets added to this file (via LISTFILES) in # (/usr/src/debug) gets added to this file (via LISTFILES) in
# /usr/lib/rpm/find-debuginfo.sh # /usr/lib/rpm/find-debuginfo.sh
# #
# Hence by installing it below /usr/lib/debug we ensure it is added to the # Hence by installing it below /usr/lib/debug we ensure it is added to the
# -debuginfo subpackage # -debuginfo subpackage
# (if it doesn't, then the rpmbuild ought to fail since the debug-gdb.py # (if it doesn't, then the rpmbuild ought to fail since the debug-gdb.py
# payload file would be unpackaged) # payload file would be unpackaged)
@ -2728,7 +2728,7 @@ directories (bug 531901)
- fix marshalling of objects in xmlrpclib (python bug #1739842) - fix marshalling of objects in xmlrpclib (python bug #1739842)
* Fri Sep 14 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-11 * Fri Sep 14 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-11
- fix encoding of sqlite .py files to work around weird encoding problem - fix encoding of sqlite .py files to work around weird encoding problem
in Turkish (#283331) in Turkish (#283331)
* Mon Sep 10 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-10 * Mon Sep 10 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-10
@ -2751,7 +2751,7 @@ directories (bug 531901)
* Wed Jun 27 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-4 * Wed Jun 27 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-4
- fix _elementtree.so build (#245703) - fix _elementtree.so build (#245703)
- ensure that extension modules we expect are actually built rather than - ensure that extension modules we expect are actually built rather than
having them silently fall out of the package having them silently fall out of the package
* Tue Jun 26 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-3 * Tue Jun 26 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-3
@ -2793,7 +2793,7 @@ directories (bug 531901)
* Mon Dec 11 2006 Jeremy Katz <katzj@redhat.com> - 2.5.3-3 * Mon Dec 11 2006 Jeremy Katz <katzj@redhat.com> - 2.5.3-3
- fix atexit traceback with failed syslog logger (#218214) - fix atexit traceback with failed syslog logger (#218214)
- split libpython into python-libs subpackage for multilib apps - split libpython into python-libs subpackage for multilib apps
embedding python interpreters embedding python interpreters
* Wed Dec 6 2006 Jeremy Katz <katzj@redhat.com> - 2.5.3-2 * Wed Dec 6 2006 Jeremy Katz <katzj@redhat.com> - 2.5.3-2
@ -2801,14 +2801,14 @@ directories (bug 531901)
* Tue Dec 5 2006 Jeremy Katz <katzj@redhat.com> * Tue Dec 5 2006 Jeremy Katz <katzj@redhat.com>
- support db 4.5 - support db 4.5
- obsolete python-elementtree; since it requires some code tweaks, don't - obsolete python-elementtree; since it requires some code tweaks, don't
provide it provide it
- obsolete old python-sqlite; provide the version that's actually included - obsolete old python-sqlite; provide the version that's actually included
* Mon Oct 30 2006 Jeremy Katz <katzj@redhat.com> * Mon Oct 30 2006 Jeremy Katz <katzj@redhat.com>
- fix _md5 and _sha modules (Robert Sheck) - fix _md5 and _sha modules (Robert Sheck)
- no longer provide optik compat; it's been a couple of years now - no longer provide optik compat; it's been a couple of years now
- no longer provide the old shm module; if this is still needed, let's - no longer provide the old shm module; if this is still needed, let's
build it separately build it separately
- no longer provide japanese codecs; should be a separate package - no longer provide japanese codecs; should be a separate package
@ -2909,7 +2909,7 @@ directories (bug 531901)
- Fix bug #169046 more correctly. - Fix bug #169046 more correctly.
* Thu Sep 22 2005 Mihai Ibanescu <misa@redhat.com> 2.4.1-7 * Thu Sep 22 2005 Mihai Ibanescu <misa@redhat.com> 2.4.1-7
- Fixed bug #169046 (realpath is unsafe); thanks to - Fixed bug #169046 (realpath is unsafe); thanks to
Peter Jones <pjones@redhat.com> and Arjan van de Ven <arjanv@redhat.com> for Peter Jones <pjones@redhat.com> and Arjan van de Ven <arjanv@redhat.com> for
diagnosing and the patch. diagnosing and the patch.
@ -3098,11 +3098,11 @@ directories (bug 531901)
- Fixed bug #84966: path in byte-compiled code still wrong - Fixed bug #84966: path in byte-compiled code still wrong
* Thu Feb 20 2003 Jeremy Katz <katzj@redhat.com> 2.2.2-23 * Thu Feb 20 2003 Jeremy Katz <katzj@redhat.com> 2.2.2-23
- ftp uri's should be able to specify being rooted at the root instead of - ftp uri's should be able to specify being rooted at the root instead of
where you login via ftp (#84692) where you login via ftp (#84692)
* Mon Feb 10 2003 Mihai Ibanescu <misa@redhat.com> 2.2.2-22 * Mon Feb 10 2003 Mihai Ibanescu <misa@redhat.com> 2.2.2-22
- Using newer Japanese codecs (1.4.9). Thanks to - Using newer Japanese codecs (1.4.9). Thanks to
Peter Bowen <pzb@datastacks.com> for pointing this out. Peter Bowen <pzb@datastacks.com> for pointing this out.
* Thu Feb 6 2003 Mihai Ibanescu <misa@redhat.com> 2.2.2-21 * Thu Feb 6 2003 Mihai Ibanescu <misa@redhat.com> 2.2.2-21
@ -3139,7 +3139,7 @@ directories (bug 531901)
- pick up OpenSSL cflags and ldflags from pkgconfig if available - pick up OpenSSL cflags and ldflags from pkgconfig if available
* Thu Jan 2 2003 Jeremy Katz <katzj@redhat.com> 2.2.2-8 * Thu Jan 2 2003 Jeremy Katz <katzj@redhat.com> 2.2.2-8
- urllib2 didn't support non-anonymous ftp. add support based on how - urllib2 didn't support non-anonymous ftp. add support based on how
urllib did it (#80676, #78168) urllib did it (#80676, #78168)
* Mon Dec 16 2002 Mihai Ibanescu <misa@redhat.com> 2.2.2-7 * Mon Dec 16 2002 Mihai Ibanescu <misa@redhat.com> 2.2.2-7
@ -3162,7 +3162,7 @@ directories (bug 531901)
- Fixed configuration patch to add -lcrypt when compiling cryptmodule.c - Fixed configuration patch to add -lcrypt when compiling cryptmodule.c
2.2.2-4 2.2.2-4
- Spec file change from Matt Wilson <msw@redhat.com> to disable linking - Spec file change from Matt Wilson <msw@redhat.com> to disable linking
with the C++ compiler. with the C++ compiler.
* Mon Nov 11 2002 Mihai Ibanescu <misa@redhat.com> * Mon Nov 11 2002 Mihai Ibanescu <misa@redhat.com>
@ -3246,11 +3246,11 @@ directories (bug 531901)
- 2.2.1 - a bugfix-only release - 2.2.1 - a bugfix-only release
* Fri Apr 12 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2-16 * Fri Apr 12 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2-16
- the same, but in builddirs - this will remove them from the - the same, but in builddirs - this will remove them from the
docs package, which doesn't look in the buildroot for files. docs package, which doesn't look in the buildroot for files.
* Fri Apr 12 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2-15 * Fri Apr 12 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2-15
- Get rid of temporary files and .cvsignores included - Get rid of temporary files and .cvsignores included
in the tarball and make install in the tarball and make install
* Fri Apr 5 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2-14 * Fri Apr 5 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2-14
@ -3288,7 +3288,7 @@ directories (bug 531901)
can happen when you mix db2 and db4 in a single application) can happen when you mix db2 and db4 in a single application)
* Thu Jan 24 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2-4 * Thu Jan 24 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2-4
- Obsolete subpackages if necesarry - Obsolete subpackages if necesarry
- provide versioned python2 - provide versioned python2
- build with db4 - build with db4
@ -3301,7 +3301,7 @@ directories (bug 531901)
* Fri Dec 14 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2-0.11c1 * Fri Dec 14 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2-0.11c1
- 2.2 RC 1 - 2.2 RC 1
- Don't include the _tkinter module in the main package - it's - Don't include the _tkinter module in the main package - it's
already in the tkiter packace already in the tkiter packace
- Turn off the mpzmodule, something broke in the buildroot - Turn off the mpzmodule, something broke in the buildroot