rpms/gridengine/F-10 gridengine.spec,1.7,1.8

Orion Poplawski orion at fedoraproject.org
Tue Nov 18 18:06:28 UTC 2008


Author: orion

Update of /cvs/pkgs/rpms/gridengine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30881

Modified Files:
	gridengine.spec 
Log Message:
* Mon Nov 17 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-5
- Leave qmake-ge in %{_bindir}
- Use system db_* utils in bdb_checkpoint script
- Fix xterm path in default setup
- Change java BR to >= 1.6.0 to allow building with other 1.6 javas



Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/F-10/gridengine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gridengine.spec	11 Nov 2008 20:29:42 -0000	1.7
+++ gridengine.spec	18 Nov 2008 18:05:57 -0000	1.8
@@ -6,7 +6,7 @@
 
 Name:    gridengine
 Version: 6.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -43,6 +43,8 @@
 Patch4: gridengine-6.2-sge_ca.patch
 # Fixup jni paths
 Patch5: gridengine-6.2-jni.patch
+# Use system db_ utils
+Patch6: gridengine-6.2-db.patch
 # aimk sets -Werror, but there are lots of warnings
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2112
 Patch7: gridengine-6.1pre-Werror.patch
@@ -67,7 +69,7 @@
 %else
 BuildRequires: lesstif-devel
 %endif
-BuildRequires: java-devel >= 1:1.6.0, javacc, ant-junit, ant-nodeps
+BuildRequires: java-devel >= 1.6.0, javacc, ant-junit, ant-nodeps
 BuildRequires: elfutils-libelf-devel, net-tools
 BuildRequires: fedora-usermgmt-devel
 Requires: ncurses
@@ -160,6 +162,7 @@
 %patch3 -p1 -b .rctemplates
 %patch4 -p1 -b .sge_ca
 %patch5 -p1 -b .jni
+%patch6 -p1 -b .db
 %patch7 -p1 -b .Werror
 %if !0%{?rhel}
 %patch15 -p1 -b .lesstif
@@ -183,6 +186,11 @@
 #dlopen the runtime libssl library
 soname=$(objdump -p %{_libdir}/libssl.so | awk '/SONAME/ {print $2}')
 sed -i -e s/libssl\.so/$soname/ source/libs/comm/cl_ssl_framework.c
+#Fix xterm path
+sed -i -e s,X11/xterm,xterm,g doc/htmlman/htmlman5/sge_conf.html \
+                              doc/man/man5/sge_conf.5 \
+                              source/dist/util/arch_variables \
+                              source/libs/sgeobj/sge_conf.c
 
 
 %build
@@ -242,13 +250,8 @@
 mv $RPM_BUILD_ROOT%{_datadir}/gridengine/bin $RPM_BUILD_ROOT%{_prefix}
 rmdir $RPM_BUILD_ROOT%{_bindir}/${gearch}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gridengine/bin/${gearch}
-# move qmake out of %{_bindir} to avoid conflicts with Qt qmake
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/gridengine/bin/${gearch}
-mv $RPM_BUILD_ROOT%{_bindir}/qmake $RPM_BUILD_ROOT%{_libexecdir}/gridengine/bin/${gearch}/
-ln -s ../../../../libexec/gridengine/bin/${gearch}/qmake \
-      $RPM_BUILD_ROOT%{_datadir}/gridengine/bin/${gearch}/
 # Rename common queuing binaries and manpages for use with alternatives
-for bin in qalter qdel qhold qrls qselect qstat qsub
+for bin in qalter qdel qhold qmake qrls qselect qstat qsub
 do
     if [ -L $RPM_BUILD_ROOT%{_bindir}/$bin ]
     then
@@ -435,6 +438,10 @@
 %doc Licenses README
 %config(noreplace) %{_sysconfdir}/profile.d/sge.*
 %config(noreplace) %{_sysconfdir}/sysconfig/gridengine
+# Only the file %{_bindir}/qmake-ge is
+# under GPLv2+
+# Olny the file %{_bindir}/qtcsh is
+# under BSD with advertising
 %{_bindir}/*
 %exclude %{_bindir}/qacct
 %exclude %{_bindir}/qmon
@@ -446,10 +453,6 @@
 %{_libdir}/libspoolb.so
 %{_libdir}/libspoolc.so
 %{_javadir}/drmaa.jar
-# Only the file %{_libexecdir}/gridengine/bin/*/qmake is
-# under GPLv2+
-# Olny the file %{_libexecdir}/gridengine/bin/*/qtcsh is
-# under BSD with advertising
 %{_libexecdir}/gridengine/
 %attr(-,%username,%username) %dir %{_datadir}/gridengine
 %{_datadir}/gridengine/bin
@@ -522,6 +525,12 @@
 
 
 %changelog
+* Mon Nov 17 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-5
+- Leave qmake-ge in %{_bindir}
+- Use system db_* utils in bdb_checkpoint script
+- Fix xterm path in default setup
+- Change java BR to >= 1.6.0 to allow building with other 1.6 javas
+
 * Tue Nov 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-4
 - Add note to README about localhost line in /etc/hosts
 - Cleanup setting.sh some, no more MAN stuff




More information about the fedora-extras-commits mailing list