rpms/alexandria/F-12 .cvsignore, 1.12, 1.13 alexandria.spec, 1.45, 1.46 sources, 1.12, 1.13

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2143/F-12

Modified Files:
	.cvsignore alexandria.spec sources 
Log Message:
* Sat May  8 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.4.svn1138_trunk
- Try rev 1138, supporting Duban provider
- Scriptlets update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	22 Dec 2009 16:07:38 -0000	1.12
+++ .cvsignore	7 May 2010 17:05:25 -0000	1.13
@@ -1 +1 @@
-alexandria-0.6.6-beta1.tar.gz
+alexandria-0.6.6-svn1138_trunk.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-12/alexandria.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- alexandria.spec	22 Dec 2009 16:07:39 -0000	1.45
+++ alexandria.spec	7 May 2010 17:05:25 -0000	1.46
@@ -3,9 +3,9 @@
 %define		repoid		68098
 
 %define		majorver	0.6.6
-%define		minorver	beta1
+%define		minorver	svn1138_trunk
 
-%define		fedorarel	3
+%define		fedorarel	4
 %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 hel
 	-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,10 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sat May  8 2010 Mamoru Tasaka <mtasaka at 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 at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.3.beta1
 - Try 0.6.6 beta1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	22 Dec 2009 16:07:39 -0000	1.12
+++ sources	7 May 2010 17:05:25 -0000	1.13
@@ -1 +1 @@
-df5a51687f798328d61eb521187dca9a  alexandria-0.6.6-beta1.tar.gz
+2422f923989ea956c9bbe836173876f7  alexandria-0.6.6-svn1138_trunk.tar.gz