[Ocfs2-tools-commits] manish commits r226 - in trunk: . extras mounted.ocfs2 vendor/common

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-09-13 13:37:18 -0500 (Mon, 13 Sep 2004)
New Revision: 226

Modified:
   trunk/Makefile
   trunk/configure.in
   trunk/extras/Makefile
   trunk/mounted.ocfs2/Makefile
   trunk/vendor/common/Makefile
   trunk/vendor/common/ocfs2-tools.spec.in
Log:
Fix dist and rpm build


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2004-09-13 18:22:21 UTC (rev 225)
+++ trunk/Makefile	2004-09-13 18:37:18 UTC (rev 226)
@@ -65,10 +65,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/ocfs-tools.spec
+	$(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
 
 rpm: srpm
-	$(RPMBUILD) --rebuild --define "gtk_name $(GTK_NAME)" --define "chkconfig_dep $(CHKCONFIG_DEP)" --target $(TOOLSARCH) "ocfs-tools-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
+	$(RPMBUILD) --rebuild --define "gtk_name $(GTK_NAME)" --define "chkconfig_dep $(CHKCONFIG_DEP)" --target $(TOOLSARCH) "ocfs2-tools-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
 
 def:
 	@echo $(TOOLSARCH)

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-09-13 18:22:21 UTC (rev 225)
+++ trunk/configure.in	2004-09-13 18:37:18 UTC (rev 226)
@@ -165,6 +165,5 @@
 ocfs_uid_gen/ocfs_uid_gen.8
 load_ocfs/load_ocfs.8
 load_ocfs/ocfs.conf.5
-ocfstool/ocfstool.8
 vendor/common/ocfs2-tools.spec
 ])

Modified: trunk/extras/Makefile
===================================================================
--- trunk/extras/Makefile	2004-09-13 18:22:21 UTC (rev 225)
+++ trunk/extras/Makefile	2004-09-13 18:37:18 UTC (rev 226)
@@ -34,7 +34,7 @@
 FIND_DUP_EXTENTS_CFILES = find_dup_extents.c
 FIND_INODE_PATHS_CFILES = find_inode_paths.c
 
-DIST_FILES = $(FIND_HARDLINKS_CFILES) $(FIND_DUP_EXTENTS_CFILES)
+DIST_FILES = $(FIND_HARDLINKS_CFILES) $(FIND_DUP_EXTENTS_CFILES) $(FIND_INODE_PATHS_CFILES)
 FIND_HARDLINKS_OBJS = $(subst .c,.o,$(FIND_HARDLINKS_CFILES))
 FIND_DUP_EXTENTS_OBJS = $(subst .c,.o,$(FIND_DUP_EXTENTS_CFILES))
 FIND_INODE_PATHS_OBJS = $(subst .c,.o,$(FIND_INODE_PATHS_CFILES))

Modified: trunk/mounted.ocfs2/Makefile
===================================================================
--- trunk/mounted.ocfs2/Makefile	2004-09-13 18:22:21 UTC (rev 225)
+++ trunk/mounted.ocfs2/Makefile	2004-09-13 18:37:18 UTC (rev 226)
@@ -36,7 +36,7 @@
 
 #MANS = fsck.ocfs2.8
 
-DIST_FILES = $(VERSION_FILES) $(VERSION_SRC) ocfs2_err.et.in
+DIST_FILES = $(VERSION_FILES) $(VERSION_SRC)
 
 mounted.ocfs2: mounted.o
 	$(LINK) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) $(VERMAGIC)

Modified: trunk/vendor/common/Makefile
===================================================================
--- trunk/vendor/common/Makefile	2004-09-13 18:22:21 UTC (rev 225)
+++ trunk/vendor/common/Makefile	2004-09-13 18:37:18 UTC (rev 226)
@@ -2,6 +2,6 @@
 
 include $(TOPDIR)/Preamble.make
 
-DIST_FILES = ocfs-tools.spec.in
+DIST_FILES = ocfs2-tools.spec.in
 
 include $(TOPDIR)/Postamble.make

Modified: trunk/vendor/common/ocfs2-tools.spec.in
===================================================================
--- trunk/vendor/common/ocfs2-tools.spec.in	2004-09-13 18:22:21 UTC (rev 225)
+++ trunk/vendor/common/ocfs2-tools.spec.in	2004-09-13 18:37:18 UTC (rev 226)
@@ -20,7 +20,7 @@
 Vendor: Oracle Corporation
 Packager: nobody <nobody at oracle.com>
 Exclusiveos: Linux
-Requires: ocfs-support >= @DIST_VERSION@, %{gtk_name} >= 1.2.8
+Requires: ocfs2-support >= @DIST_VERSION@, %{gtk_name} >= 1.2.8
 BuildRequires: %{gtk_name}-devel >= 1.2.8
 
 BuildRoot: %{_tmppath}/ocfs2-tools-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
@@ -59,7 +59,7 @@
 fi
 cp -f vendor/$IVENDOR/ocfs.init $RPM_BUILD_ROOT/etc/init.d/ocfs2
 
-for tool in mkfs.ocfs2 debugfs.ocfs2 load_ocfs ocfs_uid_gen
+for tool in mkfs.ocfs2 debugfs.ocfs2 mounted.ocfs2 load_ocfs ocfs_uid_gen
 do
   cd $tool; make DESTDIR="$RPM_BUILD_ROOT" sbindir=/sbin install; cd ..
 done
@@ -74,7 +74,7 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 
-%post -n ocfs-2support
+%post -n ocfs2-support
 chkconfig ocfs2 on
 IVENDOR=redhat
 if [ -r /etc/UnitedLinux-release -o -r /etc/SuSE-release ]
@@ -87,16 +87,16 @@
 
 %files
 %defattr(-,root,root)
-/usr/sbin
 /usr/share
 
 
-%files -n ocfs-support
+%files -n ocfs2-support
 %defattr(-,root,root)
 /sbin/load_ocfs2
 /sbin/mkfs.ocfs2
 /sbin/debugfs.ocfs2
 /sbin/ocfs_uid_gen2
+/sbin/mounted.ocfs2
 /etc/init.d/ocfs2