From 5c7b9d857c1c52179a0c563a0b5bb5a7f8ece3f9c72f5e628a7925240cce1680 Mon Sep 17 00:00:00 2001
From: Pascal Bleser <pascal.bleser@opensuse.org>
Date: Sat, 13 Nov 2010 18:38:10 +0000
Subject: [PATCH] drop patch, merged

OBS-URL: https://build.opensuse.org/package/show/utilities/calcurse?expand=0&rev=3
---
 calcurse-fix_missing_return_in_nonvoid_function.patch | 10 ----------
 calcurse.changes                                      |  5 +++++
 calcurse.spec                                         |  2 --
 3 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 calcurse-fix_missing_return_in_nonvoid_function.patch

diff --git a/calcurse-fix_missing_return_in_nonvoid_function.patch b/calcurse-fix_missing_return_in_nonvoid_function.patch
deleted file mode 100644
index 24128b4..0000000
--- a/calcurse-fix_missing_return_in_nonvoid_function.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/calendar.c.orig	2010-03-01 12:58:56.000000000 +0100
-+++ src/calendar.c	2010-03-01 12:59:40.000000000 +0100
-@@ -91,6 +91,7 @@
-       calendar_set_current_date ();
-       calendar_update_panel (win[CAL].p);
-     }
-+  return NULL;
- }
- 
- /* Launch the calendar date thread. */
diff --git a/calcurse.changes b/calcurse.changes
index c17f1aa..405f524 100644
--- a/calcurse.changes
+++ b/calcurse.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Nov 13 18:37:53 UTC 2010 - pascal.bleser@opensuse.org
+
+- drop calcurse-fix_missing_return_in_nonvoid_function.patch, has been merged upstream
+
 -------------------------------------------------------------------
 Sun May 30 06:59:39 UTC 2010 - pascal.bleser@opensuse.org
 
diff --git a/calcurse.spec b/calcurse.spec
index a8d671e..b9c4b20 100644
--- a/calcurse.spec
+++ b/calcurse.spec
@@ -7,7 +7,6 @@ Summary:        Text-based Organizer
 # http://culot.org/cgi-bin/get.cgi?calcurse-%{version}.tar.gz
 Source:         calcurse-%{version}.tar.bz2
 Source1:        %{name}.desktop
-Patch1:         calcurse-fix_missing_return_in_nonvoid_function.patch
 URL:            http://culot.org/calcurse/
 Group:          Productivity/Office/Organizers
 License:        BSD License
@@ -31,7 +30,6 @@ Authors:
 
 %prep
 %setup -q
-%patch1
 
 %build
 %configure