rpms/jd/devel .cvsignore, 1.119, 1.120 jd.spec, 1.137, 1.138 sources, 1.119, 1.120

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23248

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.5.svn1150
- svn 1150



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- .cvsignore	22 Jun 2007 15:44:27 -0000	1.119
+++ .cvsignore	24 Jun 2007 17:27:11 -0000	1.120
@@ -1 +1 @@
-jd-1.9.5-svn1148.tgz
+jd-1.9.5-svn1150.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- jd.spec	22 Jun 2007 15:44:27 -0000	1.137
+++ jd.spec	24 Jun 2007 17:27:11 -0000	1.138
@@ -4,15 +4,19 @@
 # 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        svn1148
+%define         strtag        svn1150
 %define         repoid        25591
+# Define this if this is pre-version
+%define         pre_release   1
+##########################################
 
-
+##########################################
 # Defined by vendor
 #
 %define         vendor_rel    5
@@ -20,20 +24,21 @@
 # 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
 
+%if             0%{?fedora} >= 5
 %define         _with_migemo  1
+%endif
 %define         migemo_dict   %{_datadir}/cmigemo/utf-8/migemo-dict
-
 ##########################################
 
 Name:           jd
@@ -56,7 +61,7 @@
 %if 0%{?_with_migemo} >= 1
 BuildRequires:  cmigemo-devel
 %endif
-Requires:       fonts-japanese
+Requires:       %{fontpackage}
 
 
 %description
@@ -89,8 +94,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 \
@@ -115,8 +118,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Jun 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.5.svn1148
-- svn 1148
+* Mon Jun 25 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.5.svn1150
+- svn 1150
 
 * 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/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- sources	22 Jun 2007 15:44:27 -0000	1.119
+++ sources	24 Jun 2007 17:27:11 -0000	1.120
@@ -1 +1 @@
-5c6a38059c2a645fb4bc95ac561ab5f8  jd-1.9.5-svn1148.tgz
+a1648f6672ce874fa67c4694680223d6  jd-1.9.5-svn1150.tgz