From 9345b0fcac103756a5aacbb8a49d996b23bf0450 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Apr 19 2012 00:19:10 +0000
Subject: 2.7.3-2: fix -config symlinks (patch 112; rhbz#813836)


* Wed Apr 18 2012 David Malcolm <dmalcolm@redhat.com> - 2.7.3-2
- fix -config symlinks (patch 112; rhbz#813836)

---

diff --git a/python-2.7.3-debug-build.patch b/python-2.7.3-debug-build.patch
index d17bf5d..b44c9eb 100644
--- a/python-2.7.3-debug-build.patch
+++ b/python-2.7.3-debug-build.patch
@@ -1,6 +1,6 @@
 diff -up Python-2.7.3/configure.in.debug-build Python-2.7.3/configure.in
---- Python-2.7.3/configure.in.debug-build	2012-04-13 00:13:53.923498660 -0400
-+++ Python-2.7.3/configure.in	2012-04-13 00:13:53.929498585 -0400
+--- Python-2.7.3/configure.in.debug-build	2012-04-18 19:46:22.066498521 -0400
++++ Python-2.7.3/configure.in	2012-04-18 19:46:22.078498372 -0400
 @@ -635,7 +635,7 @@ AC_SUBST(LIBRARY)
  AC_MSG_CHECKING(LIBRARY)
  if test -z "$LIBRARY"
@@ -38,7 +38,7 @@ diff -up Python-2.7.3/configure.in.debug-build Python-2.7.3/configure.in
  
 diff -up Python-2.7.3/Lib/distutils/command/build_ext.py.debug-build Python-2.7.3/Lib/distutils/command/build_ext.py
 --- Python-2.7.3/Lib/distutils/command/build_ext.py.debug-build	2012-04-09 19:07:29.000000000 -0400
-+++ Python-2.7.3/Lib/distutils/command/build_ext.py	2012-04-13 00:13:53.930498573 -0400
++++ Python-2.7.3/Lib/distutils/command/build_ext.py	2012-04-18 19:46:22.079498360 -0400
 @@ -676,7 +676,10 @@ class build_ext (Command):
          so_ext = get_config_var('SO')
          if os.name == 'nt' and self.debug:
@@ -61,8 +61,8 @@ diff -up Python-2.7.3/Lib/distutils/command/build_ext.py.debug-build Python-2.7.
              else:
                  return ext.libraries
 diff -up Python-2.7.3/Lib/distutils/sysconfig.py.debug-build Python-2.7.3/Lib/distutils/sysconfig.py
---- Python-2.7.3/Lib/distutils/sysconfig.py.debug-build	2012-04-13 00:13:53.899498961 -0400
-+++ Python-2.7.3/Lib/distutils/sysconfig.py	2012-04-13 00:13:53.930498573 -0400
+--- Python-2.7.3/Lib/distutils/sysconfig.py.debug-build	2012-04-18 19:46:21.988499499 -0400
++++ Python-2.7.3/Lib/distutils/sysconfig.py	2012-04-18 19:46:22.080498348 -0400
 @@ -85,7 +85,8 @@ def get_python_inc(plat_specific=0, pref
                  # Include is located in the srcdir
                  inc_dir = os.path.join(srcdir, "Include")
@@ -83,8 +83,8 @@ diff -up Python-2.7.3/Lib/distutils/sysconfig.py.debug-build Python-2.7.3/Lib/di
  
  def parse_config_h(fp, g=None):
 diff -up Python-2.7.3/Lib/distutils/tests/test_install.py.debug-build Python-2.7.3/Lib/distutils/tests/test_install.py
---- Python-2.7.3/Lib/distutils/tests/test_install.py.debug-build	2012-04-13 00:14:36.177970408 -0400
-+++ Python-2.7.3/Lib/distutils/tests/test_install.py	2012-04-13 00:15:20.675414113 -0400
+--- Python-2.7.3/Lib/distutils/tests/test_install.py.debug-build	2012-04-18 19:46:21.997499385 -0400
++++ Python-2.7.3/Lib/distutils/tests/test_install.py	2012-04-18 19:46:22.080498348 -0400
 @@ -20,8 +20,9 @@ from distutils.tests import support
  
  
@@ -97,8 +97,8 @@ diff -up Python-2.7.3/Lib/distutils/tests/test_install.py.debug-build Python-2.7
  
  
 diff -up Python-2.7.3/Makefile.pre.in.debug-build Python-2.7.3/Makefile.pre.in
---- Python-2.7.3/Makefile.pre.in.debug-build	2012-04-13 00:13:53.927498611 -0400
-+++ Python-2.7.3/Makefile.pre.in	2012-04-13 00:13:53.931498561 -0400
+--- Python-2.7.3/Makefile.pre.in.debug-build	2012-04-18 19:46:22.073498437 -0400
++++ Python-2.7.3/Makefile.pre.in	2012-04-18 19:48:46.336694896 -0400
 @@ -102,8 +102,8 @@ SCRIPTDIR=	$(prefix)/lib64
  # Detailed destination directories
  BINLIBDEST=	$(LIBDIR)/python$(VERSION)
@@ -143,20 +143,36 @@ diff -up Python-2.7.3/Makefile.pre.in.debug-build Python-2.7.3/Makefile.pre.in
  	if test $(INSTSONAME) != $(LDLIBRARY); then \
  		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
  		$(LN) -f $(INSTSONAME) $@; \
-@@ -798,10 +804,10 @@ bininstall:	altbininstall
+@@ -796,18 +802,18 @@ bininstall:	altbininstall
+ 	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
+ 	else true; \
  	fi
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON))
- 	-rm -f $(DESTDIR)$(BINDIR)/python2$(EXE)
+-	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON))
+-	-rm -f $(DESTDIR)$(BINDIR)/python2$(EXE)
 -	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE))
-+	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(DEBUG_SUFFIX)$(EXE) python2$(EXE))
-+	-rm -f $(DESTDIR)$(BINDIR)/python$(DEBUG_SUFFIX)-config
-+	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(DEBUG_SUFFIX)-config python2-config)
- 	-rm -f $(DESTDIR)$(BINDIR)/python2-config
+-	-rm -f $(DESTDIR)$(BINDIR)/python2-config
 -	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config)
 -	-rm -f $(DESTDIR)$(BINDIR)/python-config
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2-config python-config)
+-	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2-config python-config)
++	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(DEBUG_SUFFIX)$(EXE) $(PYTHON))
++	-rm -f $(DESTDIR)$(BINDIR)/python2$(DEBUG_SUFFIX)$(EXE)
++	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(DEBUG_SUFFIX)$(EXE) python2$(DEBUG_SUFFIX)$(EXE))
++	-rm -f $(DESTDIR)$(BINDIR)/python2$(DEBUG_SUFFIX)-config
++	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(DEBUG_SUFFIX)-config python2$(DEBUG_SUFFIX)-config)
++	-rm -f $(DESTDIR)$(BINDIR)/python$(DEBUG_SUFFIX)-config
++	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(DEBUG_SUFFIX)-config python$(DEBUG_SUFFIX)-config)
  	-test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
- 	-rm -f $(DESTDIR)$(LIBPC)/python2.pc
+-	-rm -f $(DESTDIR)$(LIBPC)/python2.pc
+-	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
+-	-rm -f $(DESTDIR)$(LIBPC)/python.pc
+-	(cd $(DESTDIR)$(LIBPC); $(LN) -s python2.pc python.pc)
++	-rm -f $(DESTDIR)$(LIBPC)/python2$(DEBUG_SUFFIX).pc
++	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)$(DEBUG_SUFFIX).pc python2$(DEBUG_SUFFIX).pc)
++	-rm -f $(DESTDIR)$(LIBPC)/python$(DEBUG_SUFFIX).pc
++	(cd $(DESTDIR)$(LIBPC); $(LN) -s python2$(DEBUG_SUFFIX).pc python$(DEBUG_SUFFIX).pc)
+ 
+ # Install the interpreter with $(VERSION) affixed
+ # This goes into $(exec_prefix)
 @@ -820,7 +826,7 @@ altbininstall:	$(BUILDPYTHON)
  		else	true; \
  		fi; \
@@ -197,8 +213,12 @@ diff -up Python-2.7.3/Makefile.pre.in.debug-build Python-2.7.3/Makefile.pre.in
  	@for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \
  	do \
  		if test ! -d $(DESTDIR)$$i; then \
-@@ -1019,8 +1026,7 @@ libainstall:	all python-config
- 	$(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc
+@@ -1016,11 +1023,10 @@ libainstall:	all python-config
+ 	$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
+ 	$(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
+ 	$(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
+-	$(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc
++	$(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION)$(DEBUG_SUFFIX).pc
  	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
  	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
 -	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
@@ -209,7 +229,7 @@ diff -up Python-2.7.3/Makefile.pre.in.debug-build Python-2.7.3/Makefile.pre.in
  		echo; echo "Installing support files for building shared extension modules on AIX:"; \
 diff -up Python-2.7.3/Misc/python-config.in.debug-build Python-2.7.3/Misc/python-config.in
 --- Python-2.7.3/Misc/python-config.in.debug-build	2012-04-09 19:07:33.000000000 -0400
-+++ Python-2.7.3/Misc/python-config.in	2012-04-13 00:13:53.931498561 -0400
++++ Python-2.7.3/Misc/python-config.in	2012-04-18 19:46:22.082498324 -0400
 @@ -45,7 +45,7 @@ for opt in opt_flags:
  
      elif opt in ('--libs', '--ldflags'):
@@ -221,7 +241,7 @@ diff -up Python-2.7.3/Misc/python-config.in.debug-build Python-2.7.3/Misc/python
          if opt == '--ldflags':
 diff -up Python-2.7.3/Modules/makesetup.debug-build Python-2.7.3/Modules/makesetup
 --- Python-2.7.3/Modules/makesetup.debug-build	2012-04-09 19:07:34.000000000 -0400
-+++ Python-2.7.3/Modules/makesetup	2012-04-13 00:13:53.931498561 -0400
++++ Python-2.7.3/Modules/makesetup	2012-04-18 19:46:22.083498312 -0400
 @@ -233,7 +233,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
  			*$mod.o*)	base=$mod;;
  			*)		base=${mod}module;;
@@ -233,7 +253,7 @@ diff -up Python-2.7.3/Modules/makesetup.debug-build Python-2.7.3/Modules/makeset
  			esac
 diff -up Python-2.7.3/Python/dynload_shlib.c.debug-build Python-2.7.3/Python/dynload_shlib.c
 --- Python-2.7.3/Python/dynload_shlib.c.debug-build	2012-04-09 19:07:35.000000000 -0400
-+++ Python-2.7.3/Python/dynload_shlib.c	2012-04-13 00:13:53.931498561 -0400
++++ Python-2.7.3/Python/dynload_shlib.c	2012-04-18 19:46:22.083498312 -0400
 @@ -46,11 +46,16 @@ const struct filedescr _PyImport_DynLoad
      {"module.exe", "rb", C_EXTENSION},
      {"MODULE.EXE", "rb", C_EXTENSION},
@@ -256,7 +276,7 @@ diff -up Python-2.7.3/Python/dynload_shlib.c.debug-build Python-2.7.3/Python/dyn
  
 diff -up Python-2.7.3/Python/sysmodule.c.debug-build Python-2.7.3/Python/sysmodule.c
 --- Python-2.7.3/Python/sysmodule.c.debug-build	2012-04-09 19:07:35.000000000 -0400
-+++ Python-2.7.3/Python/sysmodule.c	2012-04-13 00:13:53.932498549 -0400
++++ Python-2.7.3/Python/sysmodule.c	2012-04-18 19:46:22.083498312 -0400
 @@ -1506,6 +1506,12 @@ _PySys_Init(void)
                          PyString_FromString("legacy"));
  #endif
diff --git a/python.spec b/python.spec
index e8f7ebf..393befc 100644
--- a/python.spec
+++ b/python.spec
@@ -108,7 +108,7 @@ Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 # Remember to also rebase python-docs when changing this:
 Version: 2.7.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Python
 Group: Development/Languages
 Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@@ -1169,10 +1169,6 @@ cp -a save_bits_of_test/* %{buildroot}/%{pylibdir}/test
 fi
 
 %if %{main_python}
-ln -s python2.7-debug-config %{buildroot}%{_bindir}/python-debug-config
-%if 0%{?with_debug_build}
-ln -s python-debug %{buildroot}%{_bindir}/python2-debug
-%endif # with_debug_build
 %else
 mv %{buildroot}%{_bindir}/python %{buildroot}%{_bindir}/%{python}
 %if 0%{?with_debug_build}
@@ -1573,6 +1569,7 @@ rm -fr %{buildroot}
 %doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
 %if %{main_python}
 %{_bindir}/python-config
+%{_bindir}/python2-config
 %endif
 %{_bindir}/python%{pybasever}-config
 %{_libdir}/libpython%{pybasever}.so
@@ -1712,10 +1709,14 @@ rm -fr %{buildroot}
 
 # Analog of the -devel subpackage's files:
 %dir %{pylibdir}/config-debug
+%{_libdir}/pkgconfig/python-%{pybasever}-debug.pc
+%{_libdir}/pkgconfig/python-debug.pc
+%{_libdir}/pkgconfig/python2-debug.pc
 %{pylibdir}/config-debug/*
 %{_includedir}/python%{pybasever}-debug/*.h
 %if %{main_python}
 %{_bindir}/python-debug-config
+%{_bindir}/python2-debug-config
 %endif
 %{_bindir}/python%{pybasever}-debug-config
 %{_libdir}/libpython%{pybasever}_d.so
@@ -1752,6 +1753,9 @@ rm -fr %{buildroot}
 # ======================================================
 
 %changelog
+* Wed Apr 18 2012 David Malcolm <dmalcolm@redhat.com> - 2.7.3-2
+- fix -config symlinks (patch 112; rhbz#813836)
+
 * Wed Apr 11 2012 David Malcolm <dmalcolm@redhat.com> - 2.7.3-1
 - 2.7.3: refresh patch 102 (lib64); drop upstream patches 11 (ascii-to-lower),
 115 (pydoc robustness), 145 (linux2), 148 (gdbm magic values), 151 (deadlock