From 0a4a9265f5286f69126559a9069847ad9514e44c Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Jan 29 2011 14:43:50 +0000
Subject: - 2.8.0 rc 111029


---

diff --git a/.gitignore b/.gitignore
index 8ce7eb1..54e4f41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ jd-2.7.0-svn3613_trunk.tgz
 /jd-2.8.0-svn3806_trunk.tgz
 /jd-2.8.0-svn3810_trunk.tgz
 /jd-2.8.0-beta110118.tgz
+/jd-2.8.0-rc110129.tgz
diff --git a/jd-rev3818-icon-settings.patch b/jd-rev3818-icon-settings.patch
deleted file mode 100644
index 9e7695f..0000000
--- a/jd-rev3818-icon-settings.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/skeleton/tablabel.cpp
-===================================================================
---- src/skeleton/tablabel.cpp	(revision 3817)
-+++ src/skeleton/tablabel.cpp	(revision 3818)
-@@ -135,7 +135,7 @@
-             + m_hbox.get_spacing() + m_hbox.get_border_width()*2
-             + get_border_width()*2;
- 
--        if( ICON::get_icon( m_id_icon ) ) label_margin += ICON::get_icon( m_id_icon )->get_width();
-+        if( CONFIG::get_show_tab_icon() && m_id_icon < ICON::NUM_ICONS ) label_margin += ICON::get_icon( m_id_icon )->get_width();
-     }
- 
- #ifdef _DEBUG
diff --git a/jd.spec b/jd.spec
index 65658b0..cad8827 100644
--- a/jd.spec
+++ b/jd.spec
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.8.0
-%define         strtag        beta110118
-%define         repoid        50641
+%define         strtag        rc110129
+%define         repoid        50754
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    6
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -52,8 +52,6 @@ URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 Patch0:         jd-2.6.0-rc100130-env-pkg-distro-specific.patch
-# http://hibari.2ch.net/test/read.cgi/linux/1276299375/786
-Patch10:        jd-rev3818-icon-settings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -85,7 +83,6 @@ JD is a 2ch browser based on gtkmm2.
 if ( uname -n | grep -q 'fedoraproject\.org' ) ; then
 %patch0 -p1 -b .env_fedora
 fi
-%patch10 -p0 -b .rev3818
 
 sh autogen.sh
 
@@ -144,6 +141,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Jan 29 2011 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - jd-2.8.0-0.6.rc110129
+- 2.8.0 rc 111029
+
+* Mon Jan 24 2011 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 2.8.0-0.5.beta110118
+- Patch for gcc 460
+
 * Thu Jan 20 2011 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 2.8.0-0.4.beta110118
 - Patch to fix segfault with icon settings (rev 3818)
 
diff --git a/sources b/sources
index 09c0786..c53c826 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb587aa22cf9c2cf7c537a9ff844c8e7  jd-2.8.0-beta110118.tgz
+b4dc4e7c8c53279e5d33a3be4ac1053f  jd-2.8.0-rc110129.tgz