rpms/perl-Convert-Binary-C/devel perl-Convert-Binary-C-gcc44.patch, NONE, 1.1 perl-Convert-Binary-C.spec, 1.10, 1.11

[Alex Lancaster]

Author: alexlan

Update of /cvs/extras/rpms/perl-Convert-Binary-C/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14645

Modified Files:
	perl-Convert-Binary-C.spec 
Added Files:
	perl-Convert-Binary-C-gcc44.patch 
Log Message:
Add patch to fix #elif directives for new GCC 4.4


perl-Convert-Binary-C-gcc44.patch:

--- NEW FILE perl-Convert-Binary-C-gcc44.patch ---
--- cbc/cbc.h.orig	2009-02-08 03:26:57.000000000 -0700
+++ cbc/cbc.h	2009-02-08 03:27:38.000000000 -0700
@@ -69,71 +69,86 @@
 
 #ifndef CBC_DEFAULT_PTR_SIZE
 #define CBC_DEFAULT_PTR_SIZE    CTLIB_POINTER_SIZE
-#elif   CBC_DEFAULT_PTR_SIZE != 1 && \
+#else
+#if   CBC_DEFAULT_PTR_SIZE != 1 && \
         CBC_DEFAULT_PTR_SIZE != 2 && \
         CBC_DEFAULT_PTR_SIZE != 4 && \
         CBC_DEFAULT_PTR_SIZE != 8
 #error "CBC_DEFAULT_PTR_SIZE is invalid!"
 #endif
+#endif
 
 #ifndef CBC_DEFAULT_ENUM_SIZE
 #define CBC_DEFAULT_ENUM_SIZE    sizeof( int )
-#elif   CBC_DEFAULT_ENUM_SIZE != 0 && \
+#else 
+#if CBC_DEFAULT_ENUM_SIZE != 0 && \
         CBC_DEFAULT_ENUM_SIZE != 1 && \
         CBC_DEFAULT_ENUM_SIZE != 2 && \
         CBC_DEFAULT_ENUM_SIZE != 4 && \
         CBC_DEFAULT_ENUM_SIZE != 8
 #error "CBC_DEFAULT_ENUM_SIZE is invalid!"
 #endif
+#endif
 
 #ifndef CBC_DEFAULT_INT_SIZE
 #define CBC_DEFAULT_INT_SIZE    CTLIB_int_SIZE
-#elif   CBC_DEFAULT_INT_SIZE != 1 && \
+#else 
+#if  CBC_DEFAULT_INT_SIZE != 1 && \
         CBC_DEFAULT_INT_SIZE != 2 && \
         CBC_DEFAULT_INT_SIZE != 4 && \
         CBC_DEFAULT_INT_SIZE != 8
 #error "CBC_DEFAULT_INT_SIZE is invalid!"
 #endif
+#endif
 
 #ifndef CBC_DEFAULT_CHAR_SIZE
 #define CBC_DEFAULT_CHAR_SIZE    CTLIB_char_SIZE
-#elif   CBC_DEFAULT_CHAR_SIZE != 1 && \
+#else 
+#if  CBC_DEFAULT_CHAR_SIZE != 1 && \
         CBC_DEFAULT_CHAR_SIZE != 2 && \
         CBC_DEFAULT_CHAR_SIZE != 4 && \
         CBC_DEFAULT_CHAR_SIZE != 8
 #error "CBC_DEFAULT_CHAR_SIZE is invalid!"
 #endif
+#endif
 
 #ifndef CBC_DEFAULT_SHORT_SIZE
 #define CBC_DEFAULT_SHORT_SIZE    CTLIB_short_SIZE
-#elif   CBC_DEFAULT_SHORT_SIZE != 1 && \
+#else 
+#if  CBC_DEFAULT_SHORT_SIZE != 1 && \
         CBC_DEFAULT_SHORT_SIZE != 2 && \
         CBC_DEFAULT_SHORT_SIZE != 4 && \
         CBC_DEFAULT_SHORT_SIZE != 8
 #error "CBC_DEFAULT_SHORT_SIZE is invalid!"
 #endif
+#endif
 
 #ifndef CBC_DEFAULT_LONG_SIZE
 #define CBC_DEFAULT_LONG_SIZE    CTLIB_long_SIZE
-#elif   CBC_DEFAULT_LONG_SIZE != 1 && \
+#else 
+#if  CBC_DEFAULT_LONG_SIZE != 1 && \
         CBC_DEFAULT_LONG_SIZE != 2 && \
         CBC_DEFAULT_LONG_SIZE != 4 && \
         CBC_DEFAULT_LONG_SIZE != 8
 #error "CBC_DEFAULT_LONG_SIZE is invalid!"
 #endif
+#endif
 
 #ifndef CBC_DEFAULT_LONG_LONG_SIZE
 #define CBC_DEFAULT_LONG_LONG_SIZE    CTLIB_long_long_SIZE
-#elif   CBC_DEFAULT_LONG_LONG_SIZE != 1 && \
+#else 
+#if  CBC_DEFAULT_LONG_LONG_SIZE != 1 && \
         CBC_DEFAULT_LONG_LONG_SIZE != 2 && \
         CBC_DEFAULT_LONG_LONG_SIZE != 4 && \
         CBC_DEFAULT_LONG_LONG_SIZE != 8
 #error "CBC_DEFAULT_LONG_LONG_SIZE is invalid!"
 #endif
+#endif
 
 #ifndef CBC_DEFAULT_FLOAT_SIZE
 #define CBC_DEFAULT_FLOAT_SIZE    CTLIB_float_SIZE
-#elif   CBC_DEFAULT_FLOAT_SIZE != 1  && \
+#else 
+#if  CBC_DEFAULT_FLOAT_SIZE != 1  && \
         CBC_DEFAULT_FLOAT_SIZE != 2  && \
         CBC_DEFAULT_FLOAT_SIZE != 4  && \
         CBC_DEFAULT_FLOAT_SIZE != 8  && \
@@ -141,10 +156,12 @@
         CBC_DEFAULT_FLOAT_SIZE != 16
 #error "CBC_DEFAULT_FLOAT_SIZE is invalid!"
 #endif
+#endif
 
 #ifndef CBC_DEFAULT_DOUBLE_SIZE
 #define CBC_DEFAULT_DOUBLE_SIZE    CTLIB_double_SIZE
-#elif   CBC_DEFAULT_DOUBLE_SIZE != 1  && \
+#else 
+#if  CBC_DEFAULT_DOUBLE_SIZE != 1  && \
         CBC_DEFAULT_DOUBLE_SIZE != 2  && \
         CBC_DEFAULT_DOUBLE_SIZE != 4  && \
         CBC_DEFAULT_DOUBLE_SIZE != 8  && \
@@ -152,10 +169,12 @@
         CBC_DEFAULT_DOUBLE_SIZE != 16
 #error "CBC_DEFAULT_DOUBLE_SIZE is invalid!"
 #endif
+#endif
 
 #ifndef CBC_DEFAULT_LONG_DOUBLE_SIZE
 #define CBC_DEFAULT_LONG_DOUBLE_SIZE    CTLIB_long_double_SIZE
-#elif   CBC_DEFAULT_LONG_DOUBLE_SIZE != 1  && \
+#else 
+#if  CBC_DEFAULT_LONG_DOUBLE_SIZE != 1  && \
         CBC_DEFAULT_LONG_DOUBLE_SIZE != 2  && \
         CBC_DEFAULT_LONG_DOUBLE_SIZE != 4  && \
         CBC_DEFAULT_LONG_DOUBLE_SIZE != 8  && \
@@ -163,6 +182,7 @@
         CBC_DEFAULT_LONG_DOUBLE_SIZE != 16
 #error "CBC_DEFAULT_LONG_DOUBLE_SIZE is invalid!"
 #endif
+#endif
 
 #ifndef CBC_DEFAULT_ALIGNMENT
 #define CBC_DEFAULT_ALIGNMENT    1


Index: perl-Convert-Binary-C.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/devel/perl-Convert-Binary-C.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Convert-Binary-C.spec	4 Jun 2008 07:49:03 -0000	1.10
+++ perl-Convert-Binary-C.spec	8 Feb 2009 10:39:41 -0000	1.11
@@ -1,11 +1,12 @@
 Name:           perl-Convert-Binary-C
 Version:        0.71
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Binary data conversion using C types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Convert-Binary-C/
 Source0:        http://www.cpan.org/modules/by-module/Convert/Convert-Binary-C-%{version}.tar.gz
+Patch0:         %{name}-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::Pod)
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q -n Convert-Binary-C-%{version}
+%patch0 -p0 -b .gcc44
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
@@ -54,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Feb  8 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.71-2
+- Add patch to fix #elif directives for new GCC 4.4
+
 * Wed Jun  4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.71-1
 - Update to latest upstream (0.71)