packages: python3/python3-lib64.patch, python3/python3-noarch_to_datadir.pa...
qboosh
qboosh at pld-linux.org
Sat Apr 2 11:48:46 CEST 2011
Author: qboosh Date: Sat Apr 2 09:48:46 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated lib64 and noarch_to_datadir patches
- use __rm macro, removed obsolete commands
---- Files affected:
packages/python3:
python3-lib64.patch (1.5 -> 1.6) , python3-noarch_to_datadir.patch (1.3 -> 1.4) , python3.spec (1.41 -> 1.42)
---- Diffs:
================================================================
Index: packages/python3/python3-lib64.patch
diff -u packages/python3/python3-lib64.patch:1.5 packages/python3/python3-lib64.patch:1.6
--- packages/python3/python3-lib64.patch:1.5 Tue Feb 22 01:51:46 2011
+++ packages/python3/python3-lib64.patch Sat Apr 2 11:48:41 2011
@@ -55,25 +55,24 @@
PyAPI_FUNC(const char *) Py_GetCopyright(void);
PyAPI_FUNC(const char *) Py_GetCompiler(void);
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
-diff -Nur Python-2.5b2.orig/Lib/distutils/command/install.py Python-2.5b2/Lib/distutils/command/install.py
---- Python-2.5b2.orig/Lib/distutils/command/install.py 2006-03-27 22:55:21.000000000 +0100
-+++ Python-2.5b2/Lib/distutils/command/install.py 2006-07-12 17:42:51.000000000 +0100
-@@ -19,6 +19,8 @@
- from distutils.errors import DistutilsOptionError
- from glob import glob
+--- Python-3.2/Lib/distutils/command/install.py.orig 2010-11-25 04:46:44.000000000 +0100
++++ Python-3.2/Lib/distutils/command/install.py 2011-04-02 08:13:23.765733920 +0200
+@@ -27,6 +27,8 @@
+ from site import USER_SITE
+ HAS_USER_SITE = True
+libname = sys.lib
+
if sys.version < "2.2":
WINDOWS_SCHEME = {
'purelib': '$base',
-@@ -39,14 +41,14 @@
+@@ -47,14 +49,14 @@
INSTALL_SCHEMES = {
'unix_prefix': {
'purelib': '$base/lib/python$py_version_short/site-packages',
- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
+ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
- 'headers': '$base/include/python$py_version_short/$dist_name',
+ 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
},
@@ -115,36 +114,31 @@
check_path(cmd.install_purelib, libdir)
check_path(cmd.install_headers,
os.path.join(destination, "include", "python", "foopkg"))
-diff -Nur Python-2.5b2.orig/Lib/site.py Python-2.5b2/Lib/site.py
---- Python-2.5b2.orig/Lib/site.py 2006-06-12 09:23:02.000000000 +0100
-+++ Python-2.5b2/Lib/site.py 2006-07-12 17:42:51.000000000 +0100
-@@ -258,13 +258,19 @@
+--- Python-3.2/Lib/site.py.orig 2010-12-26 20:54:29.000000000 +0100
++++ Python-3.2/Lib/site.py 2011-04-02 08:16:21.341737273 +0200
+@@ -285,13 +285,16 @@
if sys.platform in ('os2emx', 'riscos'):
- sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
+ sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
elif os.sep == '/':
-- sitedirs.append(os.path.join(prefix, "lib",
-+ sitedirs.append(os.path.join(prefix, sys.lib,
+- sitepackages.append(os.path.join(prefix, "lib",
++ sitepackages.append(os.path.join(prefix, sys.lib,
"python" + sys.version[:3],
"site-packages"))
-- sitedirs.append(os.path.join(prefix, "lib", "site-python"))
-+ sitedirs.append(os.path.join(prefix, sys.lib, "site-python"))
+- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
++ sitepackages.append(os.path.join(prefix, sys.lib, "site-python"))
+ if sys.lib != 'lib':
-+ sitedirs.append(os.path.join(prefix, 'lib',
-+ "python" + sys.version[:3],
-+ "site-packages"))
-+ sitedirs.append(os.path.join(prefix, 'lib', "site-python"))
-+
++ sitepackages.append(os.path.join(prefix, "lib", "python" + sys.version[:3], "site-packages"))
++ sitepackages.append(os.path.join(prefix, "lib", "site-python"))
else:
- sitedirs.append(prefix)
-- sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
-+ sitedirs.append(os.path.join(prefix, sys.lib, "site-packages"))
-
+ sitepackages.append(prefix)
+- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
++ sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
-diff -Nur Python-2.5b2.orig/Makefile.pre.in Python-2.5b2/Makefile.pre.in
---- Python-2.5b2.orig/Makefile.pre.in 2006-06-27 16:45:32.000000000 +0100
-+++ Python-2.5b2/Makefile.pre.in 2006-07-12 17:42:51.000000000 +0100
-@@ -75,6 +75,8 @@
+ # locations.
+--- Python-3.2/Makefile.pre.in.orig 2011-02-19 09:47:14.000000000 +0100
++++ Python-3.2/Makefile.pre.in 2011-04-02 08:17:59.357737273 +0200
+@@ -86,6 +86,8 @@
# Machine-dependent subdirectories
MACHDEP= @MACHDEP@
@@ -153,33 +147,27 @@
# Install prefix for architecture-independent files
prefix= @prefix@
-@@ -84,11 +86,11 @@
-
- # Expanded directories
- BINDIR= $(exec_prefix)/bin
--LIBDIR= $(exec_prefix)/lib
-+LIBDIR= $(exec_prefix)/$(LIB)
+@@ -102,7 +104,7 @@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
-SCRIPTDIR= $(prefix)/lib
+SCRIPTDIR= $(prefix)/$(LIB)
+ ABIFLAGS= @ABIFLAGS@
# Detailed destination directories
- BINLIBDEST= $(LIBDIR)/python$(VERSION)
-@@ -489,7 +491,7 @@
- Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H)
+@@ -605,7 +607,7 @@
+ Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
Python/getplatform.o: $(srcdir)/Python/getplatform.c
-- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
-+ $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
+- $(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
++ $(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
Python/importdl.o: $(srcdir)/Python/importdl.c
- $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
-diff -Nur Python-2.5b2.orig/Modules/getpath.c Python-2.5b2/Modules/getpath.c
---- Python-2.5b2.orig/Modules/getpath.c 2006-07-10 02:18:57.000000000 +0100
-+++ Python-2.5b2/Modules/getpath.c 2006-07-12 17:42:51.000000000 +0100
-@@ -116,9 +116,17 @@
+ $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
+--- Python-3.2/Modules/getpath.c.orig 2010-12-03 21:14:31.000000000 +0100
++++ Python-3.2/Modules/getpath.c 2011-04-02 08:18:39.573738111 +0200
+@@ -121,9 +121,17 @@
#define EXEC_PREFIX PREFIX
#endif
@@ -199,15 +187,15 @@
#endif
#ifndef LANDMARK
-@@ -137,7 +137,7 @@
+@@ -134,7 +142,7 @@
static wchar_t exec_prefix[MAXPATHLEN+1];
static wchar_t progpath[MAXPATHLEN+1];
static wchar_t *module_search_path = NULL;
--static wchar_t lib_python[] = L"lib/python" VERSION;
-+static wchar_t lib_python[] = LIB_PYTHON VERSION;
+-static wchar_t *lib_python = L"lib/python" VERSION;
++static wchar_t *lib_python = LIB_PYTHON VERSION;
- /* In principle, this should use HAVE__WSTAT, and _wstat
- should be detected by autoconf. However, no current
+ static void
+ reduce(wchar_t *dir)
diff -Nur Python-2.5b2.orig/Python/getplatform.c Python-2.5b2/Python/getplatform.c
--- Python-2.5b2.orig/Python/getplatform.c 2000-09-02 00:29:29.000000000 +0100
+++ Python-2.5b2/Python/getplatform.c 2006-07-12 17:42:51.000000000 +0100
@@ -235,26 +223,24 @@
+{
+ return LIB;
+}
-diff -Nur Python-2.5b2.orig/Python/sysmodule.c Python-2.5b2/Python/sysmodule.c
---- Python-2.5b2.orig/Python/sysmodule.c 2006-07-10 22:08:24.000000000 +0100
-+++ Python-2.5b2/Python/sysmodule.c 2006-07-12 17:42:51.000000000 +0100
-@@ -1080,6 +1080,10 @@
- PyUnicode_FromString(Py_GetCopyright()));
- SET_SYS_FROM_STRING("platform",
- PyUnicode_FromString(Py_GetPlatform()));
-+ SET_SYS_FROM_STRING("arch",
-+ PyUnicode_FromString(Py_GetArch()));
-+ SET_SYS_FROM_STRING("lib",
-+ PyUnicode_FromString(Py_GetLib()));
- SET_SYS_FROM_STRING("executable",
- PyUnicode_FromString(Py_GetProgramFullPath()));
- SET_SYS_FROM_STRING("prefix",
-diff -Nur Python-2.5b2.orig/setup.py Python-2.5b2/setup.py
---- Python-2.5b2.orig/setup.py 2006-06-30 07:18:39.000000000 +0100
-+++ Python-2.5b2/setup.py 2006-07-12 17:45:14.000000000 +0100
-@@ -290,12 +290,12 @@
- except NameError:
- have_unicode = 0
+--- Python-3.2/Python/sysmodule.c.orig 2011-01-05 21:08:25.000000000 +0100
++++ Python-3.2/Python/sysmodule.c 2011-04-02 08:20:16.773734758 +0200
+@@ -1608,6 +1608,10 @@
+ PyUnicode_FromString(Py_GetCopyright()));
+ SET_SYS_FROM_STRING("platform",
+ PyUnicode_FromString(Py_GetPlatform()));
++ SET_SYS_FROM_STRING("arch",
++ PyUnicode_FromString(Py_GetArch()));
++ SET_SYS_FROM_STRING("lib",
++ PyUnicode_FromString(Py_GetLib()));
+ SET_SYS_FROM_STRING("executable",
+ PyUnicode_FromWideChar(
+ Py_GetProgramFullPath(), -1));
+--- Python-3.2/setup.py.orig 2010-12-28 10:51:43.000000000 +0100
++++ Python-3.2/setup.py 2011-04-02 08:21:49.597738949 +0200
+@@ -422,12 +422,12 @@
+ add_dir_to_list(self.compiler.include_dirs,
+ sysconfig.get_config_var("INCLUDEDIR"))
+ libname = sys.lib
# lib_dirs and inc_dirs are used to search for files;
@@ -267,17 +253,17 @@
]
inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = []
-@@ -496,11 +496,11 @@
- elif self.compiler.find_library_file(lib_dirs, 'curses'):
- readline_libs.append('curses')
+@@ -620,11 +620,11 @@
+ elif curses_library:
+ readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
-- ['/usr/lib/termcap'],
-+ ['/usr' + libname + '/termcap'],
- 'termcap'):
+- ['/usr/lib/termcap'],
++ ['/usr/' + libname + '/termcap'],
+ 'termcap'):
readline_libs.append('termcap')
exts.append( Extension('readline', ['readline.c'],
- library_dirs=['/usr/lib/termcap'],
-+ library_dirs=['/usr' + libname + 'termcap'],
++ library_dirs=['/usr/' + libname + '/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
- if platform not in ['mac']:
+ else:
================================================================
Index: packages/python3/python3-noarch_to_datadir.patch
diff -u packages/python3/python3-noarch_to_datadir.patch:1.3 packages/python3/python3-noarch_to_datadir.patch:1.4
--- packages/python3/python3-noarch_to_datadir.patch:1.3 Wed Feb 25 11:53:46 2009
+++ packages/python3/python3-noarch_to_datadir.patch Sat Apr 2 11:48:41 2011
@@ -1,6 +1,6 @@
---- Python-3.0.1/Modules/getpath.c.wiget 2009-02-25 10:58:09.000000000 +0100
-+++ Python-3.0.1/Modules/getpath.c 2009-02-25 11:21:43.000000000 +0100
-@@ -126,7 +126,8 @@
+--- Python-3.2/Modules/getpath.c.orig 2011-04-02 08:25:12.289739787 +0200
++++ Python-3.2/Modules/getpath.c 2011-04-02 08:31:24.349729730 +0200
+@@ -131,7 +131,8 @@
#ifndef PYTHONPATH
#define PYTHONPATH PREFIX "/" LIB_PYTHON VERSION ":" \
@@ -10,15 +10,15 @@
#endif
#ifndef LANDMARK
-@@ -138,6 +139,7 @@ static wchar_t exec_prefix[MAXPATHLEN+1]
+@@ -143,6 +144,7 @@
static wchar_t progpath[MAXPATHLEN+1];
static wchar_t *module_search_path = NULL;
- static wchar_t lib_python[] = LIB_PYTHON VERSION;
+ static wchar_t *lib_python = LIB_PYTHON VERSION;
+static wchar_t share_python[] = L"share/python" VERSION;
- /* In principle, this should use HAVE__WSTAT, and _wstat
- should be detected by autoconf. However, no current
-@@ -338,7 +340,7 @@ search_for_prefix(wchar_t *argv0_path, w
+ static void
+ reduce(wchar_t *dir)
+@@ -283,7 +285,7 @@
delim = wcschr(prefix, DELIM);
if (delim)
*delim = L'\0';
@@ -27,8 +27,8 @@
joinpath(prefix, LANDMARK);
return 1;
}
-@@ -361,7 +363,7 @@ search_for_prefix(wchar_t *argv0_path, w
- copy_absolute(prefix, argv0_path);
+@@ -309,7 +311,7 @@
+ copy_absolute(prefix, argv0_path, MAXPATHLEN+1);
do {
n = wcslen(prefix);
- joinpath(prefix, lib_python);
@@ -36,51 +36,47 @@
joinpath(prefix, LANDMARK);
if (ismodule(prefix))
return 1;
-@@ -371,7 +373,7 @@ search_for_prefix(wchar_t *argv0_path, w
+@@ -319,7 +321,7 @@
/* Look at configure's PREFIX */
- wcsncpy(prefix, L"" PREFIX, MAXPATHLEN);
+ wcsncpy(prefix, _prefix, MAXPATHLEN);
- joinpath(prefix, lib_python);
+ joinpath(prefix, share_python);
joinpath(prefix, LANDMARK);
if (ismodule(prefix))
return 1;
-@@ -598,7 +600,7 @@ calculate_path(void)
+@@ -577,7 +579,7 @@
fprintf(stderr,
"Could not find platform independent libraries <prefix>\n");
- wcsncpy(prefix, L"" PREFIX, MAXPATHLEN);
+ wcsncpy(prefix, _prefix, MAXPATHLEN);
- joinpath(prefix, lib_python);
+ joinpath(prefix, share_python);
}
else
reduce(prefix);
-@@ -611,7 +613,7 @@ calculate_path(void)
+@@ -590,7 +592,7 @@
}
else
- wcsncpy(zip_path, L"" PREFIX, MAXPATHLEN);
+ wcsncpy(zip_path, _prefix, MAXPATHLEN);
- joinpath(zip_path, L"lib/python00.zip");
+ joinpath(zip_path, LIB_PYTHON "00.zip");
- bufsz = wcslen(zip_path); /* Replace "00" with version */
+ bufsz = wcslen(zip_path); /* Replace "00" with version */
zip_path[bufsz - 6] = VERSION[0];
zip_path[bufsz - 5] = VERSION[2];
---- Python-3.0.1/Lib/site.py.wiget 2009-02-25 10:58:09.000000000 +0100
-+++ Python-3.0.1/Lib/site.py 2009-02-25 11:03:48.000000000 +0100
-@@ -262,11 +262,10 @@ def addsitepackages(known_paths):
+--- Python-3.2/Lib/site.py.orig 2011-04-02 08:25:12.000000000 +0200
++++ Python-3.2/Lib/site.py 2011-04-02 08:32:32.061730568 +0200
+@@ -289,9 +289,8 @@
"python" + sys.version[:3],
"site-packages"))
- sitedirs.append(os.path.join(prefix, sys.lib, "site-python"))
+ sitepackages.append(os.path.join(prefix, sys.lib, "site-python"))
- if sys.lib != 'lib':
-- sitedirs.append(os.path.join(prefix, 'lib',
-- "python" + sys.version[:3],
-- "site-packages"))
-- sitedirs.append(os.path.join(prefix, 'lib', "site-python"))
-+ sitedirs.append(os.path.join(prefix, 'share',
-+ "python" + sys.version[:3],
-+ "site-packages"))
-+ sitedirs.append(os.path.join(prefix, 'share', "site-python"))
-
+- sitepackages.append(os.path.join(prefix, "lib", "python" + sys.version[:3], "site-packages"))
+- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
++ sitepackages.append(os.path.join(prefix, "share", "python" + sys.version[:3], "site-packages"))
++ sitepackages.append(os.path.join(prefix, "share", "site-python"))
else:
- sitedirs.append(prefix)
+ sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
--- Python-3.0.1/Lib/distutils/sysconfig.py.wiget 2009-02-25 10:58:09.000000000 +0100
+++ Python-3.0.1/Lib/distutils/sysconfig.py 2009-02-25 10:58:09.000000000 +0100
@@ -114,12 +114,12 @@ def get_python_lib(plat_specific=0, stan
@@ -101,16 +97,16 @@
if standard_lib:
return libpython
else:
---- Python-3.0.1/Lib/distutils/command/install.py.wiget 2009-02-25 10:58:09.000000000 +0100
-+++ Python-3.0.1/Lib/distutils/command/install.py 2009-02-25 10:58:09.000000000 +0100
-@@ -40,14 +40,14 @@ else:
+--- Python-3.2/Lib/distutils/command/install.py.orig 2011-04-02 08:25:12.000000000 +0200
++++ Python-3.2/Lib/distutils/command/install.py 2011-04-02 08:33:35.957734759 +0200
+@@ -48,14 +48,14 @@
INSTALL_SCHEMES = {
'unix_prefix': {
- 'purelib': '$base/lib/python$py_version_short/site-packages',
+ 'purelib': '$base/share/python$py_version_short/site-packages',
'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
- 'headers': '$base/include/python$py_version_short/$dist_name',
+ 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
},
@@ -120,17 +116,17 @@
'platlib': '$base/'+libname+'/python',
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
---- Python-3.0.1/Makefile.pre.in.wiget 2009-02-25 10:58:09.000000000 +0100
-+++ Python-3.0.1/Makefile.pre.in 2009-02-25 10:58:09.000000000 +0100
-@@ -93,7 +93,7 @@ LIBDIR= $(exec_prefix)/$(LIB)
+--- Python-3.2/Makefile.pre.in.orig 2011-04-02 08:25:12.000000000 +0200
++++ Python-3.2/Makefile.pre.in 2011-04-02 08:34:06.809736435 +0200
+@@ -104,7 +104,7 @@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
-SCRIPTDIR= $(prefix)/$(LIB)
+SCRIPTDIR= $(prefix)/share
+ ABIFLAGS= @ABIFLAGS@
# Detailed destination directories
- BINLIBDEST= $(LIBDIR)/python$(VERSION)
--- Python-3.0.1/Lib/distutils/tests/test_install.py.wig 2009-02-25 11:42:38.000000000 +0100
+++ Python-3.0.1/Lib/distutils/tests/test_install.py 2009-02-25 11:51:23.000000000 +0100
@@ -38,7 +38,7 @@ class InstallTestCase(support.TempdirMan
================================================================
Index: packages/python3/python3.spec
diff -u packages/python3/python3.spec:1.41 packages/python3/python3.spec:1.42
--- packages/python3/python3.spec:1.41 Sat Mar 12 09:05:22 2011
+++ packages/python3/python3.spec Sat Apr 2 11:48:41 2011
@@ -440,11 +440,10 @@
%setup -q -n Python-%{version}
%patch0 -p1
%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
+%patch2 -p1
+%patch3 -p1
%build
-sed -i -e 's#-ltermcap#-ltinfo#g' configure*
%{__autoconf}
CPPFLAGS="-I/usr/include/ncursesw %{rpmcppflags}"; export CPPFLAGS
%configure \
@@ -539,28 +538,24 @@
# just to cut the noise, as they are not packaged (now)
# first tests
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/test
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/bsddb/test
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/ctypes/test
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/distutils/tests
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/email/test
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/sqlite3/test
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/json/tests
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/lib2to3/tests
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/importlib/test
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/tkinter/test
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/test
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/ctypes/test
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/distutils/tests
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/email/test
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/importlib/test
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/lib2to3/tests
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/sqlite3/test
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/tkinter/test
# other files
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/plat-*/regen
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/ctypes/macholib/fetch_macholib*
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/site-packages/README
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/distutils/command/wininst*.exe
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/idlelib/*.bat
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/idlelib/*.pyw
-rm -rf $RPM_BUILD_ROOT%{_bindir}/smtpd.py
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/plat-*/regen
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/ctypes/macholib/fetch_macholib*
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/site-packages/README
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/distutils/command/wininst*.exe
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/idlelib/*.bat
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/idlelib/*.pyw
# already in %%doc
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/pdb.doc
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/LICENSE.txt
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/LICENSE.txt
%clean
rm -rf $RPM_BUILD_ROOT
@@ -568,10 +563,10 @@
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%post doc-info -p /sbin/postshell
+%post doc-info -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
-%postun doc-info -p /sbin/postshell
+%postun doc-info -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
%files
@@ -908,6 +903,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.42 2011/04/02 09:48:41 qboosh
+- updated lib64 and noarch_to_datadir patches
+- use __rm macro, removed obsolete commands
+
Revision 1.41 2011/03/12 08:05:22 qboosh
- pl for 2to3
- dropped beta macro (belongs to DEVEL branch)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python3/python3-lib64.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python3/python3-noarch_to_datadir.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python3/python3.spec?r1=1.41&r2=1.42&f=u
More information about the pld-cvs-commit
mailing list