[Inteproxy-commits] r61 - in trunk: . rpm

[scm-commit@wald.intevation.org]

Author: sholl
Date: 2007-04-24 12:40:57 +0200 (Tue, 24 Apr 2007)
New Revision: 61

Modified:
   trunk/ChangeLog
   trunk/rpm/inteproxy-sles9.spec
Log:
* rpm/inteproxy-sles9.spec: Updated to reflect the backported
python2.4-packages. created a wrapper-script to run from whithin the
path.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-04-23 14:54:50 UTC (rev 60)
+++ trunk/ChangeLog	2007-04-24 10:40:57 UTC (rev 61)
@@ -1,3 +1,9 @@
+2007-04-24  Stephan Holl  <stephan.holl at intevation.de>
+
+	* rpm/inteproxy-sles9.spec: Updated to reflect the backported
+	python2.4-packages. created a wrapper-script to run from whithin the
+	path.
+
 2007-04-23  Bernhard Herzog  <bh at intevation.de>
 
 	* inteproxy/feesdialog.py: New.  Dialog for fees and access

Modified: trunk/rpm/inteproxy-sles9.spec
===================================================================
--- trunk/rpm/inteproxy-sles9.spec	2007-04-23 14:54:50 UTC (rev 60)
+++ trunk/rpm/inteproxy-sles9.spec	2007-04-24 10:40:57 UTC (rev 61)
@@ -9,16 +9,18 @@
 # http://wald.intevation.org/tracker/?atid=178&group_id=23&func=browse
 #
 
+%define pyversion 2.4
+%define InteProxyDir %{_libdir}/InteProxy
 
-BuildRequires: python 
-Requires: python python-lxml pygtk gtk+
+BuildRequires: python%{pyversion}
+Requires: python%{pyversion} python%{pyversion}-lxml
 
-Summary:	InteProxy is a proxy which helps to secure  OGC-connection between clients and servers.
+Summary:	InteProxy is a proxy which helps to secure OGC-connections between clients and servers.
 Name:           InteProxy
 License:        GNU/LGPL
 Group:          Development/System
 Version:        0.1.2
-Release:        1
+Release:        2
 # URL: 
 Source0:        http://wald.intevation.org/frs/download.php/334/%{name}-%{version}.tar.gz
 
@@ -42,16 +44,25 @@
 # nothing to build here
 
 %install
-%define InteProxyDir %{_libdir}/python/site-packages/InteProxy
 
 # install the stuff
 mkdir -p %{buildroot}/%{InteProxyDir}
-install -m 755 getpassword.py proxyconnection.py transcoder.py %{buildroot}/%{InteProxyDir}
+install -m 644 getpassword.py proxyconnection.py transcoder.py %{buildroot}/%{InteProxyDir}
+install -m 755 InteProxy.py %{buildroot}/%{InteProxyDir}
 mkdir -p %{buildroot}/%{_bindir}
-install -m 755 InteProxy.py %{buildroot}/%{_bindir}/InteProxy.py
+# create startup-shellscript for InteProxy to pick up the correct python-version
+cd %{buildroot}/%{_bindir}
+cat > InteProxy <<EOF
+#!/bin/sh
+python%{pyversion} %{InteProxyDir}/InteProxy.py
+EOF
+chmod +x InteProxy
 
+# create startscript that it will work from within the path
+# install -m 755 InteProxy.py %{buildroot}/%{_bindir}/InteProxy.py
+
 %post
-python %{_libdir}/python/compileall.py %{InteProxyDir}
+python%{pyversion} %{_libdir}/python%{pyversion}/compileall.py %{InteProxyDir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,9 +72,13 @@
 %defattr(-, root, root)
 %doc doc/*.odt ChangeLog COPYING
 %{InteProxyDir}
-%{_bindir}/*.py
+%{_bindir}/InteProxy
 
 %changelog
+* Mon Apr  24 2007 - stephan.holl at intevation.de
+- added more Requerements, for backported python2.4
+- created a shell-wrapper to make InteProxy run from the path
+
 * Fri Apr 20 2007 - stephan.holl at intevation.de
 - initial RPM for SLES9 
 - handcrafted SPEC-file