rpms/fmt-ptrn/devel fmt-ptrn-1.3.17.stack_name_conflict.patch, NONE, 1.1 fmt-ptrn.spec, 1.7, 1.8

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/fmt-ptrn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31270

Modified Files:
	fmt-ptrn.spec 
Added Files:
	fmt-ptrn-1.3.17.stack_name_conflict.patch 
Log Message:
rebuild for dependencies

fmt-ptrn-1.3.17.stack_name_conflict.patch:

--- NEW FILE fmt-ptrn-1.3.17.stack_name_conflict.patch ---
diff -ru fmt-ptrn-1.3.17.orig/src/fmt-ptrn.c fmt-ptrn-1.3.17/src/fmt-ptrn.c
--- fmt-ptrn-1.3.17.orig/src/fmt-ptrn.c	2009-02-12 09:29:03.000000000 +0000
+++ fmt-ptrn-1.3.17/src/fmt-ptrn.c	2009-02-12 09:40:48.000000000 +0000
@@ -117,11 +117,11 @@
 	assert(_fmt_ptrn_t_valid(x));
 }
 
-/* ============================ stack_t ==================================== */
-typedef struct stack_t {
+/* ============================ my_stack_t ==================================== */
+typedef struct my_stack_t {
 	modifier_t data[STACK_MAX_ITEMS];
 	int size;
-} stack_t;
+} my_stack_t;
 
 /* ============================ _modifier_t_valid () ======================= */
 static gboolean _modifier_t_valid(const modifier_t * m)
@@ -131,7 +131,7 @@
 }
 
 /* ============================ _stack_t_valid () ========================== */
-static gboolean _stack_t_valid(const stack_t * s)
+static gboolean _stack_t_valid(const my_stack_t * s)
 {
 	if (s == NULL && s->size != 0)
 		return FALSE;
@@ -139,14 +139,14 @@
 }
 
 /* ============================ _stack_init () ============================= */
-static void _stack_init(stack_t * s)
+static void _stack_init(my_stack_t * s)
 {
 	s->size = 0;
 	assert(_stack_t_valid(s));
 }
 
 /* ============================ _stack_push () ============================= */
-static gboolean _stack_push(fmt_ptrn_t * x, stack_t * s,
+static gboolean _stack_push(fmt_ptrn_t * x, my_stack_t * s,
 			    const modifier_t data)
 {
 	gboolean fnval = FALSE;
@@ -170,7 +170,7 @@
 }
 
 /* ============================ _stack_pop () ============================== */
-static gboolean _stack_pop(stack_t * s, modifier_t * data)
+static gboolean _stack_pop(my_stack_t * s, modifier_t * data)
 {
 	gboolean fnval = FALSE;
 	assert(_stack_t_valid(s));
@@ -188,7 +188,7 @@
 }
 
 /* ============================ _stack_contains () ========================= */
-static int _stack_contains(const stack_t s, const char *n)
+static int _stack_contains(const my_stack_t s, const char *n)
 {
 	int i;
 	assert(_stack_t_valid(&s));
@@ -386,7 +386,7 @@
 
 /* ============================ _read_modifier () ========================== */
 static gboolean _read_modifier(fmt_ptrn_t * x, char **ptrn,
-			       stack_t * modifier)
+			       my_stack_t * modifier)
 {
 	int i = 0;
 	size_t len;
@@ -430,7 +430,7 @@
 
 /* ============================ _read_modifiers () ========================= */
 static void _read_modifiers(fmt_ptrn_t * x,
-			    char **ptrn, stack_t * modifier)
+			    char **ptrn, my_stack_t * modifier)
 {
 	assert(_fmt_ptrn_t_valid(x));
 	assert(ptrn != NULL);
@@ -480,7 +480,7 @@
 
 /* ============================ _apply_modifiers () ======================== */
 static void _apply_modifiers(fmt_ptrn_t * x,
-			     buffer_t * str, stack_t * modifier)
+			     buffer_t * str, my_stack_t * modifier)
 {
 	modifier_t m;
 
@@ -577,7 +577,7 @@
 static void _handle_fmt_str(fmt_ptrn_t * x, char **p)
 {
 	/* format string -> %(<modifier_0> ... <modifier_n> <key>:<alt>) */
-	stack_t modifier;
+	my_stack_t modifier;
 	char key[KEY_LEN + 1];
 
 	assert(_fmt_ptrn_t_valid(x));
@@ -654,7 +654,7 @@
 	while (*pattern != 0x00) {
 		if (*pattern == '%' && *(pattern + 1) == '(') {
 			/* format string -> %(<modifier_0> ... <modifier_n> <key>:<alt>) */
-			stack_t modifier;
+			my_stack_t modifier;
 			char key[KEY_LEN + 1];
 
 			assert(*pattern != 0x00);


Index: fmt-ptrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmt-ptrn/devel/fmt-ptrn.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fmt-ptrn.spec	26 May 2008 01:29:44 -0000	1.7
+++ fmt-ptrn.spec	12 Feb 2009 09:45:54 -0000	1.8
@@ -1,6 +1,6 @@
 Name: fmt-ptrn
 Version: 1.3.17
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -9,6 +9,7 @@
 Group: Development/Tools
 Requires: zlib
 BuildRequires: glib2-devel, zlib-devel, java-1.5.0-gcj-devel, libgcj-devel, junit
+Patch0: fmt-ptrn-1.3.17.stack_name_conflict.patch
 
 %description 
 New is a template system, especially useful in conjunction with a 
@@ -104,6 +105,7 @@
 
 
 %setup -q
+%patch0 -p1 -b .stack_name_conflict.patch
 
 
 %build
@@ -135,6 +137,10 @@
 
 
 %changelog
+* Thu Feb 12 2009 Caolán McNamara <caolanm at redhat.com> - 1.3.17-3
+- rebuild for dependencies, rename stack_t to my_stack_t to 
+  avoid conflict with /usr/include/bits/sigstack.h's stack_t
+
 * Sun May 25 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.17-2
    - Fixed placement of %%doc in RPM specification.