From 79794e9229c3ccbb9d9f417193bae65ce19d2a14 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Jan 06 2020 01:16:23 +0000 Subject: WIP: once push --- diff --git a/alexandria-0.7.4-yaml-unescape.patch b/alexandria-0.7.4-yaml-unescape.patch index 94f825e..7ddd43a 100644 --- a/alexandria-0.7.4-yaml-unescape.patch +++ b/alexandria-0.7.4-yaml-unescape.patch @@ -13,7 +13,7 @@ + + if book_valid_p + begin -+ book = self.regularize_book_from_yaml(test[1]) ++ book = regularize_book_from_yaml(test[1]) + rescue Psych::SyntaxError => e + log.warn "Book file #{test[1]} could not be parsed" + book_valid_p = false diff --git a/alexandria.spec b/alexandria.spec index f26fdc7..0121322 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -2,7 +2,7 @@ %undefine minorver %undefine ifpre -%define fedorarel 0.100.WIP +%define fedorarel 0.103.WIP %define rel %{?ifpre:0.}%{fedorarel}%{?minorver:.%minorver} @@ -122,14 +122,14 @@ Requires: rubygem(glib2) # Requires: rubygem(goocanvas) # The above needs more explicit # With 0.7.4 this dependency changed, goocanvas2 + introspection -%if 0%{?fedora} >= 20 -Requires: rubygem-goocanvas1 +%if 0%{?fedora} >= 32 +Requires: rubygem(goocanvas) %else -Requires: rubygem-goocanvas +Requires: rubygem-goocanvas1 %endif -Requires: rubygem(gstreamer) # Uses syck (bug 922217) -%if 0%{?fedora} >= 19 +# Once kill this with 0.7.4 +%if 0%{?fedora} < 32 Requires: rubygem(syck) %endif @@ -173,6 +173,10 @@ Alexandria is a GNOME application to help you manage your book collection. # Workaround for directory hierarchy ln -sf share data +# Use system wide directory for datadir +sed -i lib/alexandria/config.rb \ + -e "\@^[ \t]*SHARE_DIR@s|SHARE_DIR[ \t]*=.*|SHARE_DIR = '/usr/share'|" + %build rake build --trace