[moksha] 1.0.0, new upstream release as a meta package.
Ralph Bean
ralph at fedoraproject.org
Wed Sep 19 14:59:13 UTC 2012
commit c8883d39da73b3c24c4ff565d19e9577b970ee95
Author: Ralph Bean <rbean at redhat.com>
Date: Wed Sep 19 10:59:07 2012 -0400
1.0.0, new upstream release as a meta package.
moksha.spec | 161 ++++++-----------------------------------------------------
1 files changed, 16 insertions(+), 145 deletions(-)
---
diff --git a/moksha.spec b/moksha.spec
index a711ad0..37b8096 100644
--- a/moksha.spec
+++ b/moksha.spec
@@ -2,123 +2,27 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: moksha
-Version: 0.8.8
-Release: 4%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
Summary: A platform for creating real-time web applications
Group: Applications/Internet
License: ASL 2.0
URL: https://fedorahosted.org/moksha
Source0: http://pypi.python.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz
-# This will be fixed in 0.8.9
-Patch0: moksha-Support-ssl-websockets-on-the-client-wss.patch
-
-# The upstream source used to be here:
-#Source0: https://fedorahosted.org/releases/m/o/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: python-setuptools
-%if %{?rhel}%{!?rhel:0} >= 6
-BuildRequires: python-webob1.0 >= 0.9.7
-%else
-BuildRequires: python-webob >= 0.9.7
-%endif
-BuildRequires: pytz
-BuildRequires: python-setuptools-devel
-BuildRequires: python-devel
-BuildRequires: python-pygments
-BuildRequires: python-paver
-BuildRequires: python-sphinx
-BuildRequires: python-paste
-BuildRequires: python-nose
-BuildRequires: python-coverage
-BuildRequires: python-BeautifulSoup
-BuildRequires: python-stomper
-BuildRequires: python-kitchen
-BuildRequires: python-psutil
-BuildRequires: python-fabulous
-BuildRequires: python-tw2-core
-BuildRequires: python-tw2-forms
-BuildRequires: python-tw2-jquery
-BuildRequires: python-tw2-jqplugins-ui
-BuildRequires: python-tw2-jqplugins-flot
-BuildRequires: python-tw2-jqplugins-gritter
-BuildRequires: python-tw2-excanvas
-BuildRequires: python-tw2-jit
-BuildRequires: python-twisted-core
-BuildRequires: python-txzmq >= 0.5.0
-BuildRequires: python-txws
-BuildRequires: python-feedparser
-BuildRequires: python-feedcache
-BuildRequires: python-shove
-BuildRequires: python-bunch
-BuildRequires: python-daemon
-
-BuildRequires: pyOpenSSL
-BuildRequires: python-babel
-BuildRequires: orbited
-BuildRequires: python-repoze-who-testutil
-BuildRequires: python-amqplib
-BuildRequires: python-webhelpers
-BuildRequires: python-webtest
-
-%if %{?rhel}%{!?rhel:0} >= 6
-# repoze.what gets included by something else on el6.
-%else
-BuildRequires: python-repoze-what-quickstart
-%endif
-
-
-%if 0%{?el5}
-BuildRequires: python-sqlite2
-BuildRequires: python-hashlib
-Requires: python-sqlite2
-Requires: python-hashlib
-%endif
-
-%if %{?rhel}%{!?rhel:0} >= 6
-Requires: python-webob1.0 >= 0.9.7
-%else
-Requires: python-webob >= 0.9.7
-%endif
-Requires: python-zope-sqlalchemy
-Requires: python-shove
-Requires: python-bunch
-Requires: python-feedcache
-Requires: python-feedparser
-Requires: python-sphinx
-Requires: python-paver
-Requires: python-morbid
-Requires: pytz
-Requires: python-repoze-what
-Requires: python-repoze-who-testutil
-Requires: python-BeautifulSoup
-Requires: python-twisted-core
-Requires: python-zmq
-Requires: python-txzmq >= 0.5.0
-Requires: python-txws
-Requires: python-stomper
-Requires: python-daemon
-Requires: python-kitchen
-Requires: python-psutil
-Requires: python-fabulous
-Requires: python-tw2-core
-Requires: python-tw2-forms
-Requires: python-tw2-jquery
-Requires: python-tw2-jqplugins-ui
-Requires: python-tw2-jqplugins-flot
-Requires: python-tw2-jqplugins-gritter
-Requires: python-tw2-excanvas
-Requires: python-tw2-jit
-
-Requires: pyOpenSSL
-Requires: python-babel
-Requires: python-webhelpers
-
-# This gets imported in moksha.lib.helpers making it, unfortunately, required.
-Requires: orbited
+BuildRequires: python-setuptools
+BuildRequires: python-sphinx
+BuildRequires: python-nose
+BuildRequires: python-moksha-common
+BuildRequires: python-moksha-hub
+BuildRequires: python-moksha-wsgi
+Requires: python-moksha-common
+Requires: python-moksha-hub
+Requires: python-moksha-wsgi
%description
Moksha is a platform for creating real-time collaborative web applications. It
@@ -148,21 +52,13 @@ This package contains an Apache mod_wsgi configuration for Moksha.
%prep
%setup -q
-%patch0 -p1
%if %{?rhel}%{!?rhel:0} >= 6
-
# Make sure that epel/rhel picks up the correct version of webob
%{__awk} 'NR==1{print "import __main__; __main__.__requires__ = __requires__ = [\"WebOb>=1.0\", \"sqlalchemy>=0.6\"]; import pkg_resources"}1' setup.py > setup.py.tmp
%{__mv} setup.py.tmp setup.py
-
%endif
-# Remove twisted and orbited from the list of dependencies in setup.py.
-%{__sed} -i 's/"Twisted",//' setup.py
-%{__sed} -i 's/"orbited==0.7.10",//' setup.py
-
-
%build
%{__python} setup.py build
@@ -171,8 +67,6 @@ make -C docs html
#%{__rm} docs/_build/html/.buildinfo
%install
-%{__rm} -rf %{buildroot}
-
%{__python} setup.py install -O1 --skip-build \
--install-data=%{_datadir} --root %{buildroot}
@@ -195,7 +89,6 @@ make -C docs html
%{__install} -m 0644 production/rabbitmq/*.patch %{buildroot}%{_datadir}/%{name}/production/rabbitmq
%{__install} -m 0755 production/rabbitmq/run %{buildroot}%{_datadir}/%{name}/production/rabbitmq
%{__install} -m 0644 production/logrotate/moksha %{buildroot}%{_sysconfdir}/logrotate.d/
-%{__install} production/moksha-hub %{buildroot}%{_bindir}/moksha-hub
%{__install} production/moksha-hub.init %{buildroot}%{_sysconfdir}/init.d/moksha-hub
%{__install} -d -m 0755 %{buildroot}/var/run/%{name}
@@ -207,38 +100,18 @@ make -C docs html
%{__rm} %{buildroot}%{_datadir}/%{name}/production/moksha-hub.init
-
-
-
-%check
-%if %{?rhel}%{!?rhel:0} >= 6
-
-# Check section removed until a RHEL6 bug with python-repoze-what-plugins-sql
-# can be fixed. It causes a fatal error in the test suite.
-# https://bugzilla.redhat.com/show_bug.cgi?id=813925
-
-%else
-PYTHONPATH=$(pwd) python setup.py test
-%endif
-
-
%post
/sbin/chkconfig --add moksha-hub
-
%post server
semanage fcontext -a -t httpd_cache_t '/var/cache/moksha(/.*)?'
restorecon -Rv /var/cache/moksha
-%clean
-%{__rm} -rf %{buildroot}
-
%pre
%{_sbindir}/groupadd -r %{name} &>/dev/null || :
%{_sbindir}/useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
-c 'Moksha' -g %{name} %{name} &>/dev/null || :
-
%preun
if [ $1 -eq 0 ]; then
/sbin/service moksha-hub stop >/dev/null 2>&1
@@ -246,20 +119,15 @@ if [ $1 -eq 0 ]; then
fi
%files
-%defattr(-,root,root,-)
%doc README AUTHORS COPYING
-%{_bindir}/moksha
-%{_bindir}/moksha-hub
+%{python_sitelib}/moksha-%{version}*
%{_sysconfdir}/init.d/moksha-hub
-%{python_sitelib}/%{name}/
-%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}
%attr(0755,root,%{name}) %dir %{_var}/log/%{name}
%ghost %attr(755, %{name}, %{name}) /var/run/%{name}
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%files server
-%defattr(-,root,root,-)
%attr(-,apache,root) %{_datadir}/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/moksha.conf
%config(noreplace) %{_sysconfdir}/%{name}/*.ini
@@ -267,10 +135,13 @@ fi
%attr(-,apache,apache) %dir %{_localstatedir}/cache/%{name}/
%files doc
-%defattr(-,root,root)
%doc docs/_build/html
%changelog
+* Tue Sep 04 2012 Ralph Bean <rbean at redhat.com> - 1.0.0-1
+- Removed unnecessary defattrs and clean section.
+- New upstream release as a meta package.
+
* Thu Aug 30 2012 Ralph Bean <rbean at redhat.com> - 0.8.8-4
- Add python-bunch in the requires list.
More information about the scm-commits
mailing list