rpms/jd/F-7 .cvsignore, 1.112, 1.113 jd.spec, 1.128, 1.129 sources, 1.112, 1.113

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17371/F-7

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Jun 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.5.beta070616
- 1.9.5 beta 070616



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- .cvsignore	15 Jun 2007 15:54:16 -0000	1.112
+++ .cvsignore	16 Jun 2007 16:42:53 -0000	1.113
@@ -1 +1 @@
-jd-1.9.5-svn1136.tgz
+jd-1.9.5-beta070616.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- jd.spec	15 Jun 2007 15:54:16 -0000	1.128
+++ jd.spec	16 Jun 2007 16:42:53 -0000	1.129
@@ -9,13 +9,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.5
-%define         strtag        svn1136
+%define         strtag        beta070616
 %define         repoid        25591
 
 
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    5
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -72,6 +72,18 @@
 # set TZ for __TIME__
 export TZ='Asia/Tokyo'
 
+# gtk+ 2.11.3 workaround!!
+# http://bugzilla.gnome.org/show_bug.cgi?id=448193
+if pkg-config --exists 'gdk-2.0 = 2.11.3' ; then
+%{__rm} -rf TMP_INCLUDEDIR
+%{__mkdir_p} TMP_INCLUDEDIR/gtk
+pushd TMP_INCLUDEDIR/gtk
+%{__cp} -p %{_includedir}/gtk-2.0/gtk/gtkbuilder.h .
+%{__sed} -i.reserved -e 's|typename|type_name|' gtkbuilder.h
+popd
+export CXX="g++ -I$(pwd)/TMP_INCLUDEDIR"
+fi
+
 %configure \
 %if 0%{?_with_migemo} >= 1
    --with-migemo \
@@ -115,8 +127,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Jun 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.4.svn1136
-- svn 1136
+* Sat Jun 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.5.beta070616
+- 1.9.5 beta 070616
 
 * Mon Jun 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.4.beta070611
 - 1.9.5 beta 070611


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- sources	15 Jun 2007 15:54:16 -0000	1.112
+++ sources	16 Jun 2007 16:42:53 -0000	1.113
@@ -1 +1 @@
-af76f4be7166824f99eb2813aba8e508  jd-1.9.5-svn1136.tgz
+1a4894c4eaa39a0078c19e62f2ebb0f0  jd-1.9.5-beta070616.tgz