rpms/alexandria/F-11 alexandria-0.6.6alpha1-installprefix.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 alexandria.spec, 1.40, 1.41 sources, 1.10, 1.11 alexandria-0.6.4.1-use-2args-bindtextdomain.patch, 1.1, NONE alexandria-0.6.5-WorldCat-results.patch, 1.1, NONE alexandria-0.6.5-crash-in-turkish.patch, 1.2, NONE alexandria-0.6.5-deastore-author-missing.patch, 1.1, NONE alexandria-0.6.5-glib_convert-syntax.patch, 1.2, NONE alexandria-0.6.5-search-result-sanity-check.patch, 1.2, NONE

Mamoru Tasaka mtasaka at fedoraproject.org
Wed Dec 16 18:58:41 UTC 2009


Author: mtasaka

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

Modified Files:
	.cvsignore alexandria.spec sources 
Added Files:
	alexandria-0.6.6alpha1-installprefix.patch 
Removed Files:
	alexandria-0.6.4.1-use-2args-bindtextdomain.patch 
	alexandria-0.6.5-WorldCat-results.patch 
	alexandria-0.6.5-crash-in-turkish.patch 
	alexandria-0.6.5-deastore-author-missing.patch 
	alexandria-0.6.5-glib_convert-syntax.patch 
	alexandria-0.6.5-search-result-sanity-check.patch 
Log Message:
* 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


alexandria-0.6.6alpha1-installprefix.patch:
 Rakefile |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE alexandria-0.6.6alpha1-installprefix.patch ---
--- alexandria-0.6.5+0.6.6alpha/Rakefile.prefix	2009-12-17 02:21:21.000000000 +0900
+++ alexandria-0.6.5+0.6.6alpha/Rakefile	2009-12-17 02:30:48.000000000 +0900
@@ -19,8 +19,9 @@
 
 stage_dir = ENV['DESTDIR'] || 'tmp'
 
+INSTALL_PREFIX = ENV['install_prefix']
 PROJECT='alexandria'
-PREFIX='/usr'
+PREFIX="#{INSTALL_PREFIX}/usr"
 SHARE = "#{PREFIX}/share"
 
 DATA_VERSION = '0.6.3'
@@ -41,7 +42,7 @@
 debinstall = FileInstallTask.new(:debian_install, stage_dir, true) do |i|
 
   i.install_exe('bin', 'bin/*', "#{PREFIX}/bin")
-  i.install('lib', 'lib/**/*.rb', i.rubylib)
+  i.install('lib', 'lib/**/*.rb', "#{INSTALL_PREFIX}" + i.rubylib)
 
   share_files = ['data/alexandria/**/*', 'data/gnome/**/*.*',
                  'data/locale/**/*.mo', 'data/omf/**/*.omf', 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	19 Aug 2009 22:13:59 -0000	1.10
+++ .cvsignore	16 Dec 2009 18:58:41 -0000	1.11
@@ -1 +1 @@
-alexandria-0.6.5.tar.gz
+alexandria_0.6.5+0.6.6alpha.orig.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- alexandria.spec	8 Sep 2009 03:33:30 -0000	1.40
+++ alexandria.spec	16 Dec 2009 18:58:41 -0000	1.41
@@ -2,42 +2,31 @@
 %define		rubyabi		1.8
 %define		repoid		62178
 
-%define		majorver	0.6.5
-%undefine		minorver	
+%define		prevver	0.6.5
+%define		majorver	0.6.6
+%define		minorver	alpha
 
-%define		fedorarel	7
+%define		fedorarel	1
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
 
 Name:		alexandria
 Version:	%{majorver}
-Release:	%{rel}%{?dist}.1
+Release:	%{rel}%{?dist}
 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:	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
 # 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
-# Clarify the usage of GLib.convert 
-# ref: alexandria-Bugs-26968
-Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
-# Add some sanity check for search results
-# ref: alexandria-Bugs-27000
-Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
-# Fix for DeaStore search engine where search result does not
-# contain Author item
-# ref: alexandria-Bugs-27000
-Patch5:		alexandria-0.6.5-deastore-author-missing.patch
-# Alexandria crashes in tr_TR.UTF-8 on startup
-# RH bug 520170, alexandria-Bugs-27015
-Patch6:		alexandria-0.6.5-crash-in-turkish.patch
-# Fix for parsing WorldCat search result
-# ref: alexandria-Bugs-27028
-Patch7:		alexandria-0.6.5-WorldCat-results.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
@@ -86,23 +75,19 @@ 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}-%{majorver}%{?minorver}
+%setup -q -n %{name}-%{prevver}+%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
-%patch3 -p0 -b .glib
-%patch4 -p0 -b .sanity
-%patch5 -p0 -b .deastore
-%patch6 -p0 -b .tr_TR
-%patch7 -p0 -b .worldcat
+%patch10 -p1 -b .prefix
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
-	-e "s|\(b.display_version = \).*$|\1'%{version}-%{release}'|" \
+	-e "s|\(DISPLAY_VERSION = \).*$|\1'%{version}-%{release}'|" \
 	Rakefile
 
 %build
 rake build
 
-
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -114,10 +99,11 @@ rake build
 %{__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
-export PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
-rake install
+rake install \
+	install_prefix=$RPM_BUILD_ROOT
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
 desktop-file-install \
@@ -134,12 +120,11 @@ for s in 64 128 ; do
 		$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png
 done
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
-%{__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/
+# 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}
@@ -148,6 +133,9 @@ done
 # Removing for Fedora
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/menu/
 
+# Cleanups
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %clean
@@ -219,6 +207,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* 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
+
 * Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Wrong patch of sanity check patch applied on F-10/11, fixing...
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	19 Aug 2009 22:13:59 -0000	1.10
+++ sources	16 Dec 2009 18:58:41 -0000	1.11
@@ -1 +1 @@
-9c8655f361e6a0c6f8cdc97f36bd2d0f  alexandria-0.6.5.tar.gz
+3ef83d89d92b4160f78a42e83c8e3890  alexandria_0.6.5+0.6.6alpha.orig.tar.gz


--- alexandria-0.6.4.1-use-2args-bindtextdomain.patch DELETED ---


--- alexandria-0.6.5-WorldCat-results.patch DELETED ---


--- alexandria-0.6.5-crash-in-turkish.patch DELETED ---


--- alexandria-0.6.5-deastore-author-missing.patch DELETED ---


--- alexandria-0.6.5-glib_convert-syntax.patch DELETED ---


--- alexandria-0.6.5-search-result-sanity-check.patch DELETED ---




More information about the fedora-extras-commits mailing list