From cc136c9217a9968524006ac9b49a6a2b49101e82 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Aug 17 2009 18:07:39 +0000
Subject: - Use Debian 0.3.6.2 (Masayuki Hatta <mhatta@debian.org>)

- Drop 64 bits patches, remove some unneeded hacks

---

diff --git a/.cvsignore b/.cvsignore
index ab6b091..6e462ab 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ebview-0.3.6.tar.gz
+ebview_0.3.6.2.orig.tar.gz
diff --git a/ebview.spec b/ebview.spec
index 25d039b..8293b0b 100644
--- a/ebview.spec
+++ b/ebview.spec
@@ -1,14 +1,18 @@
 Name:		ebview
-Version:	0.3.6
-Release:	7%{?dist}
+Version:	0.3.6.2
+Release:	1%{?dist}
 Summary:	EPWING CD-ROM dictionary viewer
 
 Group:		Applications/Text      
 License:	GPLv2+
+%if 0
 URL:		http://ebview.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+%else
+URL:		http://packages.qa.debian.org/e/ebview.html
+Source0:	http://ftp.de.debian.org/debian/pool/main/e/ebview/ebview_%{version}.orig.tar.gz
+%endif
 Source1:	%{name}.desktop
-Patch0:		ebview-0.3.6-64bits-from-suse.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	eb-devel
@@ -16,18 +20,13 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gtk2-devel
 
-%if 0%{?fedora} >= 10
 Requires:	VLGothic-fonts
-%else
-Requires:	fonts-japanese
-%endif
 
 %description
 EBView is a EPWING dictionary browser.
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bits
 
 # Fix up permission
 find . -type f -exec %{__chmod} 0644 {} ';'
@@ -42,14 +41,6 @@ find . -type f -exec %{__chmod} 0644 {} ';'
 	-e 's|Kochi |Sazanami |' \
 	src/preference.c
 
-# GTK deprecated option
-for f in \
-	src/ebview.c \
-	src/defs.h \
-	; do
-	%{__sed} -i.gtk_deprecated -e '/GTK_DISABLE_DEPRECATED/d' $f
-done
-
 # encodings
 iconv -f EUCJP -t UTF-8 README > README.tmp && \
 	( touch -r README README.tmp ; %{__mv} -f README.tmp README )
@@ -69,8 +60,6 @@ iconv -f ISO-8859-1 -t UTF-8 doc/en/index.html > doc/en/index.html.tmp && \
 	%{__rm} -f doc/en/index.html.tmp
 
 %build
-export LDFLAGS="`pkg-config --libs pangox`"
-
 %configure \
 	--with-eb-conf=%{_libdir}/eb.conf
 %{__make} %{?_smp_mflags}
@@ -114,6 +103,10 @@ desktop-file-install \
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Tue Aug 18 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.3.6.2-1
+- Use Debian 0.3.6.2 (Masayuki Hatta <mhatta@debian.org>)
+- Drop 64 bits patches, remove some unneeded hacks
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.3.6-7
 - F-12: Mass rebuild
 
diff --git a/sources b/sources
index c36e825..737aa66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-223f679a6b54bc32cb6d44f54909d049  ebview-0.3.6.tar.gz
+dbfe4d338ff1d846084c46ac9dc47d73  ebview_0.3.6.2.orig.tar.gz