rpms/python/devel python-syslog-fail-noatexittb.patch, NONE, 1.1 python.spec, 1.95, 1.96

[fedora-cvs-commits at redhat.com]

Author: katzj

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22932

Modified Files:
	python.spec 
Added Files:
	python-syslog-fail-noatexittb.patch 
Log Message:
* Mon Dec 11 2006 Jeremy Katz <katzj at redhat.com> - 2.5.3-3
- fix atexit traceback with failed syslog logger (#218214)
- split libpython into python-libs subpackage for multilib apps 
  embedding python interpreters


python-syslog-fail-noatexittb.patch:
 handlers.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE python-syslog-fail-noatexittb.patch ---
--- Python-2.4.4/Lib/logging/handlers.py.syslogexit	2006-12-05 11:41:12.000000000 -0500
+++ Python-2.4.4/Lib/logging/handlers.py	2006-12-05 11:41:20.000000000 -0500
@@ -586,11 +586,11 @@
         self.address = address
         self.facility = facility
         if type(address) == types.StringType:
-            self._connect_unixsocket(address)
             self.unixsocket = 1
+            self._connect_unixsocket(address)
         else:
-            self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
             self.unixsocket = 0
+            self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
         self.formatter = None
 


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- python.spec	6 Dec 2006 22:15:01 -0000	1.95
+++ python.spec	11 Dec 2006 17:40:03 -0000	1.96
@@ -21,8 +21,8 @@
 Name: %{python}
 #Version: %{pybasever}.3
 Version: 2.5
-Release: 2%{?dist}
-License: PSF - see LICENSE
+Release: 3%{?dist}
+License: Python Software Foundation License v2 
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
 Provides: python(abi) = %{pybasever}
@@ -36,6 +36,9 @@
 Patch5: python-2.5-cflags.patch
 Patch6: python-db45.patch
 
+# upstreamed
+Patch25: python-syslog-fail-noatexittb.patch
+
 # disable egg-infos for now
 Patch50: python-2.5-disable-egginfo.patch
 
@@ -82,6 +85,16 @@
 Note that documentation for Python is provided in the python-docs
 package.
 
+%package libs
+Summary: The libraries for python runtime
+Group: Applications/System
+Requires: %{python} = %{version}-%{release}
+
+%description libs
+The python interpreter can be embedded into applications wanting to 
+use python as an embedded scripting language.  The python-libs package 
+provides the libraries needed for this.
+
 %package devel
 Summary: The libraries and header files needed for Python development.
 Group: Development/Libraries
@@ -147,6 +160,7 @@
 %patch4 -p1 -b .canonicalize
 %patch5 -p1 -b .cflags
 %patch6 -p1 -b .db45
+%patch25 -p1 -b .syslog-atexit
 
 %patch50 -p1 -b .egginfo
 
@@ -326,13 +340,17 @@
 %clean
 rm -fr $RPM_BUILD_ROOT
 
+%post -n libs -p /sbin/ldconfig
+
+%postun -n libs -p /sbin/ldconfig
+
+
 %files -f dynfiles
 %defattr(-, root, root)
 %doc LICENSE README
 %{_bindir}/pydoc*
 %{_bindir}/python*
 %{_mandir}/*/*
-%{_libdir}/libpython%{pybasever}.so*
 
 %dir %{_libdir}/python%{pybasever}
 %dir %{_libdir}/python%{pybasever}/site-packages
@@ -360,11 +378,17 @@
 %attr(0755,root,root) %dir /usr/lib/python%{pybasever}/site-packages
 %endif
 
+%files libs
+%defattr(-,root,root)
+%doc LICENSE README
+%{_libdir}/libpython%{pybasever}.so.*
+
 %files devel
 %defattr(-,root,root)
 /usr/include/*
 %{_libdir}/python%{pybasever}/config
 %{_libdir}/python%{pybasever}/test
+%{_libdir}/libpython%{pybasever}.so
 
 %files tools
 %defattr(-,root,root,755)
@@ -388,6 +412,11 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Dec 11 2006 Jeremy Katz <katzj at redhat.com> - 2.5.3-3
+- fix atexit traceback with failed syslog logger (#218214)
+- split libpython into python-libs subpackage for multilib apps 
+  embedding python interpreters
+
 * Wed Dec  6 2006 Jeremy Katz <katzj at redhat.com> - 2.5.3-2
 - disable installation of .egg-info files for now