Changeset 187

Timestamp:

05/06/09 13:55:39 (15 years ago)

Author:

bas

Message:

New build system for rpm package, thanks to Michel Jouvin

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• Makefile.rpm (added)
• pbs_python.spec (modified) (4 diffs)
• setup.py.in (modified) (1 diff)
• src/pbs.py (modified) (1 diff)

trunk/CHANGES

@@ +1 @@
+=========== 3.0.2
+        - New build system for rpm packages, make -f Makefile.rpm
+          Author: Michel Jouvin <jouvin add lal dot in2p3 dot fr>
+          Applied: Bas van der Vlies
+
 =========== 3.0.1
         - PBSQuery

trunk/pbs_python.spec

@@ -1 +1 @@
 Summary: This package contains the pbs python module.
 Name: pbs_python
-Version: 3.0.1
-Release: 2anl
+Version: %{prodversion}
+Release: %{prodrelease}
 License: See LICENSE
 Group: Development/Libraries
@@ -8 +8 @@
 BuildRoot: /var/tmp/%{name}-buildroot
 
-%define libdir /usr/lib
-%define python python2.4
 
 %description
@@ -22 +20 @@
 
 %install
+echo %{pythonlib}
+echo %{libdir}
 python ./setup.py install --prefix $RPM_BUILD_ROOT/usr ;
 
@@ -30 +30 @@
 %defattr(-,root,root,0755)
 %doc README TODO examples
-%{libdir}/%{python}/site-packages/pbs.pth
-%{libdir}/%{python}/site-packages/pbs/*
+%{libdir}/%{pythonlib}/site-packages/pbs.pth
+%{libdir}/%{pythonlib}/site-packages/pbs/*
 
 %changelog
+* Tue May  5 2009 Michel Jouvin <jouvin@lal.in2p3.fr>
+- Rework spec file to make it generic with respect to platforms, python version... Intended to be used with Makefile.rpm
 * Sun Mar  9 2008 Michael Sternberg <sternberg@anl.gov>
 - libdir and python defines

trunk/setup.py.in

@@ -47 +47 @@
 
 setup ( name = 'pbs_python',
-        version = '2.9.8',
+        version = '3.0.2',
         description = 'openpbs/torque python interface',
         author = 'Bas van der Vlies',

trunk/src/pbs.py

@@ -534 +534 @@
   Returns the pbs python interface version as a string. 
   """
-  return '3.0.0'
+  return '3.0.2'
 
 # A useful dict with error codes to text