rpms/alexandria/F-11 .cvsignore, 1.11, 1.12 alexandria.spec, 1.41, 1.42 sources, 1.11, 1.12

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29694/F-11

Modified Files:
	.cvsignore alexandria.spec sources 
Log Message:
* 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	16 Dec 2009 18:58:41 -0000	1.11
+++ .cvsignore	22 Dec 2009 16:07:38 -0000	1.12
@@ -1 +1 @@
-alexandria_0.6.5+0.6.6alpha.orig.tar.gz
+alexandria-0.6.6-beta1.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- alexandria.spec	16 Dec 2009 18:58:41 -0000	1.41
+++ alexandria.spec	22 Dec 2009 16:07:38 -0000	1.42
@@ -1,12 +1,11 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define		rubyabi		1.8
-%define		repoid		62178
+%define		repoid		68098
 
-%define		prevver	0.6.5
 %define		majorver	0.6.6
-%define		minorver	alpha
+%define		minorver	beta1
 
-%define		fedorarel	1
+%define		fedorarel	3
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,14 +18,10 @@ Summary:	Book collection manager
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
-#Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-Source0:	https://launchpad.net/~alexandria-team/+archive/ppa/+files/%{name}_%{prevver}+%{version}%{?minorver}.orig.tar.gz
+Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver:-%{minorver}}.tar.gz
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
-# Add install_prefix
-# Will ask upstream
-Patch10:	alexandria-0.6.6alpha1-installprefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -37,8 +32,6 @@ BuildRequires:	gettext
 BuildRequires:	intltool
 BuildRequires:	scrollkeeper
 
-BuildRequires:	ImageMagick
-
 Requires:	ruby
 Requires:	ruby(abi) = %{rubyabi}
 
@@ -75,10 +68,8 @@ Requires(preun):	GConf2
 Alexandria is a GNOME application to help you manage your book collection.
 
 %prep
-#%%setup -q -n %{name}-%{majorver}%{?minorver}
-%setup -q -n %{name}-%{prevver}+%{majorver}%{?minorver}
+%setup -q -n %{name}-%{majorver}%{?minorver:-%{?minorver}}
 %patch2 -p0 -b .up25348
-%patch10 -p1 -b .prefix
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -91,44 +82,22 @@ rake build
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# disable scrollkeeper
-%{__rm} -rf tmpbin
-%{__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 RUBYLIBDIR=%{ruby_sitelib}
-#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
-rake install \
-	install_prefix=$RPM_BUILD_ROOT
+rake install_package_staging \
+	DESTDIR=$RPM_BUILD_ROOT \
+	RUBYLIBDIR=%{ruby_sitelib}
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
 desktop-file-install \
 	--vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
 	--delete-original \
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# create 64x64, 128x128 icon
-for s in 64 128 ; do
-	%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/
-	convert -scale ${s}x${s} \
-		data/alexandria/icons/%{name}.png \
-		$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png
-done
-
 # Move gconf files to where Fedora uses
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mv} \
 	$RPM_BUILD_ROOT%{_datadir}/gconf/ \
 	$RPM_BUILD_ROOT%{_sysconfdir}/
 
-# Clean up documents
-%{__rm} -rf $RPM_BUILD_ROOT%{_defaultdocdir}
-
 # %%{_datadir}/menu seems to be used for debian
 # Removing for Fedora
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/menu/
@@ -207,6 +176,14 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* 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
+
+* Fri Dec 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.2.alpha
+- Use "rake install_package_staging" as explained by the upstream
+  (in alexandria-Bugs-27578)
+- Kill the creation of 64/128 icons as scalable svg is already installed
+
 * Thu Dec 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.1.alpha
 - Try 0.6.6 alpha
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	16 Dec 2009 18:58:41 -0000	1.11
+++ sources	22 Dec 2009 16:07:38 -0000	1.12
@@ -1 +1 @@
-3ef83d89d92b4160f78a42e83c8e3890  alexandria_0.6.5+0.6.6alpha.orig.tar.gz
+df5a51687f798328d61eb521187dca9a  alexandria-0.6.6-beta1.tar.gz