rpms/mcstrans/devel mcstrans-0.2.6-max_const.patch, NONE, 1.1 mcstrans.spec, 1.31, 1.32

[Steve Conklin (sconklin)]

Author: sconklin

Update of /cvs/pkgs/rpms/mcstrans/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14733

Modified Files:
	mcstrans.spec 
Added Files:
	mcstrans-0.2.6-max_const.patch 
Log Message:
Fixed a problem that was preventing compilation


mcstrans-0.2.6-max_const.patch:

--- NEW FILE mcstrans-0.2.6-max_const.patch ---
diff -up mcstrans-0.2.6/src/mcstrans.c.spc mcstrans-0.2.6/src/mcstrans.c
--- mcstrans-0.2.6/src/mcstrans.c.spc	2007-09-13 10:05:50.000000000 -0500
+++ mcstrans-0.2.6/src/mcstrans.c	2007-10-26 11:34:08.000000000 -0500
@@ -260,8 +260,6 @@ static int get_max_categories() {
 	return 1023;
 }
 
-static int max_categories=get_max_categories();
-
 static char *substitute_range(const char *cat) {
 	char *categories = strdup(cat);
 	char *ptr;
@@ -270,6 +268,7 @@ static char *substitute_range(const char
 	char *sub = strdup("");
 	int error = 0;
 	char *tmp = NULL;
+	int max_categories = get_max_categories();
 	while (tok) {
 		if ((r = strchr(tok,'.')) != 0) {
 			unsigned int begin = atoi(&tok[1]);


Index: mcstrans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcstrans/devel/mcstrans.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mcstrans.spec	25 Oct 2007 21:12:22 -0000	1.31
+++ mcstrans.spec	26 Oct 2007 20:58:38 -0000	1.32
@@ -6,6 +6,7 @@
 Group: System Environment/Daemons
 Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz
 Patch0: mcstrans-0.2.3-init.patch
+Patch1: mcstrans-0.2.6-max_const.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.30.3-1
 BuildRequires: libcap-devel 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .spc
 
 %build
 make clean
@@ -74,6 +76,7 @@
 %changelog
 * Thu Oct 25 2007 Steve Conklin <sconklin at redhat.com> - 0.2.6-2
 - Fixed some init script errors
+- Fixed a compile problem with max_categories
 
 * Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 0.2.6-1
 - Check for max_categories and error out