rpms/jd/F-9 .cvsignore, 1.339, 1.340 jd.spec, 1.385, 1.386 sources, 1.340, 1.341

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29641/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Jan 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-0.3.beta090128
- '2.2.0' beta 090128
- Although tarball says version is 2.1.1, the upsteam developer said that
  he/she will retag version number to 2.2.0
- kill oniguruma support on all branches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- .cvsignore	20 Jan 2009 04:07:05 -0000	1.339
+++ .cvsignore	28 Jan 2009 16:52:54 -0000	1.340
@@ -1 +1 @@
-jd-2.2.0-svn2631_trunk.tgz
+jd-2.1.1-beta090128.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- jd.spec	20 Jan 2009 04:07:05 -0000	1.385
+++ jd.spec	28 Jan 2009 16:52:54 -0000	1.386
@@ -10,8 +10,9 @@
 # Defined by upsteam
 #
 %define         main_ver      2.2.0
-%define         strtag        svn2631_trunk
-%define         repoid        36802
+%define         tarball_ver   2.1.1
+%define         strtag        beta090128
+%define         repoid        37324
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +20,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    3
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -40,6 +41,7 @@
 %if             0%{?fedora} >= 5
 %define         _with_migemo  1
 %endif
+%define         _with_onig    0 
 %define         migemo_dict   %{_datadir}/cmigemo/utf-8/migemo-dict
 ##########################################
 
@@ -51,7 +53,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{tarball_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,7 +66,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 BuildRequires:  alsa-lib-devel
-%if 0%{?fedora} > 8
+%if 0%{?_with_onig} >= 1
 BuildRequires:  oniguruma-devel
 %endif
 %if %{pre_release}
@@ -77,9 +79,14 @@
 JD is a 2ch browser based on gtkmm2.
 
 %prep
-%setup -q -n %{name}-%{main_ver}-%{strtag}
+%setup -q -n %{name}-%{tarball_ver}-%{strtag}
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
+%{__sed} -i.retag \
+	-e 's|MINORVERSION 1|MINORVERSION 2|' \
+	-e 's|MICROVERSION 1|MICROVERSION 0|' \
+	src/jdversion.h
+
 sh autogen.sh
 
 %build
@@ -88,7 +95,7 @@
 
 %configure \
    --with-alsa \
-%if 0%{?fedora} > 8
+%if 0%{?_with_onig} > 1
    --with-oniguruma \
 %endif
    --with-xdgopen \
@@ -133,8 +140,15 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Thu Jan 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-0.3.beta090128
+- '2.2.0' beta 090128
+- Although tarball says version is 2.1.1, the upsteam developer said that
+  he/she will retag version number to 2.2.0
+- kill oniguruma support on all branches
+
 * Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2631
+- Try to kill oniguruma support on F-11 (seemingly behaving badly
+  with cmigemo)
 
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
 - Workaround for the issue on res 868 in JD 6 thread (segv when


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- sources	20 Jan 2009 04:07:05 -0000	1.340
+++ sources	28 Jan 2009 16:52:54 -0000	1.341
@@ -1 +1 @@
-b4d02a885d675cd4dbfd5455a4e892a1  jd-2.2.0-svn2631_trunk.tgz
+8169a698c333041f1cab91d3dd9807b3  jd-2.1.1-beta090128.tgz