diff --git a/.gitignore b/.gitignore index 6355f6e..d2acbdc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ screenruler-0.85.tar.gz /screenruler-0.9bzr27.tar.bz2 +/screenruler-0.9.6.tar.gz diff --git a/screenruler-ruby19.patch b/screenruler-ruby19.patch new file mode 100644 index 0000000..d04158a --- /dev/null +++ b/screenruler-ruby19.patch @@ -0,0 +1,26 @@ +--- ruler_window.rb 2011-11-15 08:38:44.000000000 -0500 ++++ ruler_window.rb.new 2013-06-10 16:23:36.109921296 -0400 +@@ -16,7 +16,8 @@ + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + ############################################################################### + +-require 'glade_window', 'ruler_popup_menu', 'canvas', 'unique_timeout' ++require 'glade_window', 'canvas', 'unique_timeout' ++require_relative 'ruler_popup_menu' + + Unit = Struct.new('Unit', :name, :tick_pattern, :units_per_pattern_repetition, :per_inch) + +--- screenruler.rb 2011-11-18 21:13:00.000000000 -0500 ++++ screenruler.rb.new 2013-06-10 16:39:27.076879708 -0400 +@@ -48,7 +48,10 @@ + puts _('Loading libraries...') + + require 'addons_ruby' # for multi-file 'require' +-require 'gtk2', 'settings', 'addons_gtk', 'ruler_window', 'preferences_window', 'help_window' ++require 'gtk2', 'settings', 'addons_gtk' ++require_relative 'ruler_window' ++require_relative 'preferences_window' ++require_relative 'help_window' + + ################################################################### + # Main diff --git a/screenruler.spec b/screenruler.spec index a6d6897..defbb8f 100644 --- a/screenruler.spec +++ b/screenruler.spec @@ -1,20 +1,17 @@ Summary: GNOME screen ruler Name: screenruler -Version: 0.90 -Release: 0.5.bzr27%{?dist} +Version: 0.96 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Engineering URL: https://launchpad.net/screenruler/ -#Source0: http://code.launchpad.net/screenruler/trunk/0.9/+download/%{name}-%{version}.tar.gz -# Bazaar revision 27 snapshot downloaded from launchpad with; -# 'bzr branch lp:screenruler on 2011-03-29' -Source0: screenruler-0.9bzr27.tar.bz2 +Source0: http://launchpad.net/screenruler/trunk/0.9.6/+download/%{name}-0.9.6.tar.gz Source1: screenruler.desktop +Patch0: screenruler-ruby19.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils Requires: ruby -Requires: ruby-libglade2 > 0.16.0-24 -Requires: ruby-gconf2 +Requires: rubygem-gtk2 rubygem-cairo rubygem-gettext Obsoletes: gruler < 0.85 Provides: gruler = %{version}-%{release} @@ -27,7 +24,8 @@ measurement in 6 different metrics: pixels, centimeters, inches, picas, points, and as a percentage of the ruler’s length. %prep -%setup -q -n %{name}-0.9bzr27 +%setup -q -n %{name} +%patch0 -p0 -b ruby19 %build @@ -50,7 +48,7 @@ mkdir -p %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}%{_datadir}/pixmaps/ cp -p screenruler %{buildroot}%{_bindir}/ cp -p screenruler-icon*.png %{buildroot}%{_datadir}/pixmaps/ -cp -pr utils *.rb screenruler*.* %{buildroot}%{_datadir}/%{name}/ +cp -pr utils *.rb screenruler*.* *.glade %{buildroot}%{_datadir}/%{name}/ cd %{buildroot}%{_datadir}/pixmaps ln -s ./screenruler-icon-32x32.png screenruler-icon.png @@ -73,6 +71,10 @@ rm -rf %{buildroot} %{_datadir}/applications/*.desktop %changelog +* Mon Jun 10 2013 Deji Akingunola - 0.96-1 +- Update to the latest upstream release +- Patch to wirk with ruby-1.9 (Russell Harrison, BZ #831501) + * Mon Feb 25 2013 Toshio Kuratomi - 0.90-0.5.bzr27 - Remove --vendor from desktop-file-install for F19+ https://fedorahosted.org/fesco/ticket/1077 diff --git a/sources b/sources index 297420f..f7ee019 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bdeb14f5576b3654373a6d4e7d19e50f screenruler-0.9bzr27.tar.bz2 +0caefe6835501beae8daffe2a8069e54 screenruler-0.9.6.tar.gz