rpms/rhnlib/devel rhnlib.spec,1.17,1.18

[fedora-cvs-commits at redhat.com]

Author: misa

Update of /cvs/dist/rpms/rhnlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18999

Modified Files:
	rhnlib.spec 
Log Message:
Building for rawhide


Index: rhnlib.spec
===================================================================
RCS file: /cvs/dist/rpms/rhnlib/devel/rhnlib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rhnlib.spec	10 Aug 2005 03:19:09 -0000	1.17
+++ rhnlib.spec	1 Dec 2005 15:46:58 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Python libraries for the RHN project
 Name: rhnlib
-Version: 1.8
-Release: 6.p24.11
+Version: 2.0
+Release: 1.p24.1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Development/Libraries
@@ -11,7 +11,6 @@
 Requires: pyOpenSSL python
 BuildRequires: python-devel
 Url: http://rhn.redhat.com
-Patch0: rhnlib-ssl.patch
 
 %description
 rhnlib is a collection of python modules used by the 
@@ -19,13 +18,18 @@
 
 %prep
 %setup
-%patch0 -p0 -b .timeout-ssl
+if [ ! -e setup.py ]; then
+    sed -e 's/@VERSION@/$(VERSION)/' -e 's/@NAME@/$(NAME)/' setup.py.in > setup.py
+fi
+if [ ! -e setup.cfg ]; then
+    sed 's/@RELEASE@/$(RELEASE)/' setup.py.in > setup.py
+fi
 
 %build
 %{__python} setup.py build
 
 %install
-%{__python} setup.py install --optimize 1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+%{__python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
 sed -e 's|/[^/]*$||' INSTALLED_FILES | grep "site-packages/" | \
     sort | uniq | awk '{ print "%attr(755,root,root) %dir " $1}' > INSTALLED_DIRS
 cat INSTALLED_FILES INSTALLED_DIRS > INSTALLED_OBJECTS
@@ -38,15 +42,13 @@
 %doc ChangeLog COPYING README TODO
 
 %changelog
-* Tue Aug  9 2005 Mihai Ibanescu <misa at redhat.com> 1.8-6.p23.11
+* Wed Nov 30 2005 Mihai Ibanescu <misa at redhat.com> 2.0-1
 - Fixed #165481 (setting socket timeouts causes uncaught SSL exceptions)
-- Fixed #165087 (added .pyo files to package)
+- Fixed #143833 (memory leak in SSL, caused by the cert verification callback)
+- Finally incorporated patch from bug #135660 (basic HTTP authentication)
 
-* Thu Mar 17 2005 Mihai Ibanescu <misa at redhat.com> 1.8-6.p24.1
-- rebuild
-
-* Tue Nov  9 2004 Nalin Dahyabhai <nalin at redhat.com> 1.8-6.p23.fc3.1
-- rebuild
+* Fri Jul  1 2005 Joel Martin <jmartin at redhat.com> 1.8-7
+- Allow spec file to be used without Makefile (for Solaris builds)
 
 * Mon Jul 19 2004 Mihai Ibanescu <misa at redhat.com> 1.8-6
 - Fixed #128008 (internal _httplib, used with python 1.5.2, missed a