[jpilot/f14/master] remove obsolete rows
Ivana Varekova
varekova at fedoraproject.org
Mon Jan 3 13:23:03 UTC 2011
commit 3bc14f3cf77f7162089b25498134248a958da0e9
Author: Ivana Hutarova Varekova <varekova at redhat.com>
Date: Mon Jan 3 15:24:27 2011 +0100
remove obsolete rows
jpilot-1.8.0-datebook_version.patch | 11 ++++++-----
jpilot.spec | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/jpilot-1.8.0-datebook_version.patch b/jpilot-1.8.0-datebook_version.patch
index 8db9d18..a784043 100644
--- a/jpilot-1.8.0-datebook_version.patch
+++ b/jpilot-1.8.0-datebook_version.patch
@@ -1,10 +1,11 @@
-diff -up jpilot-1.8.0/datebook_gui.c.pom jpilot-1.8.0/datebook_gui.c
---- jpilot-1.8.0/datebook_gui.c.pom 2010-02-28 20:21:59.000000000 +0100
-+++ jpilot-1.8.0/datebook_gui.c 2011-01-03 15:01:30.000000000 +0100
-@@ -3019,6 +3019,19 @@ void cb_delete_appt(GtkWidget *widget, g
+diff -up jpilot-1.8.0/datebook_gui.c.dbv jpilot-1.8.0/datebook_gui.c
+--- jpilot-1.8.0/datebook_gui.c.dbv 2010-02-28 20:21:59.000000000 +0100
++++ jpilot-1.8.0/datebook_gui.c 2011-01-03 15:20:51.000000000 +0100
+@@ -3018,7 +3018,19 @@ void cb_delete_appt(GtkWidget *widget, g
+ * record in that order. This is so that the sync code can check to see
* if the remote record is the same as the removed, or changed local
* or not before it goes and modifies it. */
- delete_pc_record(CALENDAR, mce, flag);
+- delete_pc_record(CALENDAR, mce, flag);
+ if (datebook_version) {
+ delete_pc_record(CALENDAR, mce, flag);
+ } else {
diff --git a/jpilot.spec b/jpilot.spec
index e729fbf..b5ce6a2 100644
--- a/jpilot.spec
+++ b/jpilot.spec
@@ -1,7 +1,7 @@
Summary: Jpilot pilot desktop software
Name: jpilot
Version: 1.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
Group: Applications/Productivity
URL: http://jpilot.org
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/*
%changelog
-* Mon Jan 3 2011 Ivana Hutarova Varekova <varekova at redhat.com> - 1.8.0-2
+* Mon Jan 3 2011 Ivana Hutarova Varekova <varekova at redhat.com> - 1.8.0-3
- Resolves: #665903
Cannot delete entries from DateBook
More information about the scm-commits
mailing list