rpms/alexandria/devel .cvsignore, 1.2, 1.3 alexandria.spec, 1.2, 1.3 sources, 1.2, 1.3

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19264/devel

Modified Files:
	.cvsignore alexandria.spec sources 
Log Message:
* Fri Nov  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.2-0.1.b1
- Try 0.6.2 beta 1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 May 2007 18:37:27 -0000	1.2
+++ .cvsignore	2 Nov 2007 14:54:33 -0000	1.3
@@ -1 +1 @@
-alexandria-0.6.1.tar.gz
+alexandria-0.6.2b1.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alexandria.spec	3 Aug 2007 11:20:39 -0000	1.2
+++ alexandria.spec	2 Nov 2007 14:54:33 -0000	1.3
@@ -1,21 +1,29 @@
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define		rubyabi		1.8
+%define		repoid		26258
+
+%define		majorver	0.6.2
+%define		minorver	b1
+
+%define		fedorarel	1
+%define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
+
+
 
 Name:		alexandria
-Version:	0.6.1
-Release:	3%{?dist}.1
+Version:	%{majorver}
+Release:	%{rel}%{?dist}
 Summary:	Book collection manager
 
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
-Source0:	http://rubyforge.org/frs/download.php/6308/%{name}-%{version}.tar.gz
+Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
-BuildRequires:	ruby
-BuildRequires:	ruby-devel
 BuildRequires:	ruby(abi) = %{rubyabi}
+BuildRequires:	rubygem(rake)
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	intltool
@@ -46,11 +54,10 @@
 Alexandria is a GNOME application to help you manage your book collection.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{majorver}%{?minorver}
 
 %build
-ruby install.rb config
-ruby install.rb setup
+rake build
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -58,17 +65,21 @@
 # disable scrollkeeper
 %{__mkdir} tmpbin
 %{__ln_s} -f /bin/true tmpbin/scrollkeeper-update
+%{__ln_s} -f /bin/true tmpbin/gconftool-2
+%{__ln_s} -f /bin/true tmpbin/gtk-update-icon-cache
+
 export PATH="$(pwd)/tmpbin:$PATH"
+#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+export PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-ruby install.rb install --prefix=$RPM_BUILD_ROOT
+rake install
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
 desktop-file-install \
 	--vendor fedora \
-	--remove-category Application \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-	%{name}.desktop
+	--delete-original \
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 # create 64x64, 128x128 icon
 for s in 64 128 ; do
@@ -82,6 +93,9 @@
 %{__install} -c -p -m 0644 schemas/%{name}.schemas \
 	$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
 
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/locale/
+%{__cp} -pr data/locale/* $RPM_BUILD_ROOT%{_datadir}/locale/
+
 %find_lang %{name}
 
 %clean
@@ -91,35 +105,43 @@
 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 || :
+		%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null
 fi
+exit 0
 
 %post
-touch --no-create %{_datadir}/icons/hicolor/ || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor/
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 
-%{_bindir}/scrollkeeper-update -q -o %{_datadir}/omf/%{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 || :
+	%{_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 || :
+		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
 fi
+exit 0
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor/ || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor/
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 
-%{_bindir}/scrollkeeper-update -q || :
+%{_bindir}/scrollkeeper-update -q
+exit 0
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc COPYING
+%doc ChangeLog 
+%doc README-BETA
+%doc TODO
+
 %{_bindir}/%{name}
 %{ruby_sitelib}/%{name}.rb
 %{ruby_sitelib}/%{name}/
@@ -131,11 +153,11 @@
 %{_datadir}/omf/%{name}/
 
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
-* Fri Aug  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.1-3.dist.1
-- License update
+* Fri Nov  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.2-0.1.b1
+- Try 0.6.2 beta 1
 
 * Fri May 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.1-3
 - This time completely disable scrollkeeper-update


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 May 2007 18:37:27 -0000	1.2
+++ sources	2 Nov 2007 14:54:33 -0000	1.3
@@ -1 +1 @@
-c35f979c336bda0efee779adb56f0b04  alexandria-0.6.1.tar.gz
+c68354cf920e085043153ae60b9adf2d  alexandria-0.6.2b1.tar.gz