rpms/gnome-chemistry-utils/devel 25628-2.patch, NONE, 1.1 noautobuild, NONE, 1.1 gnome-chemistry-utils.spec, 1.32, 1.33

[Julian Sikorski]

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17779

Modified Files:
	gnome-chemistry-utils.spec 
Added Files:
	25628-2.patch noautobuild 
Log Message:
* Wed Feb 18 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.3-2
- Patched gcc-4.4 build issues
- Fixed the Source URL
- Made the gchempaint Provides/Obsoletes versioned


25628-2.patch:

--- NEW FILE 25628-2.patch ---
Index: libs/gcu/element.cc
===================================================================
--- libs/gcu/element.cc	(révision 1009)
+++ libs/gcu/element.cc	(copie de travail)
@@ -44,8 +44,8 @@
 
 static void ReadValue (char const *source, GcuValue &value)
 {
-	char *buf, *dot;
-	value.value = strtod (source, &buf);
+	const char *buf, *dot;
+	value.value = strtod (source, const_cast <char**> (&buf));
 	dot = strchr (source, '.');
 	value.prec = (dot)? buf - dot - 1: 0;
 	value.delta = (*buf == '(')? strtol (buf + 1, NULL, 10): 0;
@@ -53,8 +53,8 @@
 
 static void ReadDimensionalValue (char const *source, GcuDimensionalValue &value)
 {
-	char *buf, *dot;
-	value.value = strtod (source, &buf);
+	const char *buf, *dot;
+	value.value = strtod (source, const_cast <char**> (&buf));
 	dot = strchr (source, '.');
 	value.prec = (dot)? buf - dot - 1: 0;
 	value.delta = (*buf == '(')? strtol (buf + 1, NULL, 10): 0;
Index: libs/gcu/spectrumdoc.cc
===================================================================
--- libs/gcu/spectrumdoc.cc	(révision 1009)
+++ libs/gcu/spectrumdoc.cc	(copie de travail)
@@ -1411,7 +1411,7 @@
 	char buf[32], c = data[0];
 	double val = 0., newval = 0.;
 	bool pos, diff = false;
-	char *eq = strstr (data, "$$");
+	char *eq = strstr (const_cast <char *> (data), "$$");
 	if (eq)
 		*eq = 0;
 	pos = true;
Index: mozilla-plugin/moz-plugin.c
===================================================================
--- mozilla-plugin/moz-plugin.c	(révision 1009)
+++ mozilla-plugin/moz-plugin.c	(copie de travail)
@@ -22,7 +22,11 @@
 
 #include <config.h>
 #include "npapi.h"
-#include "npupp.h"
+#ifdef HAVE_NPFUNCTIONS_H
+#   include "npfunctions.h"
+#else
+#   include "npupp.h"
+#endif
 #include <unistd.h>
 #include <string.h>
 
Index: configure.ac
===================================================================
--- configure.ac	(révision 1009)
+++ configure.ac	(copie de travail)
@@ -269,6 +269,12 @@
 	
 	if test "x$MOZILLA_CFLAGS" != "x"; then
 		build_mozilla_plugin=yes
+
+		dnl test for npfunctions.h
+		saved_CFLAGS=$CFLAGS
+		CFLAGS=$MOZILLA_CFLAGS
+		AC_CHECK_HEADERS([npfunctions.h])
+		CFLAGS=$saved_CFLAGS
 	fi
 fi
 


--- NEW FILE noautobuild ---
gnome-chemistry-utils won't build against new xulrunner in rawhide, it needs to be fixed first


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-chemistry-utils.spec	6 Jan 2009 20:04:16 -0000	1.32
+++ gnome-chemistry-utils.spec	23 Feb 2009 14:24:26 -0000	1.33
@@ -1,12 +1,13 @@
 Name:           gnome-chemistry-utils
 Version:        0.10.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://www.nongnu.org/gchemutils/
-Source0:        http://download.savannah.nongnu.org/releases/gchemutils/%{name}-%{version}.tar.bz2
+Source0:        http://download.savannah.nongnu.org/releases/gchemutils/0.10/%{name}-%{version}.tar.bz2
+Patch0:         25628-2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bodr
@@ -38,9 +39,9 @@
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
-Provides:       gchempaint
+Provides:       gchempaint = %{version}-%{release}
 
-Obsoletes:      gchempaint
+Obsoletes:      gchempaint < 0.8.7-4
 Obsoletes:      gchempaint-devel
 Obsoletes:      gnome-chemistry-utils-devel
 
@@ -72,7 +73,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .gcc44
 
 %build
 %configure --disable-update-databases \
@@ -218,6 +219,11 @@
 
 
 %changelog
+* Wed Feb 18 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.3-2
+- Patched gcc-4.4 build issues
+- Fixed the Source URL
+- Made the gchempaint Provides/Obsoletes versioned
+
 * Tue Jan  6 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.3-1
 - Updated to 0.10.3