[alexandria] - Update from trunk to try the following fixes - Hang with importing bad ISDN number (alexandria-B

[Mamoru Tasaka]

commit 65f4d779b3113077e0ad26aa87d2b599fb64d455
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Mon Aug 16 00:59:32 2010 +0900

    - Update from trunk to try the following fixes
      - Hang with importing bad ISDN number (alexandria-Bugs-25348)
      - UTF-8 issue on WorldCat provider (alexandria-Bugs-28437)
      - Other fixes on providers

 alexandria.spec |   19 ++++++++++++++-----
 sources         |    2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/alexandria.spec b/alexandria.spec
index e4bb41c..f108378 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -3,10 +3,11 @@
 %define		repoid		71308
 
 %define		majorver	0.6.6
-%undefine		minorver	
+%define		minorver	svn1154_trunk
+%undefine		ifpre	
 
-%define		fedorarel	1
-%define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
+%define		fedorarel	2
+%define		rel		%{?ifpre:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
 
@@ -22,7 +23,8 @@ Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?mi
 # Patches discussing with the upstream
 # 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
+# Check if this issue is fixed in rev 1154
+#Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
 # Trial fix for crash when importing a book with isdn
 # With alexandria-0.6.6, the fix for this issue is still incomplete
 # ref: alexandria-BUgs-28263
@@ -74,7 +76,8 @@ Alexandria is a GNOME application to help you manage your book collection.
 
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver:-%{?minorver}}
-%patch2 -p0 -b .up25348
+# Check if patch2 issue is fixed in rev 1154
+#%%patch2 -p0 -b .up25348
 %patch3 -p1 -b .up28263
 
 # Embed Fedora EVR
@@ -174,6 +177,12 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sun Aug 16 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-2.svn1154
+- Update from trunk to try the following fixes
+  - Hang with importing bad ISDN number (alexandria-Bugs-25348)
+  - UTF-8 issue on WorldCat provider (alexandria-Bugs-28437)
+  - Other fixes on providers
+
 * Tue Jun 22 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-1
 - Update to 0.6.6
 - Still apply Patch3 (it seems isdn segv fix isn't complete)
diff --git a/sources b/sources
index 4063af7..4ddc0ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76bc7054b19e033c1448346fa3232d64  alexandria-0.6.6.tar.gz
+3191dab651f76b8dc90f422a19c00997  alexandria-0.6.6-svn1154_trunk.tar.gz