rpms/ochusha/devel ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch, NONE, 1.1 ochusha.spec, 1.46, 1.47

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15248

Modified Files:
	ochusha.spec 
Added Files:
	ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch 
Log Message:
* Sun Jan  6 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.66-0.4.cvs070110
- Misc fixes for g++43.


ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch:

--- NEW FILE ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch ---
--- ochusha-0.5.99.66-cvs070110/libochusha/misc_utils.h.gcc43	2007-01-01 12:17:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/misc_utils.h	2008-01-04 02:15:18.000000000 +0900
@@ -43,6 +43,8 @@
 
 #include <cstring>
 
+#include <climits>
+#include <cstdlib>
 
 using namespace std;
 namespace Ochusha
--- ochusha-0.5.99.66-cvs070110/libtscore/tscore_procedure.cc.gcc43	2007-01-01 12:17:54.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libtscore/tscore_procedure.cc	2008-01-04 02:14:44.000000000 +0900
@@ -41,6 +41,7 @@
 #include "libtscore/writer.h"
 
 #include <cstdio>
+#include <climits>
 
 #ifdef HAVE_TIME_H
 #include <time.h>
--- ochusha-0.5.99.66-cvs070110/ochusha/tab_label.cc.gcc43	2007-01-01 12:18:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/ochusha/tab_label.cc	2008-01-04 02:16:54.000000000 +0900
@@ -42,6 +42,7 @@
 
 #include <gtk/gtk.h>
 
+#include <cstring>
 
 namespace Ochusha
 {


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ochusha.spec	4 Dec 2007 15:48:21 -0000	1.46
+++ ochusha.spec	5 Jan 2008 16:29:14 -0000	1.47
@@ -4,7 +4,7 @@
 %define              main_ver        0.5.99.66
 %define              strtag          cvs070110
 
-%define              vendor_rel      3
+%define              vendor_rel      4
 %define              pre_release     1
 
 %if %{pre_release}
@@ -24,12 +24,14 @@
 Source:              http://keihanna.dl.sourceforge.jp/ochusha/16560/%{name}-%{version}.tar.bz2
 %endif
 Patch0:              ochusha-0.5.99.66-cvs070110-disable-lock-check.patch
+Patch1:              ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch
 License:             BSD
 Group:               Applications/Internet
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 Requires:            fonts-japanese
 Requires:            %{system_ca_cert_file}
+Requires:            xdg-utils
 
 BuildRequires:       libtool
 BuildRequires:       gettext
@@ -54,12 +56,13 @@
 %setup -q
 %endif
 %patch0 -p1 -b .lock
+%patch1 -p1 -b .gcc43
 
 # change desktop entry to use png file at %%{icondir}.
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
 
 # set htmlview as a default browser
-%{__sed} -i -e 's|firefox|htmlview|' ochusha/preferences.cc
+%{__sed} -i -e 's|firefox|xdg-open|' ochusha/preferences.cc
 
 %build
 sh autogen.sh
@@ -159,6 +162,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
+* Sun Jan  6 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.66-0.4.cvs070110
+- Misc fixes for g++43.
+
 * Wed Dec  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.66-0.3.cvs070110
 - Fix icon path in desktop file for desktop-file-utils 0.14+