[moksha] Remove unused setuptools statements.

Ralph Bean ralph at fedoraproject.org
Wed Sep 19 15:07:23 UTC 2012


commit cd84ca9e9b96e6747f7d5c50d9dba356344cae0b
Author: Ralph Bean <rbean at redhat.com>
Date:   Wed Sep 19 11:07:16 2012 -0400

    Remove unused setuptools statements.

 .gitignore  |    1 +
 moksha.spec |   14 ++++----------
 sources     |    3 +--
 3 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7081939..508531d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /moksha-0.8.6.tar.gz
 /moksha-0.8.8.tar.gz
 /moksha-Support-ssl-websockets-on-the-client-wss.patch
+/moksha-1.0.0.tar.gz
diff --git a/moksha.spec b/moksha.spec
index 37b8096..025bfdc 100644
--- a/moksha.spec
+++ b/moksha.spec
@@ -53,22 +53,12 @@ This package contains an Apache mod_wsgi configuration for Moksha.
 %prep
 %setup -q
 
-%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
-
 %build
-%{__python} setup.py build
-
 %{__sed} -i -e 's/$VERSION/%{version}/g' docs/conf.py
 make -C docs html
 #%{__rm} docs/_build/html/.buildinfo
 
 %install
-%{__python} setup.py install -O1 --skip-build \
-    --install-data=%{_datadir} --root %{buildroot}
 
 %{__mkdir_p} %{buildroot}%{_datadir}/%{name}/production/apache
 %{__mkdir_p} %{buildroot}%{_datadir}/%{name}/production/nginx
@@ -138,6 +128,10 @@ fi
 %doc docs/_build/html
 
 %changelog
+* Wed Sep 19 2012 Ralph Bean <rbean at redhat.com> - 1.0.0-2
+- Added forgotten source.
+- Removed setuptools commands that are no longer relevant.
+
 * 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.
diff --git a/sources b/sources
index bd4e716..3aecc15 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-0f9166401eca0f4cc4fd2b3c2d2e8878  moksha-0.8.8.tar.gz
-33f50ef9c32bb554ed7036d82b68d0fe  moksha-Support-ssl-websockets-on-the-client-wss.patch
+ae1b6341fe56b55f94274880cbfcf5fc  moksha-1.0.0.tar.gz


More information about the scm-commits mailing list