From 23669a42b16a4c3661bdec7223e5ee6e254b3ff1 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: May 08 2010 09:29:21 +0000
Subject: 0.6.6 beta2 released


---

diff --git a/.cvsignore b/.cvsignore
index b8a83fa..a1532a5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-alexandria-0.6.6-beta1.tar.gz
+alexandria-0.6.6-beta2.tar.gz
diff --git a/alexandria.spec b/alexandria.spec
index b4e38e3..3a50b27 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -1,11 +1,11 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define		rubyabi		1.8
-%define		repoid		68098
+%define		repoid		70623
 
 %define		majorver	0.6.6
-%define		minorver	beta1
+%define		minorver	beta2
 
-%define		fedorarel	3
+%define		fedorarel	5
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -28,9 +28,10 @@ BuildArch:	noarch
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	rubygem(rake)
 BuildRequires:	desktop-file-utils
+# For gconf related macros
+BuildRequires:	GConf2
 BuildRequires:	gettext
 BuildRequires:	intltool
-BuildRequires:	scrollkeeper
 
 Requires:	ruby
 Requires:	ruby(abi) = %{rubyabi}
@@ -45,7 +46,8 @@ Requires:	ruby(htmlentities)
 Requires:	ruby(imagesize)
 # Dependency removed on 0.6.4b1
 #Requires:	ruby(mechanize)
-Requires:	ruby(revolution)
+# Kill ruby(revolution) dependency
+#Requires:	ruby(revolution)
 
 # ruby(zoom) -> rubygem(zoom) switch
 #Requires:	ruby(zoom)
@@ -58,8 +60,6 @@ Requires:	ruby(glib2)
 Requires:	ruby(gnome2)
 Requires:	ruby(libglade2)
 
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
 Requires(pre):		GConf2
 Requires(post):		GConf2
 Requires(preun):	GConf2
@@ -76,6 +76,11 @@ Alexandria is a GNOME application to help you manage your book collection.
 	-e "s|\(DISPLAY_VERSION = \).*$|\1'%{version}-%{release}'|" \
 	Rakefile
 
+# Make msgfmt verbose
+%{__sed} -i.msgfmt \
+	 -e '/system/s|msgfmt |msgfmt --statistics |' \
+	util/rake/gettextgenerate.rb
+
 %build
 rake build
 
@@ -111,33 +116,20 @@ desktop-file-install \
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %pre
-if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null
-fi
+%gconf_schema_prepare %{name}
 exit 0
 
 %post
 touch --no-create %{_datadir}/icons/hicolor/
+%gconf_schema_upgrade %{name}
 
-%{_bindir}/scrollkeeper-update -q -o %{_datadir}/omf/%{name}
-
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
 exit 0
 
 %preun
-if [ "$1" -eq 0 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
-fi
+%gconf_schema_remove %{name}
 exit 0
 
 %postun
-%{_bindir}/scrollkeeper-update -q
 [ "$1" -eq 0 ] || exit 0
 
 touch --no-create %{_datadir}/icons/hicolor/
@@ -152,7 +144,7 @@ exit 0
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
-%doc ChangeLog 
+%doc ChangeLog*
 %doc INSTALL
 %doc README*
 %doc TODO
@@ -176,6 +168,13 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sat May  8 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.6-0.5.beta2
+- Try 0.6.6 beta2
+
+* Sat May  8 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.6-0.4.svn1138_trunk
+- Try rev 1138, supporting Duban provider
+- Scriptlets update
+
 * Wed Dec 23 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.6-0.3.beta1
 - Try 0.6.6 beta1
 
diff --git a/sources b/sources
index 49bf8e4..d312684 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df5a51687f798328d61eb521187dca9a  alexandria-0.6.6-beta1.tar.gz
+0a707796c2564e6f72bdf47b0cd57187  alexandria-0.6.6-beta2.tar.gz