From bd24b0ad0dc3eb5ea2173dc05a0f5b12c051fc08 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Jul 26 2009 19:27:21 +0000
Subject: rev 2989


---

diff --git a/.cvsignore b/.cvsignore
index 10ccf94..e7998ea 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-jd-2.4.2-svn2981_trunk.tgz
+jd-2.4.2-svn2989_trunk.tgz
diff --git a/jd-2.1.0-issue-jd6-868.patch b/jd-2.1.0-issue-jd6-868.patch
deleted file mode 100644
index 3188987..0000000
--- a/jd-2.1.0-issue-jd6-868.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/skeleton/edittreeview.cpp.debug	2008-12-21 23:13:30.000000000 +0900
-+++ src/skeleton/edittreeview.cpp	2008-12-30 11:06:19.000000000 +0900
-@@ -852,8 +852,14 @@
-     Gtk::TreePath path = path_dest;
- 
-     if( path.empty() ){
--        path = get_model()->get_path( *( get_model()->children().rbegin() ) );
--        path.next();
-+        Gtk::TreeModel::Children children = get_model()->children();
-+
-+        if( ! children.empty() )
-+         {
-+            path = get_model()->get_path( *( children.rbegin() ) );
-+            path.next();
-+         }
-+        else return;
-     }
- 
-     else if( before );
diff --git a/jd-rev2738-compile.patch b/jd-rev2738-compile.patch
deleted file mode 100644
index 4898831..0000000
--- a/jd-rev2738-compile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/cache.cpp
-===================================================================
---- src/cache.cpp	(revision 2738)
-+++ src/cache.cpp	(working copy)
-@@ -25,6 +25,7 @@
- #include <dirent.h>
- 
- #include <fcntl.h>
-+#include <cstring>
- 
- enum
- {
diff --git a/jd-rev2982-windres.patch b/jd-rev2982-windres.patch
deleted file mode 100644
index 24eb5d2..0000000
--- a/jd-rev2982-windres.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 2982)
-+++ configure.in	(working copy)
-@@ -161,6 +161,7 @@
- esac
- 
- AC_SUBST(MAKE_WINDRES)
-+AM_CONDITIONAL(WINDRES, test -n "$MAKE_WINDRES")
- 
- 
- dnl
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am	(revision 2982)
-+++ src/Makefile.am	(working copy)
-@@ -59,11 +59,8 @@
- 	usrcmdpref.cpp \
- 	linkfilterpref.cpp \
- 	iomonitor.cpp \
--	environment.cpp \
--\
--	jd_windres.rc
-+	environment.cpp
- 
--
- noinst_HEADERS = \
- 	winmain.h \
- 	httpcode.h \
-@@ -123,6 +120,10 @@
- 
- MAKE_WINDRES = @MAKE_WINDRES@
- 
-+if WINDRES
-+jd_SOURCES +=	jd_windres.rc
-+endif
-+
- SUFFIXES = .rc .o
- 
- .rc.o:
diff --git a/jd.spec b/jd.spec
index f32684a..fd97b47 100644
--- a/jd.spec
+++ b/jd.spec
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn2981_trunk
+%define         strtag        svn2989_trunk
 %define         repoid        41293
 # Define this if this is pre-version
 %define         pre_release   1
@@ -51,7 +51,6 @@ License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
-Patch0:		jd-rev2982-windres.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -78,7 +77,6 @@ JD is a 2ch browser based on gtkmm2.
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
 #find . -name .svn | sort -r | xargs %{__rm} -rf
-%patch0 -p0
 
 sh autogen.sh
 
@@ -137,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Jul 26 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
-- rev 2981
+* Mon Jul 27 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+- rev 2989
 
 * Sun Jul 12 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 2.4.1-1
 - 2.4.1
diff --git a/sources b/sources
index 1f241ea..4912558 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5cc23e985051245bd2aa3faf3e3209fa  jd-2.4.2-svn2981_trunk.tgz
+18559885cc753c4623a76068dbe06be1  jd-2.4.2-svn2989_trunk.tgz