[shotwell/f20-gnome-3-12] Update to 0.18.0

[Richard Hughes]

commit 9063e1f1d05cfe22a20daab467bb52126b1897d8
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Apr 14 15:45:36 2014 +0100

    Update to 0.18.0

 .gitignore                            |    1 +
 shotwell-0.15.1-format-security.patch |   19 -------------------
 shotwell.spec                         |   31 +++++++++++++++----------------
 sources                               |    2 +-
 4 files changed, 17 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7a8c947..bdb1cf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /shotwell-0.15.0pr3.tar.xz
 /shotwell-0.15.0.tar.xz
 /shotwell-0.15.1.tar.xz
+/shotwell-0.18.0.tar.xz
diff --git a/shotwell.spec b/shotwell.spec
index cedb6c9..fe907af 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -1,8 +1,6 @@
-#define pre pr3
-
 Name:           shotwell
-Version:        0.15.1
-Release:        %{?pre:0.}1%{?pre:.%{pre}}%{?dist}
+Version:        0.18.0
+Release:        1%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -10,16 +8,13 @@ Group:          Applications/Multimedia
 # CC-BY-SA for some of the icons
 License:        LGPLv2+ and CC-BY-SA
 URL:            http://www.yorba.org/shotwell/
-#VCS:           git:git://yorba.org/shotwell
-Source0:        http://www.yorba.org/download/shotwell/0.15/shotwell-%{version}%{?pre}.tar.xz
+Source0:        https://download.gnome.org/sources/shotwell/0.18/shotwell-%{version}.tar.xz
 # https://bugzilla.gnome.org/show_bug.cgi?id=717326
 Source1:        shotwell-icons.tar.bz2
 # https://bugzilla.gnome.org/show_bug.cgi?id=715578
 Source2:        shotwell.1
-# https://bugzilla.gnome.org/show_bug.cgi?id=719863
-Patch0:         shotwell-0.15.1-format-security.patch
 
-BuildRequires:  vala-devel >= 0.18.0
+BuildRequires:  vala-devel >= 0.20.1
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  pkgconfig(atk)
@@ -30,6 +25,7 @@ BuildRequires:  pkgconfig(gexiv2)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gmodule-2.0)
+BuildRequires:  pkgconfig(gnome-doc-utils)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-base-1.0)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
@@ -52,14 +48,16 @@ BuildRequires:  pkgconfig(rest-0.7)
 Requires:       dconf
 
 %description
-Shotwell is a new open source photo organizer designed for the GNOME desktop
-environment. It allows you to import photos from your camera, view and edit
-them, and share them with others.
+Shotwell is an easy-to-use, fast photo organizer designed for the GNOME
+desktop.  It allows you to import photos from your camera or disk, organize
+them by date and subject matter, even ratings.  It also offers basic photo
+editing, like crop, red-eye correction, color adjustments, and straighten.
+Shotwell's non-destructive photo editor does not alter your master photos,
+making it easy to experiment and correct errors.
 
 
 %prep
-%setup -q -n shotwell-%{version}%{?pre}
-%patch0 -p1
+%setup -q
 
 
 %build
@@ -92,8 +90,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1
 
 %find_lang %{name} --with-gnome
-%find_lang %{name}-extras
-cat %{name}-extras.lang >> %{name}.lang
 
 
 %post
@@ -131,6 +127,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Apr 14 2014 Richard Hughes <rhughes at redhat.com> - 0.18.0-1
+- Update to 0.18.0
+
 * Tue Dec 17 2013 Thomas Moschny <thomas.moschny at gmx.de> - 0.15.1-1
 - Update to 0.15.1.
 - Update bug URLs.
diff --git a/sources b/sources
index 2fcff52..dba6ef9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5af4cfb819249a879a4649a9c7d089e5  shotwell-0.15.1.tar.xz
+856b69fe67bc8bd42a6985e042041daf  shotwell-0.18.0.tar.xz