twaugh pushed to expendable (master). "Merge branch 'f20' into f21"

[notifications at fedoraproject.org]

>From 290dcb5f9c13c917d5a27f2f5ba13055a4062284 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh at redhat.com>
Date: Tue, 31 Mar 2015 17:58:12 +0100
Subject: 0.0.10.


diff --git a/.gitignore b/.gitignore
index 8909594..45ff9af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ expendable-0.0.6.tar.bz2
 expendable-0.0.7.tar.bz2
 expendable-0.0.8.tar.bz2
 expendable-0.0.9.tar.xz
+/expendable-0.0.10.tar.xz
diff --git a/expendable-0.0.10.tar.xz.sig b/expendable-0.0.10.tar.xz.sig
new file mode 100644
index 0000000..5419488
Binary files /dev/null and b/expendable-0.0.10.tar.xz.sig differ
diff --git a/expendable-0.0.9.tar.xz.sig b/expendable-0.0.9.tar.xz.sig
deleted file mode 100644
index f3793b5..0000000
Binary files a/expendable-0.0.9.tar.xz.sig and /dev/null differ
diff --git a/expendable-save.patch b/expendable-save.patch
deleted file mode 100644
index 0c556fd..0000000
--- a/expendable-save.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up expendable-0.0.9/main.py.save expendable-0.0.9/main.py
---- expendable-0.0.9/main.py.save	2008-11-15 10:28:02.000000000 +0000
-+++ expendable-0.0.9/main.py	2010-01-06 17:52:49.800284933 +0000
-@@ -2,7 +2,7 @@
- 
- ## expendable
- 
--## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
-+## Copyright (C) 2008, 2010 Tim Waugh <twaugh at redhat.com>
- 
- ## This program is free software; you can redistribute it and/or modify
- ## it under the terms of the GNU General Public License as published by
-@@ -923,7 +923,7 @@ class Main:
-                        gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
-                        gtk.STOCK_SAVE, gtk.RESPONSE_YES)
-         filename = self.xmlfile.get_filename ()
--        requires_filename = (filename == None)
-+        requires_filename = (filename == None or self.xmlfile.is_readonly ())
-         if requires_filename:
-             filename = _("Untitled")
-         m.set_markup ('<span size="larger" weight="bold">' +
-@@ -938,7 +938,10 @@ class Main:
-                 response = self.file_chooser_dialog.run ()
-                 self.file_save_as_response (self.file_chooser_dialog, response)
-             else:
--                self.xmlfile.save ()
-+                self.file_save (None)
-+
-+            if self.check_if_changes_made ():
-+                response = gtk.RESPONSE_CANCEL
- 
-         return response
- 
diff --git a/expendable.spec b/expendable.spec
index 5566c5c..3d8e675 100644
--- a/expendable.spec
+++ b/expendable.spec
@@ -1,15 +1,13 @@
 Summary: Home finances modeling program
 Name: expendable
-Version: 0.0.9
-Release: 9%{?dist}
+Version: 0.0.10
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: https://fedorahosted.org/expendable/
 # Add "?format=raw" to the following URL to download file:
 Source0: https://fedorahosted.org/releases/e/x/expendable/%{name}-%{version}.tar.xz
 
-Patch1: expendable-save.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python
@@ -30,7 +28,6 @@ amount.
 
 %prep
 %setup -q
-%patch1 -p1 -b .save
 
 %build
 %configure
@@ -85,6 +82,9 @@ fi
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Mar 31 2015 Tim Waugh <twaugh at redhat.com> - 0.0.10-1
+- 0.0.10.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.9-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -106,7 +106,7 @@ fi
 * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.0.9-3
 - recompiling .py files against Python 2.7 (rhbz#623294)
 
-* Wed Jan  9 2010 Tim Waugh <twaugh at redhat.com> 0.0.9-2
+* Wed Jan  6 2010 Tim Waugh <twaugh at redhat.com> 0.0.9-2
 - Fixed save-on-exit (bug #551337).
 
 * Mon Oct 12 2009 Tim Waugh <twaugh at redhat.com> 0.0.9-1
diff --git a/sources b/sources
index 20e92ec..1c1dbc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abe7718c7a9bfa718f92fcc6ec805c92  expendable-0.0.9.tar.xz
+62d0b288d864450142b487da8c608f87  expendable-0.0.10.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/expendable.git/commit/?h=master&id=a9e7ee9371b3579af22d66d58728c43524db60fc