[Moksha-commits] 2 commits - moksha.spec pavement.py setup.py

Luke Macken lmacken at fedoraproject.org
Sun Aug 9 06:27:40 UTC 2009


 moksha.spec |    1 -
 pavement.py |    2 +-
 setup.py    |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 48bec39957bc7297feac4ca832f227908d2c883e
Author: Luke Macken <lmacken at redhat.com>
Date:   Sat Aug 8 22:24:21 2009 -0400

    Make our reinstall paver task more robust

diff --git a/pavement.py b/pavement.py
index 83c9ffa..0edfe85 100644
--- a/pavement.py
+++ b/pavement.py
@@ -182,7 +182,7 @@ def reinstall():
     sh('mv dist/* ~/rpmbuild/SOURCES/')
     sh('cp moksha.spec ~/rpmbuild/SPECS/')
     sh('rpmbuild -ba ~/rpmbuild/SPECS/moksha.spec') 
-    sh('sudo rpm -ivh --replacefiles --replacepkgs ~/rpmbuild/RPMS/noarch/moksha{,-docs}-0.3-1.noarch.rpm')
+    sh('sudo rpm -ivh --replacefiles --replacepkgs ~/rpmbuild/RPMS/noarch/moksha{,-docs}-0.3-1.*noarch.rpm')
     sh('sudo /sbin/service httpd restart')
     sh('curl http://localhost/')
 


commit 0fd456bc2f422d22b0534ffa72609a88e71fd900
Author: Luke Macken <lmacken at redhat.com>
Date:   Sat Aug 8 22:24:08 2009 -0400

    Comment out namespace_packages, which removes moksha.__init__.py

diff --git a/moksha.spec b/moksha.spec
index b6194e3..f8670ff 100644
--- a/moksha.spec
+++ b/moksha.spec
@@ -94,7 +94,6 @@ make -C docs html
 %defattr(-,root,root,-)
 %doc README AUTHORS LICENSE COPYING
 %{python_sitelib}/%{name}/
-%{python_sitelib}/%{name}-%{version}-py%{pyver}-nspkg.pth
 %attr(-,apache,root) %{_datadir}/%{name}
 %attr(-,apache,root) %{_localstatedir}/log/%{name}
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
diff --git a/setup.py b/setup.py
index d7f4ec6..4298b0b 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(
     packages=find_packages(exclude=['ez_setup']),
     include_package_data=True,
     test_suite='nose.collector',
-    namespace_packages=['moksha'],
+    #namespace_packages=['moksha'],
     tests_require=['WebTest', 'BeautifulSoup'],
     package_data=find_package_data(exclude=['ez_setup']),
     #package_data={'moksha': ['i18n/*/LC_MESSAGES/*.mo',




More information about the Moksha-commits mailing list