rpms/jd/devel .cvsignore, 1.322, 1.323 jd.spec, 1.374, 1.375 sources, 1.323, 1.324

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
rev 2580, use oniguruma on F-9+ for regex


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- .cvsignore	19 Dec 2008 05:09:32 -0000	1.322
+++ .cvsignore	19 Dec 2008 17:31:00 -0000	1.323
@@ -1 +1 @@
-jd-2.1.0-svn2575_trunk.tgz
+jd-2.1.0-svn2580_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- jd.spec	19 Dec 2008 09:20:22 -0000	1.374
+++ jd.spec	19 Dec 2008 17:31:00 -0000	1.375
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.1.0
-%define         strtag        svn2575_trunk
+%define         strtag        svn2580_trunk
 %define         repoid        36586
 # Define this if this is pre-version
 %define         pre_release   1
@@ -20,7 +20,7 @@
 # Defined by vendor
 #
 %define         vendor_rel    2
-%define         extra_rel     .onig
+%define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -54,9 +54,6 @@
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Patch0:		jd-svn2573-compile.patch
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
-# From JD development thread:
-# Modified for migemo
-Patch10:        jd-rev2575-oniguruma.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -68,7 +65,9 @@
 BuildRequires:  cmigemo-devel
 %endif
 BuildRequires:  alsa-lib-devel
+%if 0%{?fedora} > 8
 BuildRequires:  oniguruma-devel
+%endif
 %if %{pre_release}
 BuildRequires:	subversion
 %endif
@@ -80,19 +79,19 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-#%%patch0 -p0 -b .compile
-%patch10 -p0 -b .onig
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
-%build
 sh autogen.sh
 
+%build
 # set TZ for __TIME__
 export TZ='Asia/Tokyo'
 
 %configure \
    --with-alsa \
+%if 0%{?fedora} > 8
    --with-oniguruma \
+%endif
    --with-xdgopen \
 %if 0%{?_with_migemo} >= 1
    --with-migemo \
@@ -135,8 +134,12 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Dec 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2575
+* Sat Dec 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2580
+
+* Sat Dec 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2579
+- Use oniguruma on F-9+ for regex
 
 * Tue Dec 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.3-0.2.beta081216
 - 2.0.3 beta 081216


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- sources	19 Dec 2008 05:09:32 -0000	1.323
+++ sources	19 Dec 2008 17:31:00 -0000	1.324
@@ -1 +1 @@
-483decf90d4f7f362fae05e0f55ff7e2  jd-2.1.0-svn2575_trunk.tgz
+45fc15b5579733b8985879abcf2d4e91  jd-2.1.0-svn2580_trunk.tgz