rpms/stomppy/EL-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 stomppy.spec, 1.1, 1.2 stomppy-rm-bang-python.patch, 1.1, NONE

[stevetraylen]

Author: stevetraylen

Update of /cvs/pkgs/rpms/stomppy/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17489

Modified Files:
	.cvsignore sources stomppy.spec 
Removed Files:
	stomppy-rm-bang-python.patch 
Log Message:
First EL6 build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stomppy/EL-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Oct 2009 21:37:18 -0000	1.2
+++ .cvsignore	14 May 2010 19:53:30 -0000	1.3
@@ -1 +1 @@
-stomp.py-2.0.4.tar.gz
+stomp.py-3.0.1-beta2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stomppy/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Oct 2009 21:37:18 -0000	1.2
+++ sources	14 May 2010 19:53:30 -0000	1.3
@@ -1 +1 @@
-2cb207ffc52280bab5457523b90a8f11  stomp.py-2.0.4.tar.gz
+c3d9da3087af4b0386a01bf0d1aeeaab  stomp.py-3.0.1-beta2.tar.gz


Index: stomppy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stomppy/EL-6/stomppy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- stomppy.spec	3 Oct 2009 21:37:18 -0000	1.1
+++ stomppy.spec	14 May 2010 19:53:30 -0000	1.2
@@ -1,38 +1,89 @@
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%endif
+
+%if 0%{?fedora} > 12
+%global with_python3 1
+%endif
+
+%global beta 2
 
 Name:           stomppy
-Version:        2.0.4
-Release:        1%{?dist}
+Version:        3.0.1
+Release:        %{?beta:0.}2%{?beta:.beta%{beta}}%{?dist}
 Summary:        Python stomp client for messaging
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://code.google.com/p/stomppy/
-Source0:        http://stomppy.googlecode.com/files/stomp.py-%{version}.tar.gz
-Patch1:        %{name}-rm-bang-python.patch
+Source0:        http://stomppy.googlecode.com/files/stomp.py-%{version}%{?beta:-beta%{beta}}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
+%if 0%{?with_python3}
+BuildRequires:  python3-devel
+%endif # if with_python3
+
+# Needs python-ssl for python 2.3 and 2.4.
+%if 0%{?el4}%{?el5}
+Requires: python-ssl
+%endif
+
 
 %description
 stomp.py is a Python client library for accessing messaging servers 
 (such as ActiveMQ or JBoss Messaging) using the STOMP protocol. It can also
 be run as a standalone, command-line client for testing.
 
+%if 0%{?with_python3}
+%package -n python3-stomppy
+Summary:        Python stomp client for messaging for python3
+Group:          Development/Libraries
+
+%description -n python3-stomppy
+stomp.py is a Python client library for accessing messaging servers 
+(such as ActiveMQ or JBoss Messaging) using the STOMP protocol. It can also
+be run as a standalone, command-line client for testing.
+
+This module is for the python3.
+%endif
+
+
+
 %prep
 %setup -q -n stomp.py-%{version}
-%patch1 -p1
 # Remove dos line feeds from tests.
-%{__sed} -i 's/\r//' test/testlistener.py
-%{__sed} -i 's/\r//' test/rabbitmq.py
-%{__sed} -i 's/\r//' test/basic.py
+sed -i 's/\r//' README
+chmod 644 README
+
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif # with_python3
+
 
 %build
 %{__python} setup.py build
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
+
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+rm -rf %{buildroot}%{python3_sitelib}/test
+popd
+%endif # with_python3
+
+
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{python_sitelib}/test
 
@@ -42,9 +93,26 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{python_sitelib}/*
-%doc test LICENSE
+%doc LICENSE CHANGELOG README
+
+%if 0%{?with_python3}
+%files -n python3-stomppy
+%defattr(-,root,root,-)
+%{python3_sitelib}/*
+%doc LICENSE CHANGELOG README
+%endif # with_python3
+
 
 %changelog
+* Fri May 14 2010 Steve Traylen <steve.traylen at cern.ch> -  3.0.1-0.2.beta2
+- Build with correct file this time.
+
+* Thu May 13 2010 Steve Traylen <steve.traylen at cern.ch> -  3.0.1-0.1.beta2
+- Update to 3.0.2beta2
+- Add new CHANGELOG and README files.
+- Add python3 support.
+- Remove python-rm-bang-python.patch, no longer a file to patch even.
+
 * Wed Sep 30 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.4-1
 - Update to 2.0.4
   remove patch to allow building with out network.


--- stomppy-rm-bang-python.patch DELETED ---