[alexandria] Update to 0.6.8 Dependency for old ruby-gnome2 stuff is removed Make always require rubygems Patch t
Mamoru Tasaka
mtasaka at fedoraproject.org
Sat Dec 24 18:03:19 UTC 2011
commit c52fe22ea8d295bca9b00fd878215552c4967c13
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Sun Dec 25 03:03:14 2011 +0900
Update to 0.6.8
Dependency for old ruby-gnome2 stuff is removed
Make always require rubygems
Patch to support usage without rubygem(gst)
.gitignore | 1 +
alexandria-0.6.8-always-require-rubygems.patch | 10 ++++
alexandria-0.6.8-nogst-support.patch | 38 +++++++++++++++
alexandria-0.6.8-set_status_label.patch | 11 +++++
alexandria.spec | 58 ++++++++++++++++-------
clog | 5 ++-
sources | 2 +-
7 files changed, 105 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7698b22..d6155df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
alexandria-0.6.6.tar.gz
/alexandria-0.6.6-svn1154_trunk.tar.gz
/alexandria-0.6.7.tar.gz
+/alexandria-0.6.8.tar.gz
diff --git a/alexandria-0.6.8-always-require-rubygems.patch b/alexandria-0.6.8-always-require-rubygems.patch
new file mode 100644
index 0000000..9ae8525
--- /dev/null
+++ b/alexandria-0.6.8-always-require-rubygems.patch
@@ -0,0 +1,10 @@
+--- alexandria-0.6.8/bin/alexandria.gem 2009-12-13 05:58:08.000000000 +0900
++++ alexandria-0.6.8/bin/alexandria 2011-12-25 02:37:12.000000000 +0900
+@@ -2,6 +2,7 @@
+
+ $KCODE = 'U'
+
++require 'rubygems'
+ begin
+ require 'gettext'
+ rescue LoadError
diff --git a/alexandria-0.6.8-nogst-support.patch b/alexandria-0.6.8-nogst-support.patch
new file mode 100644
index 0000000..49104b4
--- /dev/null
+++ b/alexandria-0.6.8-nogst-support.patch
@@ -0,0 +1,38 @@
+--- alexandria-0.6.8/lib/alexandria/ui/dialogs/acquire_dialog.rb.nogst 2011-11-16 02:37:09.000000000 +0900
++++ alexandria-0.6.8/lib/alexandria/ui/dialogs/acquire_dialog.rb 2011-12-25 02:22:12.000000000 +0900
+@@ -20,7 +20,18 @@
+ require 'alexandria/scanners/cuecat'
+ require 'alexandria/scanners/keyboard'
+
+-require 'alexandria/ui/sound'
++support_sound = true
++begin
++ require 'gst'
++rescue LoadError => e
++ Alexandria::log.warn { e.message }
++ Alexandria::log.warn { "Sound support is disabled" }
++ support_sound = false
++end
++
++if support_sound
++ require 'alexandria/ui/sound'
++end
+ require 'alexandria/ui/dialogs/barcode_animation'
+
+ module Alexandria
+@@ -556,6 +567,7 @@
+ end
+ end
+
++ return unless support_sound
+ # @sound_player = SoundEffectsPlayer.new
+ @sound_players = {}
+ @sound_players["scanning"] = SoundEffectsPlayer.new
+@@ -565,6 +577,7 @@
+ end
+
+ def play_sound(effect)
++ return unless support_sound
+ # HACK, do some thread waiting, if possible
+ puts "scanning sound : #{@prefs.play_scanning_sound}"
+ puts "scan sound: #{ @prefs.play_scan_sound}"
diff --git a/alexandria-0.6.8-set_status_label.patch b/alexandria-0.6.8-set_status_label.patch
new file mode 100644
index 0000000..55fbade
--- /dev/null
+++ b/alexandria-0.6.8-set_status_label.patch
@@ -0,0 +1,11 @@
+--- lib/alexandria/ui/dialogs/new_book_dialog.rb.orig
++++ lib/alexandria/ui/dialogs/new_book_dialog.rb
+@@ -574,7 +574,7 @@
+ log.debug { "update message : #{message}" }
+
+ # @parent.appbar.status = message
+- MainApp.instance.appbar.status = message # HACKish
++ MainApp.instance.ui_manager.set_status_label( message )
+ #false
+ end
+ end
diff --git a/alexandria.spec b/alexandria.spec
index 4a64418..b49100e 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -1,8 +1,8 @@
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%define rubyabi 1.8
-%define repoid 75476
+%define repoid 75529
-%define majorver 0.6.7
+%define majorver 0.6.8
%undefine minorver
%undefine ifpre
@@ -29,7 +29,16 @@ Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?mi
# With alexandria-0.6.6, the fix for this issue is still incomplete
# ref: alexandria-BUgs-28263
Patch3: alexandria-0.6.6-dont_use_thread_when_adding_file_by_isdn.patch
+# Fix crash when searching book
+# ref: alexandria-Bugs-29479 Patch by Tomoh K.
+Patch4: alexandria-0.6.8-set_status_label.patch
# Upstream patches
+# Patches not submitted to the upstream
+# Support when rubygem(gst) (gstreamer) is not installed
+# Note that rubygem-gstreamer is not yet in Fedora
+Patch10: alexandria-0.6.8-nogst-support.patch
+# Always require rubygems
+Patch11: alexandria-0.6.8-always-require-rubygems.patch
BuildArch: noarch
BuildRequires: ruby(abi) = %{rubyabi}
@@ -47,9 +56,9 @@ Requires: ruby(abi) = %{rubyabi}
# AWS v4 is supported by alexandria itself
# But hpricot is still needed
#Requires: ruby(amazon)
-Requires: ruby(gettext-package)
-Requires: ruby(hpricot)
-Requires: ruby(htmlentities)
+Requires: rubygem(gettext)
+Requires: rubygem(hpricot)
+Requires: rubygem(htmlentities)
Requires: ruby(imagesize)
# Dependency removed on 0.6.4b1
#Requires: ruby(mechanize)
@@ -59,13 +68,21 @@ Requires: ruby(imagesize)
# ruby(zoom) -> rubygem(zoom) switch
#Requires: ruby(zoom)
Requires: rubygem(zoom) >= 0.3.0
-Requires: ruby(marc)
-
-Requires: ruby(gconf2)
-Requires: ruby(gdkpixbuf2)
-Requires: ruby(glib2)
-Requires: ruby(gnome2)
-Requires: ruby(libglade2)
+Requires: rubygem(marc)
+
+# Killed on 0.6.8
+#Requires: ruby(gconf2)
+# Explicitly
+Requires: GConf2
+Requires: rubygem(gdk_pixbuf2)
+Requires: rubygem(glib2)
+# Killed on 0.6.8
+#Requires: ruby(gnome2)
+#Requires: ruby(libglade2)
+# Added from 0.6.8
+Requires: rubygem(goocanvas)
+# Still not yet on Fedora
+# Requires: rubygem(gst)
Requires(pre): GConf2
Requires(post): GConf2
@@ -78,7 +95,10 @@ Alexandria is a GNOME application to help you manage your book collection.
%setup -q -n %{name}-%{majorver}%{?minorver:-%{?minorver}}
# Check if patch2 issue is fixed in rev 1154
#%%patch2 -p0 -b .up25348
-%patch3 -p1 -b .up28263
+%patch3 -p1 -b .up28263.isdn
+%patch4 -p0 -b .up29479.search
+%patch10 -p1 -b .nogst
+%patch11 -p1 -b .gem
# Embed Fedora EVR
%{__sed} -i.evr \
@@ -94,8 +114,6 @@ Alexandria is a GNOME application to help you manage your book collection.
rake build
%install
-%{__rm} -rf $RPM_BUILD_ROOT
-
rake install_package_staging \
DESTDIR=$RPM_BUILD_ROOT \
RUBYLIBDIR=%{ruby_sitelib}
@@ -118,12 +136,10 @@ desktop-file-install \
# Cleanups
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/%{name}.*
%find_lang %{name}
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
%pre
%gconf_schema_prepare %{name}
exit 0
@@ -177,6 +193,12 @@ exit 0
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%changelog
+* Sun Dec 25 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.6.8-1
+- Update to 0.6.8
+- Dependency for old ruby-gnome2 stuff is removed
+- Make always require rubygems
+- Patch to support usage without rubygem(gst)
+
* Sun Nov 27 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.6.7-1
- Update to 0.6.7
diff --git a/clog b/clog
index 69c56e3..91a7370 100644
--- a/clog
+++ b/clog
@@ -1 +1,4 @@
-Update to 0.6.7
+Update to 0.6.8
+Dependency for old ruby-gnome2 stuff is removed
+Make always require rubygems
+Patch to support usage without rubygem(gst)
diff --git a/sources b/sources
index 06f4410..3a30e5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb399ec7568f4829ce11ca1c5c49c958 alexandria-0.6.7.tar.gz
+6f3a88d363264bdf09f4eb2cd8af7967 alexandria-0.6.8.tar.gz
More information about the scm-commits
mailing list