From c5be03aa85a564a30e275e061cec0eaee49cc93c Mon Sep 17 00:00:00 2001
From: Pete Travis <immanetize@fedoraproject.org>
Date: Tue, 11 Nov 2014 22:37:30 -0700
Subject: [PATCH] upstream 2.1.0

- add sqlite runtime req, because it uses that
- icon dir change
- new features
---
 .gitignore      |  1 +
 brewtarget.spec | 29 ++++++++++++++++++-----------
 sources         |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0dfe79d..1e2e19f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /brewtarget_2.0.1.orig.tar.gz
 /0001-unversioned-docdirs.patch
 /brewtarget_2.0.2.orig.tar.gz
+/bc8af30bbbfa184c6c6a1f5ce090a74da7fb8c57.tar.gz
diff --git a/brewtarget.spec b/brewtarget.spec
index 79d364a..3f69d91 100644
--- a/brewtarget.spec
+++ b/brewtarget.spec
@@ -1,19 +1,21 @@
+# I don't see an obvious way to get a tarball by tag from gitorious, so:
+%global tag_commit bc8af30bbbfa184c6c6a1f5ce090a74da7fb8c57
+
 Name:		brewtarget
-Version:	2.0.2
-Release:	3%{?dist}
+Version:	2.1.0
+Release:	1%{?dist}
 Summary:	An open source beer recipe creation tool
 Group:		Applications/Productivity
 License:	GPLv3 and WTFPL and LGPLv2
 URL:		http://www.brewtarget.org
-Source0:        https://launchpad.net/brewtarget/trunk/%{version}/+download/brewtarget_%{version}.orig.tar.gz
-%if 0%{?fedora} && 0%{?fedora} >= 20
-%endif
+Source0:      https://gitorious.org/brewtarget/brewtarget/archive/%{tag_commit}.tar.gz 
 BuildRequires:	cmake
 BuildRequires:	qt-devel
 BuildRequires:	qt-webkit-devel
 BuildRequires:	phonon-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:  sqlite
+Requires:  sqlite
+
 %description
 Brewtarget is an open source beer recipe creation tool. It automatically 
 calculates color, bitterness, and other parameters for you while you drag and 
@@ -22,9 +24,7 @@ priming sugar calculators, OG correction help, and a unique mash designing tool.
 It also can export and import recipes in BeerXML.
 
 %prep
-%setup -q
-%if 0%{?fedora} && 0%{?fedora} >= 20
-%endif
+%setup -q -n %{name}-%{name}
 
 %build
 %cmake -DDO_RELEASE_BUILD:BOOL=ON 
@@ -40,13 +40,20 @@ desktop-file-validate %buildroot%{_datadir}/applications/%{name}.desktop
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/%{name}
+%{_datadir}/icons/hicolor/scalable/apps/%{name}*
 %{_mandir}/man1/brewtarget.1*
-%doc README.markdown COPYRIGHT COPYING.GPLv3 COPYING.WTFPL doc/brewtarget-manual.html 
+%doc CHANGES.markdown README.markdown COPYRIGHT COPYING.GPLv3 COPYING.WTFPL doc/brewtarget-manual.html 
 
 
 
 %changelog
+* Wed Nov 12 2014 Pete Travis <me@petetravis.com> - 2.1.0-2
+- Update to upstream 2.1.0
+- Adds inventory tracking for ingredients
+- Folders for organizing recipes
+- Recipe parameter sliders
+- Various bugfixes, ref http://www.brewtarget.org/changelog.html
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index fde3e5e..cf4385b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-779138ce2263dd4a13bca5e346c1219c  brewtarget_2.0.2.orig.tar.gz
+da02b9ac7394a615a4b608bbdd2b4b44  bc8af30bbbfa184c6c6a1f5ce090a74da7fb8c57.tar.gz