rpms/jd/FC-6 .cvsignore, 1.26, 1.27 jd.spec, 1.31, 1.32 sources, 1.26, 1.27

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31987/FC-6

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Jun 25 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.6.rc070625
- 1.9.5 rc 070625



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	16 Jun 2007 16:43:03 -0000	1.26
+++ .cvsignore	25 Jun 2007 14:32:50 -0000	1.27
@@ -1 +1 @@
-jd-1.9.5-beta070616.tgz
+jd-1.9.5-rc070625.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jd.spec	16 Jun 2007 16:43:03 -0000	1.31
+++ jd.spec	25 Jun 2007 14:32:50 -0000	1.32
@@ -4,36 +4,42 @@
 # svn checkout $SVNROOT/trunk
 # mv trunk jd-%%{main_ver}-%%{strtag}
 # tar czf jd-%%{main_ver}-%%{strtag}.tgz jd-%%{main_ver}-%%{strtag}
-#
+##########################################
+
 ##########################################
 # Defined by upsteam
 #
 %define         main_ver      1.9.5
-%define         strtag        beta070616
-%define         repoid        25591
-
+%define         strtag        rc070625
+%define         repoid        25963
+# Define this if this is pre-version
+%define         pre_release   1
+##########################################
 
+##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    6
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
 %define         gtkmmdevel    gtkmm24-devel
+%define         fontpackage   fonts-japanese
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
+##########################################
 
-# Define this if this is pre-version
-%define         pre_release   1
-
+##########################################
 %if %{pre_release}
 %define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
 %else
 %define         rel           %{vendor_rel}%{?dist}
 %endif
 
+# By default, Migemo support is disabled.
+%if             0%{?fedora} >= 5
 %define         _with_migemo  1
+%endif
 %define         migemo_dict   %{_datadir}/cmigemo/utf-8/migemo-dict
-
 ##########################################
 
 Name:           jd
@@ -56,7 +62,7 @@
 %if 0%{?_with_migemo} >= 1
 BuildRequires:  cmigemo-devel
 %endif
-Requires:       fonts-japanese
+Requires:       %{fontpackage}
 
 
 %description
@@ -72,18 +78,6 @@
 # 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 \
@@ -101,8 +95,6 @@
 
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
-# desktop-file-tools 0.10->0.11 change
-# 0.11 no longer accepts Application, X-Fedora, X-Red-Hat-Base
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -127,6 +119,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Jun 25 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.6.rc070625
+- 1.9.5 rc 070625
+
 * 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: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	16 Jun 2007 16:43:03 -0000	1.26
+++ sources	25 Jun 2007 14:32:50 -0000	1.27
@@ -1 +1 @@
-1a4894c4eaa39a0078c19e62f2ebb0f0  jd-1.9.5-beta070616.tgz
+b69541805a50049bf7d1b041bc4cb7d8  jd-1.9.5-rc070625.tgz