rpms/R-GeneR/devel R-GeneR-gcc44.patch, NONE, 1.1 R-GeneR.spec, 1.6, 1.7

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/R-GeneR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7709/devel

Modified Files:
	R-GeneR.spec 
Added Files:
	R-GeneR-gcc44.patch 
Log Message:
- Fix FTBFS: added R-GeneR-gcc44.patch.
- Do not override the release macro.
- Use %%global instead of %%define.



R-GeneR-gcc44.patch:

--- NEW FILE R-GeneR-gcc44.patch ---
--- GeneR/src/compoSeq.cc.orig	2009-04-22 01:46:37.000000000 +0200
+++ GeneR/src/compoSeq.cc	2009-04-22 01:47:48.000000000 +0200
@@ -68,9 +68,9 @@
   int i,j,k;
   int end;
 
-  char * (* fun) (const char*, const char *) = NULL;
+  const char * (* fun) (const char*, const char *) = NULL;
 
-  char * posFind;
+  const char * posFind;
 
   char (*upperornot)(char) = NULL;
 


Index: R-GeneR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/devel/R-GeneR.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- R-GeneR.spec	31 Mar 2009 08:33:53 -0000	1.6
+++ R-GeneR.spec	22 Apr 2009 00:41:14 -0000	1.7
@@ -1,16 +1,18 @@
-%define packname  GeneR
-%define release   2.4
-%define Rversion  2.8.0
+%global packname  GeneR
+%global bioconductor_release   2.4
+%global Rversion  2.8.0
 
 Name:             R-%{packname}
 Version:          2.13.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          R for genes and sequences analysis
 
 Group:            Applications/Engineering 
 License:          CeCILL
-URL:              http://www.bioconductor.org/packages/%{release}/bioc/html/%{packname}.html
-Source0:          http://www.bioconductor.org/packages/%{release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+URL:              http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/html/%{packname}.html
+Source0:          http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+Patch0:           %{name}-gcc44.patch
+# Has been sent to daubenton [AT]Â cgm.cnrs-gif [DOT] fr on 2009/04/22
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R >= %{Rversion}
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q -c -n %{packname}
+%patch0
 
 %build
 
@@ -87,6 +90,11 @@
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.13.1-2
+- Fix FTBFS: added R-GeneR-gcc44.patch.
+- Do not override the release macro.
+- Use %%global instead of %%define.
+
 * Tue Mar 31 2009 pingou <pingou at pingoured.fr> - 2.13.1-1
 - Update to 2.13.1 from the devel version of bioconductor