From bb3d476256f326a4dfd0f57a70bdd297cdc15d9a Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: Aug 29 2009 22:34:30 +0000
Subject: - Updated to new upstream version 0.8.5 (fixes #518778)


---

diff --git a/.cvsignore b/.cvsignore
index 09a90ca..ad7f264 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rednotebook-0.8.4.tar.gz
+rednotebook-0.8.5.tar.gz
diff --git a/rednotebook-0.8.4-gtk-2.14.patch b/rednotebook-0.8.4-gtk-2.14.patch
deleted file mode 100644
index 80a7e9f..0000000
--- a/rednotebook-0.8.4-gtk-2.14.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- rednotebook-0.8.4/rednotebook/files/mainWindow.glade	2009-08-09 21:18:10.000000000 +0200
-+++ rednotebook-0.8.4/rednotebook/files/mainWindow.glade.svn	2009-08-29 19:35:43.000000000 +0200
-@@ -1,6 +1,6 @@
- <?xml version="1.0"?>
- <interface>
--  <requires lib="gtk+" version="2.16"/>
-+  <!-- interface-requires gtk+ 2.12 -->
-   <!-- interface-naming-policy toplevel-contextual -->
-   <object class="GtkListStore" id="liststore1">
-     <columns>
-@@ -56,11 +56,8 @@
-   </object>
-   <object class="GtkWindow" id="mainFrame">
-     <property name="window_position">center</property>
--    <accel-groups>
--      <group name="accelgroup1"/>
--    </accel-groups>
--    <signal name="destroy" handler="on_mainFrame_destroy"/>
-     <signal name="configure_event" handler="on_mainFrame_configure_event"/>
-+    <signal name="delete_event" handler="on_mainFrame_delete_event"/>
-     <child>
-       <object class="GtkVBox" id="vbox3">
-         <property name="visible">True</property>
-@@ -163,6 +160,7 @@
-                       <object class="GtkImageMenuItem" id="quit">
-                         <property name="label">gtk-quit</property>
-                         <property name="visible">True</property>
-+                        <property name="tooltip_text" translatable="yes">Shutdown RedNotebook. It won't be sent to the tray.</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_stock">True</property>
-                         <property name="accel_group">accelgroup1</property>
-@@ -431,12 +429,8 @@
-                             <child>
-                               <object class="GtkComboBoxEntry" id="searchBox">
-                                 <property name="visible">True</property>
--                                <property name="model">liststore4</property>
-                                 <child>
-                                   <object class="GtkCellRendererText" id="cellrenderertext2"/>
--                                  <attributes>
--                                    <attribute name="text">0</attribute>
--                                  </attributes>
-                                 </child>
-                               </object>
-                               <packing>
-@@ -2256,7 +2250,6 @@
-       <action-widget response="-5">button21</action-widget>
-     </action-widgets>
-   </object>
--  <object class="GtkAccelGroup" id="accelgroup1"/>
-   <object class="GtkImage" id="image2">
-     <property name="visible">True</property>
-     <property name="stock">gtk-new</property>
-@@ -2281,4 +2274,5 @@
-     <property name="visible">True</property>
-     <property name="stock">gtk-paste</property>
-   </object>
-+  <object class="GtkAccelGroup" id="accelgroup1"/>
- </interface>
diff --git a/rednotebook.spec b/rednotebook.spec
index f1e56e4..1575401 100644
--- a/rednotebook.spec
+++ b/rednotebook.spec
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.4
-Release:        1%{?dist}.1
+Version:        0.8.5
+Release:        1%{?dist}
 Summary:        A desktop diary
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://digitaldump.wordpress.com/projects/rednotebook/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.8.4-gtk-2.14.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 BuildArch:      noarch
 
@@ -31,7 +30,7 @@ and does so in style.
 
 %prep
 %setup -q
-%patch0 -p1 -b .216
+
 
 %build
 python setup.py build
@@ -72,8 +71,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
-* Sat Aug 29 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.8.4-1.1
-- Make rednotebook work with GTK 2.14 (#518778)
+* Fri Aug 14 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.8.5-1
+- Updated to new upstream version 0.8.5 (fixes #518778)
 
 * Fri Aug 14 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.8.4-1
 - Updated to new upstream version 0.8.4
diff --git a/sources b/sources
index 61de015..8d1229a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5eca46d4854a2018bea02fddef5a52c2  rednotebook-0.8.4.tar.gz
+129bd692ec936761db8b1b8e12b4202c  rednotebook-0.8.5.tar.gz