rpms/cluster/devel novolid.diff, NONE, 1.1 cluster.spec, 1.49, 1.50 sources, 1.24, 1.25

[Fabio M. Di Nitto]

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6498

Modified Files:
	cluster.spec sources 
Added Files:
	novolid.diff 
Log Message:
Drop requirements on libvolume_id


novolid.diff:

--- NEW FILE novolid.diff ---
diff --git a/gfs/gfs_mkfs/main.c b/gfs/gfs_mkfs/main.c
index e9d57de..755b1ce 100644
--- a/gfs/gfs_mkfs/main.c
+++ b/gfs/gfs_mkfs/main.c
@@ -14,7 +14,6 @@
 #include "global.h"
 #include "gfs_ondisk.h"
 #include "osi_list.h"
-#include "libvolume_id.h"
 #include "libgfs.h"
 #include "copyright.cf"
 
@@ -207,34 +206,13 @@ static void decode_arguments(int argc, char *argv[], commandline_t *comline)
 static void are_you_sure(commandline_t *comline)
 {
 	char input[32];
-	struct volume_id *vid = NULL;
 	int fd;
 
 	fd = open(comline->device, O_RDONLY);
 	if (fd < 0)
 		die("Error: device %s not found.\n", comline->device);
-	vid = volume_id_open_fd(fd);
-	if (vid == NULL) {
-		close(fd);
-		die("error identifying the contents of %s: %s\n",
-		    comline->device, strerror(errno));
-	}
 	printf("This will destroy any data on %s.\n",
 	       comline->device);
-	if (volume_id_probe_all(vid, 0, MKFS_DEFAULT_BSIZE) == 0) {
-		const char *fstype, *fsusage;
-		int rc;
-
-		rc = volume_id_get_type(vid, &fstype);
-		if (rc) {
-			rc = volume_id_get_usage(vid, &fsusage);
-			if (!rc || strncmp(fsusage, "other", 5) == 0)
-				fsusage = "partition";
-			printf("  It appears to contain a %s %s.\n", fstype,
-			       fsusage);
-		}
-	}
-	volume_id_close(vid);
 	close(fd);
 	printf("\nAre you sure you want to proceed? [y/n] ");
 	if (fgets(input, 32, stdin) == NULL || input[0] != 'y')
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index 824b73d..04024b3 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -19,7 +19,6 @@
 #include <linux/types.h>
 #include "libgfs2.h"
 #include "gfs2_mkfs.h"
-#include "libvolume_id.h"
 
 /**
  * This function is for libgfs2's sake.
@@ -302,33 +301,12 @@ static void verify_arguments(struct gfs2_sbd *sdp)
 static void are_you_sure(struct gfs2_sbd *sdp)
 {
 	char input[32];
-	struct volume_id *vid = NULL;
 	int fd;
 
 	fd = open(sdp->device_name, O_RDONLY);
 	if (fd < 0)
 		die( _("Error: device %s not found.\n"), sdp->device_name);
-	vid = volume_id_open_fd(fd);
-	if (vid == NULL) {
-		close(fd);
-		die( _("error identifying the contents of %s: %s\n"),
-		    sdp->device_name, strerror(errno));
-	}
 	printf( _("This will destroy any data on %s.\n"), sdp->device_name);
-	if (volume_id_probe_all(vid, 0, sdp->device_size) == 0) {
-		const char *fstype, *fsusage;
-		int rc;
-
-		rc = volume_id_get_type(vid, &fstype);
-		if (rc) {
-			rc = volume_id_get_usage(vid, &fsusage);
-			if (!rc || strncmp(fsusage, "other", 5) == 0)
-				fsusage = "partition";
-			printf( _("  It appears to contain a %s %s.\n"), fstype,
-			       fsusage);
-		}
-	}
-	volume_id_close(vid);
 	close(fd);
 	printf( _("\nAre you sure you want to proceed? [y/n] "));
 	if(!fgets(input, 32, stdin))


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- cluster.spec	10 Jun 2009 08:47:09 -0000	1.49
+++ cluster.spec	11 Jun 2009 13:57:42 -0000	1.50
@@ -19,12 +19,13 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.0
-Release: 16%{?alphatag:.%{alphatag}}%{?dist}
+Release: 17%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}%{?alphatag:.%{alphatag}}.tar.gz
 Patch0: cluster-head.diff
+Patch1: novolid.diff
 
 ## Setup/build bits
 
@@ -33,7 +34,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 # Build dependencies
 BuildRequires: perl python
 BuildRequires: glibc-kernheaders glibc-devel
-BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
+BuildRequires: libxml2-devel ncurses-devel slang-devel
 BuildRequires: corosynclib-devel >= 0.97-1.svn2226
 BuildRequires: openaislib-devel >= 0.96-1.svn1951
 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
@@ -41,6 +42,7 @@ BuildRequires: openldap-devel perl(ExtUt
 %prep
 %setup -q -n cluster-%{version}%{?alphatag:.%{alphatag}}
 %patch0 -p1
+%patch1 -p1
 
 %build
 ./configure \
@@ -239,6 +241,7 @@ Summary: Utilities for managing the glob
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
+Requires: file
 
 %description -n gfs2-utils
 The gfs2-utils package contains a number of utilities for creating,
@@ -269,6 +272,7 @@ Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
 Requires: gfs2-utils
+Requires: file
 
 %description -n gfs-utils
 The gfs-utils package contains a number of utilities for creating,
@@ -304,6 +308,13 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Thu Jun 11 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-17.rc2
+- Update from git up to 779dd3c23ca6c56f5b3f7a8a7831bae775c85201
+- spec file updates:
+  * Drop BuildRequires on libvolume_id-devel that's now obsoleted
+  * gfs*-utils now Requires: file
+  * Add temporary patch to get rid of volume_id references in the code
+
 * Wed Jun 10 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-16.rc2
 - New upstream release + git94df30ca63e49afb1e8aeede65df8a3e5bcd0970
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	10 Jun 2009 08:47:09 -0000	1.24
+++ sources	11 Jun 2009 13:57:42 -0000	1.25
@@ -1,2 +1,2 @@
 095ee7ff91d89d04ce60c3d06686da4d  cluster-3.0.0.rc2.tar.gz
-b7520164d4dfde326cbfab76c9e830a4  cluster-head.diff
+f2b98435277ac6b433a27541cb518716  cluster-head.diff