[jpilot] update to 1.8.1
Ivana Varekova
varekova at fedoraproject.org
Tue Jul 12 10:47:53 UTC 2011
commit 78746af3f781ceea674e2f99efe4d2079da077f5
Author: Ivana Hutarova Varekova <varekova at redhat.com>
Date: Tue Jul 12 13:11:26 2011 +0200
update to 1.8.1
.gitignore | 2 +-
jpilot-1.8.0-datebook_version.patch | 24 -------
jpilot-1.8.0-utf.patch => jpilot-1.8.1-utf.patch | 78 +++++++++++-----------
jpilot.spec | 11 ++--
sources | 2 +-
5 files changed, 47 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 97d2b8c..e742472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-jpilot-1.8.0.tar.gz
+/jpilot-1.8.1.tar.gz
diff --git a/jpilot-1.8.0-utf.patch b/jpilot-1.8.1-utf.patch
similarity index 51%
rename from jpilot-1.8.0-utf.patch
rename to jpilot-1.8.1-utf.patch
index 0c884c9..10597ee 100644
--- a/jpilot-1.8.0-utf.patch
+++ b/jpilot-1.8.1-utf.patch
@@ -1,6 +1,6 @@
-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
+diff -up jpilot-1.8.1/empty/Makefile.am.utf jpilot-1.8.1/empty/Makefile.am
+--- jpilot-1.8.1/empty/Makefile.am.utf 2009-08-30 15:42:38.000000000 +0200
++++ jpilot-1.8.1/empty/Makefile.am 2011-07-12 10:20:21.000000000 +0200
@@ -9,7 +9,7 @@ pdb_DATA = DatebookDB.pdb \
ContactsDB-PAdd.pdb \
ToDoDB.pdb \
@@ -10,10 +10,10 @@ diff -up jpilot-1.8.0/empty/Makefile.am.pom jpilot-1.8.0/empty/Makefile.am
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 \
+diff -up jpilot-1.8.1/empty/Makefile.in.utf jpilot-1.8.1/empty/Makefile.in
+--- jpilot-1.8.1/empty/Makefile.in.utf 2011-04-05 23:49:45.000000000 +0200
++++ jpilot-1.8.1/empty/Makefile.in 2011-07-12 10:20:27.000000000 +0200
+@@ -236,7 +236,7 @@ pdb_DATA = DatebookDB.pdb \
ContactsDB-PAdd.pdb \
ToDoDB.pdb \
TasksDB-PTod.pdb \
@@ -22,10 +22,10 @@ diff -up jpilot-1.8.0/empty/Makefile.in.pom jpilot-1.8.0/empty/Makefile.in
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
+diff -up jpilot-1.8.1/sync.c.utf jpilot-1.8.1/sync.c
+--- jpilot-1.8.1/sync.c.utf 2011-04-05 21:12:20.000000000 +0200
++++ jpilot-1.8.1/sync.c 2011-07-12 10:19:22.000000000 +0200
+@@ -1169,7 +1169,7 @@ static int sync_fetch(int sd, unsigned i
"ToDoDB",
"MemoDB",
#ifdef ENABLE_MANANA
@@ -34,18 +34,18 @@ diff -up jpilot-1.8.0/sync.c.pom jpilot-1.8.0/sync.c
#endif
"Saved Preferences",
""
-@@ -2899,7 +2899,7 @@ int jp_sync(struct my_sync_info *sync_in
- "ToDoDB",
- "MemoDB",
+@@ -2960,7 +2960,7 @@ static int jp_sync(struct my_sync_info *
+ "ToDoDB",
+ "MemoDB",
#ifdef ENABLE_MANANA
-- "MañanaDB",
-+ "MañanaDB",
+- "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
+diff -up jpilot-1.8.1/todo.c.utf jpilot-1.8.1/todo.c
+--- jpilot-1.8.1/todo.c.utf 2011-04-05 21:12:20.000000000 +0200
++++ jpilot-1.8.1/todo.c 2011-07-12 10:19:49.000000000 +0200
@@ -77,7 +77,7 @@ int get_todo_app_info(struct ToDoAppInfo
#ifdef ENABLE_MANANA
get_pref(PREF_MANANA_MODE, &ivalue, NULL);
@@ -55,16 +55,16 @@ diff -up jpilot-1.8.0/todo.c.pom jpilot-1.8.0/todo.c
} else {
strcpy(DBname, "ToDoDB");
}
-@@ -163,7 +163,7 @@ int get_todos2(ToDoList **todo_list, int
+@@ -164,7 +164,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;
+ return 0;
} else {
-@@ -315,7 +315,7 @@ int pc_todo_write(struct ToDo *todo, PCR
+@@ -317,7 +317,7 @@ int pc_todo_write(struct ToDo *todo, PCR
#ifdef ENABLE_MANANA
get_pref(PREF_MANANA_MODE, &ivalue, NULL);
if (ivalue) {
@@ -73,10 +73,10 @@ diff -up jpilot-1.8.0/todo.c.pom jpilot-1.8.0/todo.c
} 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
+diff -up jpilot-1.8.1/todo_gui.c.utf jpilot-1.8.1/todo_gui.c
+--- jpilot-1.8.1/todo_gui.c.utf 2011-04-05 21:12:20.000000000 +0200
++++ jpilot-1.8.1/todo_gui.c 2011-07-12 09:29:21.000000000 +0200
+@@ -1049,8 +1049,8 @@ static void cb_edit_cats(GtkWidget *widg
#ifdef ENABLE_MANANA
get_pref(PREF_MANANA_MODE, &ivalue, NULL);
if (ivalue) {
@@ -87,10 +87,10 @@ diff -up jpilot-1.8.0/todo_gui.c.pom jpilot-1.8.0/todo_gui.c
} 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)
+diff -up jpilot-1.8.1/utils.c.utf jpilot-1.8.1/utils.c
+--- jpilot-1.8.1/utils.c.utf 2011-04-05 21:20:03.000000000 +0200
++++ jpilot-1.8.1/utils.c 2011-07-12 09:29:21.000000000 +0200
+@@ -553,7 +553,7 @@ int check_copy_DBs_to_home(void)
"ContactsDB-PAdd.pdb",
"ToDoDB.pdb",
"TasksDB-PTod.pdb",
@@ -99,21 +99,21 @@ diff -up jpilot-1.8.0/utils.c.pom jpilot-1.8.0/utils.c
"MemoDB.pdb",
"MemosDB-PMem.pdb",
"Memo32DB.pdb",
-@@ -983,7 +983,7 @@ int delete_pc_record(AppType app_type, v
+@@ -1019,7 +1019,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");
+- strcpy(filename, "MañanaDB.pc3");
++ strcpy(filename, "MañanaDB.pc3");
} else {
- strcpy(filename, "ToDoDB.pc3");
+ strcpy(filename, "ToDoDB.pc3");
}
-@@ -3478,7 +3478,7 @@ int undelete_pc_record(AppType app_type,
+@@ -3552,7 +3552,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");
+- strcpy(filename, "MañanaDB.pc3");
++ strcpy(filename, "MañanaDB.pc3");
} else {
- strcpy(filename, dbname[2]);
+ strcpy(filename, dbname[2]);
}
diff --git a/jpilot.spec b/jpilot.spec
index 9b54215..6f7667d 100644
--- a/jpilot.spec
+++ b/jpilot.spec
@@ -1,7 +1,7 @@
Summary: pilot desktop software
Name: jpilot
-Version: 1.8.0
-Release: 6%{?dist}
+Version: 1.8.1
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Productivity
URL: http://jpilot.org
@@ -11,8 +11,7 @@ Source: http://jpilot.org/jpilot-%{version}.tar.gz
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
+Patch2: jpilot-1.8.1-utf.patch
BuildRequires: gettext
BuildRequires: gtk2-devel >= 2.0.3
@@ -31,7 +30,6 @@ well known rampant legacy operating system.
%prep
%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
@@ -90,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/*
%changelog
+* Tue Jul 12 2011 Ivana Hutarova Varekova <varekova at redhat.com> - 1.8.1-1
+- update to 1.8.1
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index a425d46..3419c47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea671c3668df5a001b5ce0002e00eee8 jpilot-1.8.0.tar.gz
+ac59a5708f37e30d39e85b1fcedd266f jpilot-1.8.1.tar.gz
More information about the scm-commits
mailing list