[Ocfs2-tools-commits] manish commits r610 - in trunk: . vendor/common

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-01-27 17:11:43 -0600 (Thu, 27 Jan 2005)
New Revision: 610

Modified:
   trunk/Makefile
   trunk/vendor/common/ocfs2-tools.spec.in
Log:
rpm spec-fu for ocfs2console


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-01-27 22:57:59 UTC (rev 609)
+++ trunk/Makefile	2005-01-27 23:11:43 UTC (rev 610)
@@ -6,13 +6,15 @@
 
 RPMBUILD = $(shell /usr/bin/which rpmbuild 2>/dev/null || /usr/bin/which rpm 2>/dev/null || echo /bin/false)
 
-SUSEBUILD = $(shell if test -r /etc/UnitedLinux-release -o -r /etc/SuSE-release; then echo yes; else echo no; fi)
+SUSEBUILD = $(shell if test -r /etc/SuSE-release; then echo yes; else echo no; fi)
 
+PYVERSION = $(shell echo $(pyexecdir) | sed -e 's/.*python\([0-9]\.[0-9]\).*/\1/')
+
 ifeq ($(SUSEBUILD),yes)
-GTK_NAME = gtk
+PYGTK_NAME = python-gtk
 CHKCONFIG_DEP = aaa_base
 else
-GTK_NAME = gtk+
+PYGTK_NAME = pygtk2
 CHKCONFIG_DEP = chkconfig
 endif
 
@@ -71,10 +73,10 @@
 	rm -f Config.make config.status config.cache config.log
 
 srpm: dist
-	$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" --define "gtk_name $(GTK_NAME)" --define "chkconfig_dep $(CHKCONFIG_DEP)" $(TOPDIR)/vendor/common/ocfs2-tools.spec
+	$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" --define "pygtk_name $(PYGTK_NAME)" --define "pyversion $(PYVERSION)" --define "chkconfig_dep $(CHKCONFIG_DEP)" $(TOPDIR)/vendor/common/ocfs2-tools.spec
 
 rpm: srpm
-	$(RPMBUILD) --rebuild --define "gtk_name $(GTK_NAME)" --define "chkconfig_dep $(CHKCONFIG_DEP)" --target $(TOOLSARCH) "ocfs2-tools-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
+	$(RPMBUILD) --rebuild --define "pygtk_name $(PYGTK_NAME)" --define "pyversion $(PYVERSION)" --define "chkconfig_dep $(CHKCONFIG_DEP)" --target $(TOOLSARCH) "ocfs2-tools-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
 
 def:
 	@echo $(TOOLSARCH)

Modified: trunk/vendor/common/ocfs2-tools.spec.in
===================================================================
--- trunk/vendor/common/ocfs2-tools.spec.in	2005-01-27 22:57:59 UTC (rev 609)
+++ trunk/vendor/common/ocfs2-tools.spec.in	2005-01-27 23:11:43 UTC (rev 610)
@@ -8,7 +8,7 @@
 # Because RPM is dumb
 %define _unpackaged_files_terminate_build 0
 
-Summary: Tools for managing the Oracle Cluster Filesystem
+Summary: Tools for managing the Oracle Cluster Filesystem 2
 Name: ocfs2-tools
 Version: @DIST_VERSION@
 Release: @RPM_VERSION@
@@ -21,14 +21,26 @@
 Packager: nobody <nobody at oracle.com>
 Exclusiveos: Linux
 Requires: coreutils, net-tools, modutils, %{chkconfig_dep}, glib2 >= 2.0.6
-BuildRequires: glib2-devel >= 2.0.6
+BuildRequires: glib2-devel >= 2.0.6, %{pygtk_name} >= 1.99.16, python-devel >= %{pyversion}
 
 BuildRoot: %{_tmppath}/ocfs2-tools-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
 
 %description
-Tools to manage OCFS2
+Tools to manage Oracle Cluster Filesystem 2 volumes.
 
 
+%package -n ocfs2console
+Summary: GUI frontend for OCFS2 management and debugging
+Group: System Environment/Kernel
+Requires: glib2 >= 2.0.6, %{pygtk_name} >= 1.99.16
+AutoReqProv: No
+
+
+%description -n ocfs2console
+GUI frontend for management and debugging of Oracle Cluster Filesystem 2
+volumes.
+
+
 %prep
 %setup -n ocfs2-tools-%{version}
 
@@ -48,10 +60,10 @@
   cd $tool; make DESTDIR="$RPM_BUILD_ROOT" sbindir=/sbin install; cd ..
 done
 
-#for tool in ocfs2tool
-#do
-#  cd $tool; make DESTDIR="$RPM_BUILD_ROOT" install; cd ..
-#done
+for tool in ocfs2console
+do
+  cd $tool; make DESTDIR="$RPM_BUILD_ROOT" install; cd ..
+done
 
 
 %clean
@@ -64,7 +76,6 @@
 
 %files
 %defattr(-,root,root)
-/usr/share
 /sbin/fsck.ocfs2
 /sbin/mkfs.ocfs2
 /sbin/mounted.ocfs2
@@ -74,8 +85,21 @@
 /sbin/mount.ocfs2
 /sbin/ocfs2cdsl
 /etc/init.d/o2cb
+/usr/share/man/man8/debugfs.ocfs2.8.gz
+/usr/share/man/man8/fsck.ocfs2.8.gz
+/usr/share/man/man8/fsck.ocfs2.checks.8.gz
+/usr/share/man/man8/mkfs.ocfs2.8.gz
 
 
+%files -n ocfs2console
+/usr/lib/python%{pyversion}
+/usr/sbin/ocfs2console
+/usr/share/man/man8/ocfs2console.8.gz
+
+
 %changelog
-* Fri Jan 31 2004 Manish Singh <manish.singh at oracle.com>
+* Thu Jan 27 2005 Manish Singh <manish.singh at oracle.com>
+- Add ocfs2console
+
+* Fri Jan 21 2005 Manish Singh <manish.singh at oracle.com>
 - Initial rpm spec