From a7cd5359288ddfbce59ed789cb426d8ac10e014c Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Jan 28 2009 16:52:55 +0000
Subject: - '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

---

diff --git a/.cvsignore b/.cvsignore
index 83338d7..82e6a6b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-jd-2.2.0-svn2631_trunk.tgz
+jd-2.1.1-beta090128.tgz
diff --git a/jd.spec b/jd.spec
index 537a8b9..9c03bfb 100644
--- a/jd.spec
+++ b/jd.spec
@@ -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    2
+%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 @@ Summary:        A 2ch browser
 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,11 +66,9 @@ BuildRequires:  libSM-devel
 BuildRequires:  cmigemo-devel
 %endif
 BuildRequires:  alsa-lib-devel
-%if 0%{?fedora} > 8
-%if 0%{?fedora} < 11
+%if 0%{?_with_onig} >= 1
 BuildRequires:  oniguruma-devel
 %endif
-%endif
 %if %{pre_release}
 BuildRequires:	subversion
 %endif
@@ -79,9 +79,14 @@ Requires:       %{fontpackage}
 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
@@ -90,11 +95,9 @@ export TZ='Asia/Tokyo'
 
 %configure \
    --with-alsa \
-%if 0%{?fedora} > 8
-%if 0%{?fedora} < 11
+%if 0%{?_with_onig} > 1
    --with-oniguruma \
 %endif
-%endif
    --with-xdgopen \
 %if 0%{?_with_migemo} >= 1
    --with-migemo \
@@ -137,8 +140,11 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Jan 20 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
-- rev 2631
+* Thu Jan 29 2009 Mamoru Tasaka <mtasaka@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@ioa.s.u-tokyo.ac.jp>
 - Try to kill oniguruma support on F-11 (seemingly behaving badly
diff --git a/sources b/sources
index 014662f..6938269 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b4d02a885d675cd4dbfd5455a4e892a1  jd-2.2.0-svn2631_trunk.tgz
+8169a698c333041f1cab91d3dd9807b3  jd-2.1.1-beta090128.tgz