backend/server/Makefile | 2 +-
backend/server/wsgi/Makefile | 10 ++++++++++
backend/spacewalk-backend.spec | 25 ++++++++++++++++++++++---
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 34 insertions(+), 5 deletions(-)
New commits:
commit ee9bb0263ac830640c4f4e119a9de36c897cb325
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 27 15:53:49 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.8.38-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ece8a03..8e471b8 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.37
+Version: 0.8.38
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -625,6 +625,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Jan 27 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.38-1
+- fixed packaging of wsgi handler files
+
* Tue Jan 26 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.37-1
- fixed HTTP 404 on package download
- execute commands through shell
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index b761b78..350f6cf 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.37-1 backend/
+0.8.38-1 backend/
commit e4cfbe9dab9af5e4b4984d185145ced31a5ee9a3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 27 15:28:31 2010 +0100
fixed packaging of wsgi handler files
diff --git a/backend/server/Makefile b/backend/server/Makefile
index f94f387..3b74982 100644
--- a/backend/server/Makefile
+++ b/backend/server/Makefile
@@ -21,6 +21,6 @@ FILES = __init__ \
rhnSession rhnUser rhnVirtualization taskomatic
SUBDIRS = rhnSQL rhnServer action \
handlers importlib action_extra_data \
- config_common repomd
+ config_common repomd wsgi
include $(TOP)/Makefile.defs
diff --git a/backend/server/wsgi/Makefile b/backend/server/wsgi/Makefile
new file mode 100644
index 0000000..b458c7c
--- /dev/null
+++ b/backend/server/wsgi/Makefile
@@ -0,0 +1,10 @@
+# Makefile for the wsgi module
+
+TOP = ../..
+
+SUBDIR = server/wsgi
+
+FILES = __init__ app applet config config_tool package_push package_upload \
+ sat sat_dump wsgiHandler wsgiRequest xmlrpc xp
+
+include $(TOP)/Makefile.defs
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0cc6ec6..ece8a03 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -259,9 +259,10 @@ export PYTHON_MODULE_VERSION=%{version}
%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT --prefix=%{_prefix}
%if 0%{?rhel} && 0%{?rhel} < 6
-rm $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-wsgi.conf
+rm -v $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-wsgi.conf
+rm -rfv $RPM_BUILD_ROOT/%{rhnroot}/server/wsgi
%else
-rm $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-python.conf
+rm -v $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-python.conf
%endif
@@ -403,7 +404,22 @@ rm -f %{rhnconf}/rhnSecret.py*
%if 0%{?rhel} && 0%{?rhel} < 6
%attr(640,root,apache) %config %{apacheconfd}/zz-spacewalk-server-python.conf
%else
+# wsgi stuff
%attr(640,root,apache) %config %{apacheconfd}/zz-spacewalk-server-wsgi.conf
+%dir %{rhnroot}/server/wsgi
+%{rhnroot}/server/wsgi/__init__.py*
+%{rhnroot}/server/wsgi/app.py*
+%{rhnroot}/server/wsgi/applet.py*
+%{rhnroot}/server/wsgi/config.py*
+%{rhnroot}/server/wsgi/config_tool.py*
+%{rhnroot}/server/wsgi/package_push.py*
+%{rhnroot}/server/wsgi/package_upload.py*
+%{rhnroot}/server/wsgi/sat.py*
+%{rhnroot}/server/wsgi/sat_dump.py*
+%{rhnroot}/server/wsgi/wsgiHandler.py*
+%{rhnroot}/server/wsgi/wsgiRequest.py*
+%{rhnroot}/server/wsgi/xmlrpc.py*
+%{rhnroot}/server/wsgi/xp.py*
%endif
# logs and other stuff