rpms/alexandria/devel alexandria-0.6.3-library-utf8-string.patch, 1.4, 1.5 alexandria.spec, 1.22, 1.23
Mamoru Tasaka
mtasaka at fedoraproject.org
Thu Feb 26 19:44:06 UTC 2009
Author: mtasaka
Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22911
Modified Files:
alexandria-0.6.3-library-utf8-string.patch alexandria.spec
Log Message:
* Fri Feb 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-11
- library UTF-8 patch update
alexandria-0.6.3-library-utf8-string.patch:
Index: alexandria-0.6.3-library-utf8-string.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria-0.6.3-library-utf8-string.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alexandria-0.6.3-library-utf8-string.patch 26 Feb 2009 02:07:14 -0000 1.4
+++ alexandria-0.6.3-library-utf8-string.patch 26 Feb 2009 19:44:05 -0000 1.5
@@ -1,21 +1,24 @@
Index: lib/alexandria/ui/sidepane.rb
===================================================================
--- lib/alexandria/ui/sidepane.rb (revision 1012)
-+++ lib/alexandria/ui/sidepane.rb (working copy)
-@@ -19,18 +19,39 @@
++++ lib/alexandria/ui/sidepane.rb (revision 1021)
+@@ -19,18 +19,42 @@
x and x.name != @parent.selected_library.name
end
- def contains_illegal_character new_text
- /([^\w\s'"()&?!:;.\-])/.match(new_text)
+ # if new_text is invalid utf-8, returns true
-+ # if new_text contains disallowed char (/), returns a MatchData object
++ # if new_text contains disallowed char (/ or initial .), returns a MatchData object
+ # otherwise returns nil
+ def contains_illegal_character(new_text)
+ begin
+ new_text.unpack("U*") # attempt to unpack as UTF-8 characters
-+ match = /(\/)/.match(new_text)
-+ # only forbid / character (since Library names become dir names)
++ match = /(^\.|\/)/.match(new_text)
++ # forbid / character (since Library names become dir names)
++ # also no initial . since that hides the Library (hidden file)
++ # forbidding an initial dot also disallows "." and ".."
++ # which are of course pre-existing directories.
+ return match
+ rescue Exception => ex
+ log.warn { "New library name not valid UTF-8: #{ex.message}" }
Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- alexandria.spec 26 Feb 2009 01:58:31 -0000 1.22
+++ alexandria.spec 26 Feb 2009 19:44:05 -0000 1.23
@@ -5,7 +5,7 @@
%define majorver 0.6.3
%undefine minorver
-%define fedorarel 10
+%define fedorarel 11
%define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
@@ -193,6 +193,9 @@
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%changelog
+* Fri Feb 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-11
+- library UTF-8 patch update
+
* Thu Feb 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-10
- Use upstreamed patch for UTF-8 strings issue
More information about the fedora-extras-commits
mailing list