From cbbee0f7e3af4f74b865c5a9b122748275e65915 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Jul 25 2009 19:23:01 +0000
Subject: *** empty log message ***


---

diff --git a/.cvsignore b/.cvsignore
index 4451cb9..10ccf94 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-jd-2.4.2-svn2964_trunk.tgz
+jd-2.4.2-svn2981_trunk.tgz
diff --git a/jd-rev2982-windres.patch b/jd-rev2982-windres.patch
new file mode 100644
index 0000000..24eb5d2
--- /dev/null
+++ b/jd-rev2982-windres.patch
@@ -0,0 +1,40 @@
+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 13592bd..f32684a 100644
--- a/jd.spec
+++ b/jd.spec
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn2964_trunk
+%define         strtag        svn2981_trunk
 %define         repoid        41293
 # Define this if this is pre-version
 %define         pre_release   1
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -51,6 +51,7 @@ 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}
@@ -77,6 +78,7 @@ 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
 
@@ -135,8 +137,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Jul 23 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
-- rev 2964
+* Sun Jul 26 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+- rev 2981
 
 * 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 83e2ee4..1f241ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a822dc3e6717cf9117b98fcf04746d08  jd-2.4.2-svn2964_trunk.tgz
+5cc23e985051245bd2aa3faf3e3209fa  jd-2.4.2-svn2981_trunk.tgz