rpms/jd/devel jd-rev2982-windres.patch, NONE, 1.1 jd.spec, 1.440, 1.441

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3493

Modified Files:
	jd.spec 
Added Files:
	jd-rev2982-windres.patch 
Log Message:
Fix build

jd-rev2982-windres.patch:
 configure.in    |    1 +
 src/Makefile.am |    9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE jd-rev2982-windres.patch ---
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:


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -p -r1.440 -r1.441
--- jd.spec	25 Jul 2009 17:35:04 -0000	1.440
+++ jd.spec	25 Jul 2009 19:01:26 -0000	1.441
@@ -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