From 9b1ffce3cead9192e4379b32b3e1af1b47ff4f47974c0dba3bbc4fb33ae463b2 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sun, 8 Feb 2009 01:28:20 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=32

---
 python-base.changes | 6 ++++++
 python-base.spec    | 8 +++++++-
 python-doc.spec     | 2 +-
 python.spec         | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/python-base.changes b/python-base.changes
index b168869..f293e3c 100644
--- a/python-base.changes
+++ b/python-base.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  6 16:10:31 CET 2009 - matejcik@suse.cz
+
+- excluded pyconfig.h and Makefile and Setup from -devel subpackage
+  to prevent file conflicts of python-base and python-devel
+
 -------------------------------------------------------------------
 Thu Jan 15 16:00:02 CET 2009 - matejcik@suse.cz
 
diff --git a/python-base.spec b/python-base.spec
index d19a004..6c2e26c 100644
--- a/python-base.spec
+++ b/python-base.spec
@@ -33,7 +33,7 @@ Obsoletes:      python-64bit
 #
 Summary:        Python Interpreter base package
 Version:        2.6.0
-Release:        6
+Release:        9
 #%define       tarname        Python-%{version}
 %define       tarname        Python-2.6
 Source0:        %{tarname}.tar.bz2
@@ -263,9 +263,12 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python-devel
 %defattr(-, root, root)
 %{_libdir}/python%{python_version}/config/*
+%exclude %{_libdir}/python%{python_version}/config/Setup
+%exclude %{_libdir}/python%{python_version}/config/Makefile
 %defattr(644, root, root, 755)
 %{_libdir}/libpython*.so
 %{_includedir}/python*
+%exclude %{_includedir}/python%{python_version}/pyconfig.h
 %{_libdir}/python%{python_version}/test
 %defattr(755, root, root)
 %{_bindir}/python-config
@@ -383,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/python2
 
 %changelog
+* Fri Feb 06 2009 matejcik@suse.cz
+- excluded pyconfig.h and Makefile and Setup from -devel subpackage
+  to prevent file conflicts of python-base and python-devel
 * Thu Jan 15 2009 matejcik@suse.cz
 - fixed gettext.py problem with empty plurals line (bnc#462375)
 * Wed Jan 07 2009 olh@suse.de
diff --git a/python-doc.spec b/python-doc.spec
index c6c11d1..1a68647 100644
--- a/python-doc.spec
+++ b/python-doc.spec
@@ -24,7 +24,7 @@ Group:          Development/Languages/Python
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Additional Package Documentation for Python.
 Version:        2.6
-Release:        6
+Release:        9
 %define pyver   2.6
 BuildArch:      noarch
 %define       tarname        Python-%{pyver}
diff --git a/python.spec b/python.spec
index 07afc7d..0ef3bca 100644
--- a/python.spec
+++ b/python.spec
@@ -35,7 +35,7 @@ Obsoletes:      python-64bit
 Obsoletes:      python-nothreads python21 python-elementtree python-sqlite
 Summary:        Python Interpreter
 Version:        2.6.0
-Release:        6
+Release:        9
 Requires:       python-base = %{version}
 #%define       tarname        Python-%{version}
 %define       tarname        Python-2.6