From 4b7fe5dead5bebaff51c5c93ea28f46dfe56e831 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Dec 20 2007 07:41:28 +0000
Subject: - 0.6.2

- Two patches for 0.6.2b2 are removed.

---

diff --git a/.cvsignore b/.cvsignore
index 0603f3b..c114ffe 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-alexandria-0.6.2b2.tar.gz
+alexandria-0.6.2.tar.gz
diff --git a/alexandria-0.6.2b2-crash-when-no-yelp.patch b/alexandria-0.6.2b2-crash-when-no-yelp.patch
deleted file mode 100644
index 170b874..0000000
--- a/alexandria-0.6.2b2-crash-when-no-yelp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- alexandria-0.6.2b2/lib/alexandria/ui/main_app.rb.noyelp	2007-10-26 00:16:17.000000000 +0900
-+++ alexandria-0.6.2b2/lib/alexandria/ui/main_app.rb	2007-12-16 18:05:07.000000000 +0900
-@@ -290,7 +290,9 @@
- 
-       def display_help
-         Gnome::Help.display('alexandria',
--                            nil) rescue ErrorDialog.new(@main_app,
-+                            nil) 
-+	rescue => e 
-+		ErrorDialog.new(@main_app,
-                             e.message)
-       end
- 
diff --git a/alexandria-0.6.2b2-dont_fail_on_no_evolution.patch b/alexandria-0.6.2b2-dont_fail_on_no_evolution.patch
deleted file mode 100644
index 3f25c00..0000000
--- a/alexandria-0.6.2b2-dont_fail_on_no_evolution.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- alexandria-0.6.2b2/lib/alexandria/ui/completion_models.rb.noevolution	2007-08-23 04:24:56.000000000 +0900
-+++ alexandria-0.6.2b2/lib/alexandria/ui/completion_models.rb	2007-12-16 15:44:13.000000000 +0900
-@@ -71,6 +71,8 @@
-     end
- rescue LoadError
-     EVOLUTION_CONTACTS = []
-+rescue Revolution::RevolutionException
-+    EVOLUTION_CONTACTS = []
- end
- 
- module Alexandria
diff --git a/alexandria.spec b/alexandria.spec
index 5bf71e1..c4fd8f9 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -1,11 +1,11 @@
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define		rubyabi		1.8
-%define		repoid		26258
+%define		repoid		29501
 
 %define		majorver	0.6.2
-%define		minorver	b2
+%undefine		minorver	
 
-%define		fedorarel	6
+%define		fedorarel	1
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,8 +19,6 @@ Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-Patch0:		alexandria-0.6.2b2-dont_fail_on_no_evolution.patch
-Patch1:		alexandria-0.6.2b2-crash-when-no-yelp.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -65,8 +63,6 @@ Alexandria is a GNOME application to help you manage your book collection.
 
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
-%patch0 -p1 -b .noevolution
-%patch1 -p1 -b .noyelp
 
 %build
 rake build
@@ -109,6 +105,9 @@ done
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/locale/
 %{__cp} -pr data/locale/* $RPM_BUILD_ROOT%{_datadir}/locale/
 
+# Clean up documents
+%{__rm} -rf $RPM_BUILD_ROOT%{_defaultdocdir}
+
 %find_lang %{name}
 
 %clean
@@ -153,8 +152,12 @@ exit 0
 %doc COPYING
 %doc ChangeLog 
 %doc INSTALL
-%doc README_BETA*
+%doc README*
 %doc TODO
+%doc doc/[A-Z]*
+%doc doc/cuecat_support.rdoc
+
+%{_mandir}/man1/%{name}.1*
 
 %{_bindir}/%{name}
 %{ruby_sitelib}/%{name}.rb
@@ -170,6 +173,10 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Dec 20 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.2-1
+- 0.6.2
+- Two patches for 0.6.2b2 are removed.
+
 * Sun Dec 16 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.2-0.6.b2
 - Pass exception when user don't use evolution for mailer.
 - Fix crash when yelp is not installed.
diff --git a/sources b/sources
index c7d8670..8aae8a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f70c0e57bd352de72f7b99f82887807f  alexandria-0.6.2b2.tar.gz
+716306f8bc15beb97f0d24d64e52a82f  alexandria-0.6.2.tar.gz