[jpilot] - resolves: #667473 fix the utf encoding
Ivana Varekova
varekova at fedoraproject.org
Tue Jan 25 13:58:54 UTC 2011
commit f8813e8b6fbe304a81cd89a5fd8f40381dae5633
Author: Ivana Hutarova Varekova <varekova at redhat.com>
Date: Tue Jan 25 16:00:07 2011 +0100
- resolves: #667473
fix the utf encoding
jpilot-1.8.0-utf.patch | 119 ++++++++++++++++++++++++++++++++++++++++++++++++
jpilot.spec | 15 ++++--
2 files changed, 129 insertions(+), 5 deletions(-)
---
diff --git a/jpilot-1.8.0-utf.patch b/jpilot-1.8.0-utf.patch
new file mode 100644
index 0000000..0c884c9
--- /dev/null
+++ b/jpilot-1.8.0-utf.patch
@@ -0,0 +1,119 @@
+diff -up jpilot-1.8.0/empty/Makefile.am.pom jpilot-1.8.0/empty/Makefile.am
+--- jpilot-1.8.0/empty/Makefile.am.pom 2009-08-30 15:42:38.000000000 +0200
++++ jpilot-1.8.0/empty/Makefile.am 2011-01-25 15:39:10.000000000 +0100
+@@ -9,7 +9,7 @@ pdb_DATA = DatebookDB.pdb \
+ ContactsDB-PAdd.pdb \
+ ToDoDB.pdb \
+ TasksDB-PTod.pdb \
+- MañanaDB.pdb \
++ MañanaDB.pdb \
+ MemoDB.pdb \
+ MemosDB-PMem.pdb \
+ Memo32DB.pdb \
+diff -up jpilot-1.8.0/empty/Makefile.in.pom jpilot-1.8.0/empty/Makefile.in
+--- jpilot-1.8.0/empty/Makefile.in.pom 2010-03-01 05:05:21.000000000 +0100
++++ jpilot-1.8.0/empty/Makefile.in 2011-01-25 15:39:05.000000000 +0100
+@@ -233,7 +233,7 @@ pdb_DATA = DatebookDB.pdb \
+ ContactsDB-PAdd.pdb \
+ ToDoDB.pdb \
+ TasksDB-PTod.pdb \
+- MañanaDB.pdb \
++ MañanaDB.pdb \
+ MemoDB.pdb \
+ MemosDB-PMem.pdb \
+ Memo32DB.pdb \
+diff -up jpilot-1.8.0/sync.c.pom jpilot-1.8.0/sync.c
+--- jpilot-1.8.0/sync.c.pom 2010-02-28 19:56:52.000000000 +0100
++++ jpilot-1.8.0/sync.c 2011-01-25 15:39:42.000000000 +0100
+@@ -1146,7 +1146,7 @@ int sync_fetch(int sd, unsigned int flag
+ "ToDoDB",
+ "MemoDB",
+ #ifdef ENABLE_MANANA
+- "MañanaDB",
++ "MañanaDB",
+ #endif
+ "Saved Preferences",
+ ""
+@@ -2899,7 +2899,7 @@ int jp_sync(struct my_sync_info *sync_in
+ "ToDoDB",
+ "MemoDB",
+ #ifdef ENABLE_MANANA
+- "MañanaDB",
++ "MañanaDB",
+ #endif
+ ""
+ };
+diff -up jpilot-1.8.0/todo.c.pom jpilot-1.8.0/todo.c
+--- jpilot-1.8.0/todo.c.pom 2009-12-31 21:57:13.000000000 +0100
++++ jpilot-1.8.0/todo.c 2011-01-25 15:41:27.000000000 +0100
+@@ -77,7 +77,7 @@ int get_todo_app_info(struct ToDoAppInfo
+ #ifdef ENABLE_MANANA
+ get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+ if (ivalue) {
+- strcpy(DBname, "MañanaDB");
++ strcpy(DBname, "MañanaDB");
+ } else {
+ strcpy(DBname, "ToDoDB");
+ }
+@@ -163,7 +163,7 @@ int get_todos2(ToDoList **todo_list, int
+ #ifdef ENABLE_MANANA
+ get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+ if (ivalue) {
+- num = jp_read_DB_files("MañanaDB", &records);
++ num = jp_read_DB_files("MañanaDB", &records);
+ if (-1 == num)
+ return 0;
+ } else {
+@@ -315,7 +315,7 @@ int pc_todo_write(struct ToDo *todo, PCR
+ #ifdef ENABLE_MANANA
+ get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+ if (ivalue) {
+- jp_pc_write("MañanaDB", &br);
++ jp_pc_write("MañanaDB", &br);
+ } else {
+ jp_pc_write("ToDoDB", &br);
+ }
+diff -up jpilot-1.8.0/todo_gui.c.pom jpilot-1.8.0/todo_gui.c
+--- jpilot-1.8.0/todo_gui.c.pom 2009-12-31 21:57:13.000000000 +0100
++++ jpilot-1.8.0/todo_gui.c 2011-01-25 15:41:52.000000000 +0100
+@@ -1029,8 +1029,8 @@ static void cb_edit_cats(GtkWidget *widg
+ #ifdef ENABLE_MANANA
+ get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+ if (ivalue) {
+- strcpy(pdb_name, "MañanaDB.pdb");
+- strcpy(db_name, "MañanaDB");
++ strcpy(pdb_name, "MañanaDB.pdb");
++ strcpy(db_name, "MañanaDB");
+ } else {
+ strcpy(pdb_name, "ToDoDB.pdb");
+ strcpy(db_name, "ToDoDB");
+diff -up jpilot-1.8.0/utils.c.pom jpilot-1.8.0/utils.c
+--- jpilot-1.8.0/utils.c.pom 2010-02-28 19:58:25.000000000 +0100
++++ jpilot-1.8.0/utils.c 2011-01-25 15:42:36.000000000 +0100
+@@ -550,7 +550,7 @@ int check_copy_DBs_to_home(void)
+ "ContactsDB-PAdd.pdb",
+ "ToDoDB.pdb",
+ "TasksDB-PTod.pdb",
+- "MañanaDB.pdb",
++ "MañanaDB.pdb",
+ "MemoDB.pdb",
+ "MemosDB-PMem.pdb",
+ "Memo32DB.pdb",
+@@ -983,7 +983,7 @@ int delete_pc_record(AppType app_type, v
+ #ifdef ENABLE_MANANA
+ get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+ if (ivalue) {
+- strcpy(filename, "MañanaDB.pc3");
++ strcpy(filename, "MañanaDB.pc3");
+ } else {
+ strcpy(filename, "ToDoDB.pc3");
+ }
+@@ -3478,7 +3478,7 @@ int undelete_pc_record(AppType app_type,
+ #ifdef ENABLE_MANANA
+ get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+ if (ivalue) {
+- strcpy(filename, "MañanaDB.pc3");
++ strcpy(filename, "MañanaDB.pc3");
+ } else {
+ strcpy(filename, dbname[2]);
+ }
diff --git a/jpilot.spec b/jpilot.spec
index d5cb5af..be3d1e1 100644
--- a/jpilot.spec
+++ b/jpilot.spec
@@ -1,7 +1,7 @@
-Summary: Jpilot pilot desktop software
+Summary: pilot desktop software
Name: jpilot
Version: 1.8.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: Applications/Productivity
URL: http://jpilot.org
@@ -12,6 +12,7 @@ Source1: jpilot.desktop
Patch0: jpilot-0.99.7-conf.patch
Patch1: jpilot-1.8.0-datebook_version.patch
+Patch2: jpilot-1.8.0-utf.patch
BuildRequires: gettext
BuildRequires: gtk2-devel >= 2.0.3
@@ -31,6 +32,7 @@ well known rampant legacy operating system.
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1 -b .dbv
+%patch2 -p1 -b .utf
iconv -f windows-1252 -t utf-8 AUTHORS >AUTHORS.aux
mv AUTHORS.aux AUTHORS
@@ -41,6 +43,8 @@ mv AUTHORS.aux AUTHORS
%endif
--disable-rpath
+# rename the non-utf file
+mv empty/Ma?anaDB.pdb empty/MañanaDB.pdb
cd po
make clean
make update-po
@@ -66,9 +70,6 @@ install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/applications/jpilot.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m 644 icons/jpilot-icon3.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-# rename the non-utf file
-mv $RPM_BUILD_ROOT%{_datadir}/jpilot/Ma?anaDB.pdb $RPM_BUILD_ROOT%{_datadir}/jpilot/MañanaDB.pdb
-
%find_lang %name
%clean
@@ -89,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/*
%changelog
+* Tue Jan 25 2011 Ivana Hutarova Varekova <varekova at redhat.com> - 1.8.0-5
+- resolves: #667473
+ fix the utf encoding
+
* Mon Jan 3 2011 Ivana Hutarova Varekova <varekova at redhat.com> - 1.8.0-4
- resolves: #663626
rename the non-utf file name
More information about the scm-commits
mailing list