diff --git a/.cvsignore b/.cvsignore index c114ffe..105a81a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alexandria-0.6.2.tar.gz +alexandria-0.6.3.tar.gz diff --git a/alexandria-0.6.2-rh427070.patch b/alexandria-0.6.2-rh427070.patch deleted file mode 100644 index 4a01783..0000000 --- a/alexandria-0.6.2-rh427070.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- alexandria-0.6.2/lib/alexandria/ui/completion_models.rb.orig 2007-12-20 05:50:47.000000000 +0900 -+++ alexandria-0.6.2/lib/alexandria/ui/completion_models.rb 2007-12-31 10:40:47.000000000 +0900 -@@ -74,6 +74,9 @@ - rescue Revolution::RevolutionException => e - Alexandria::log.warn { e.message } - EVOLUTION_CONTACTS = [] -+rescue ArgumentError => e -+ Alexandria::log.warn { e.message } -+ EVOLUTION_CONTACTS = [] - end - - module Alexandria diff --git a/alexandria.spec b/alexandria.spec index 5ecdb2d..36ca4a4 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -1,11 +1,11 @@ %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 -%define repoid 29501 +%define repoid 32739 -%define majorver 0.6.2 +%define majorver 0.6.3 %undefine minorver -%define fedorarel 2 +%define fedorarel 1 %define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver} @@ -19,7 +19,6 @@ Group: Applications/Productivity License: GPLv2+ URL: http://alexandria.rubyforge.org/ Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz -Patch0: alexandria-0.6.2-rh427070.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -64,7 +63,6 @@ Alexandria is a GNOME application to help you manage your book collection. %prep %setup -q -n %{name}-%{majorver}%{?minorver} -%patch0 -p1 -b .rh427070 %build rake build @@ -110,6 +108,10 @@ done # 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/ + %find_lang %{name} %clean @@ -175,6 +177,10 @@ exit 0 %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Sat Feb 23 2008 Mamoru Tasaka - 0.6.3-1 +- 0.6.3 +- One patch removed (applied by upstream) + * Mon Dec 31 2007 Mamoru Tasaka - 0.6.2-2 - Trial workaround patch for bug 427070 diff --git a/sources b/sources index 8aae8a6..9e9625e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -716306f8bc15beb97f0d24d64e52a82f alexandria-0.6.2.tar.gz +e0c2d5ebcac02077372094c17c31b053 alexandria-0.6.3.tar.gz