From 7b2196982c986bb92da438f8b5def06d2a67ccc9 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: May 26 2014 21:05:07 +0000 Subject: Update to latest upstream version --- diff --git a/.gitignore b/.gitignore index 2c7388b..c56ac92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /frogr-0.6.1.tar.xz /frogr-0.7.tar.xz /frogr-0.8.tar.xz +/frogr-0.9.tar.xz diff --git a/0001-Don-t-set-DG-_DISABLE_DEPRECATED.patch b/0001-Don-t-set-DG-_DISABLE_DEPRECATED.patch deleted file mode 100644 index 9dda731..0000000 --- a/0001-Don-t-set-DG-_DISABLE_DEPRECATED.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5fd6398ac95acdb630591fae78ead568b0c0cfe7 Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau -Date: Fri, 15 Feb 2013 09:39:56 +0100 -Subject: [PATCH] Don't set -DG*_DISABLE_DEPRECATED - -This breaks compilation with newer glib/gtk+ versions as disabling -deprecated features removes them from the default headers rather than just -issueing a deprecation warning, and frogr is using GStaticRecMutex, -stock icons, ... which are deprecated. ---- - configure | 1 - - configure.ac | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/configure b/configure -index e858665..93e086d 100755 ---- a/configure -+++ b/configure -@@ -4745,7 +4745,6 @@ AM_BACKSLASH='\' - # Extra verbose warning switches - - CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DGSEAL_ENABLE" --CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" - - # (Platform independent) dependencies for frogr - -diff --git a/configure.ac b/configure.ac -index ab77f66..2a1c9f5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - # Extra verbose warning switches - - CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DGSEAL_ENABLE" --CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" - - # (Platform independent) dependencies for frogr - --- -1.8.3.1 - diff --git a/frogr.spec b/frogr.spec index 73c62a2..8fb4eb3 100644 --- a/frogr.spec +++ b/frogr.spec @@ -1,14 +1,13 @@ Name: frogr -Version: 0.8 +Version: 0.9 Summary: Flickr Remote Organizer for GNOME Summary(de): Flickr-Verwaltung für GNOME -Release: 6%{?dist} +Release: 1%{?dist} Group: Applications/Internet License: GPLv3 URL: http://live.gnome.org/Frogr -Source0: http://download.gnome.org/sources/%{name}/0.8/%{name}-%{version}.tar.xz -Patch0: 0001-Don-t-set-DG-_DISABLE_DEPRECATED.patch +Source0: http://download.gnome.org/sources/%{name}/0.9/%{name}-%{version}.tar.xz BuildRequires: gettext BuildRequires: gtk3-devel @@ -21,6 +20,7 @@ BuildRequires: desktop-file-utils BuildRequires: gnome-doc-utils BuildRequires: gstreamer-devel BuildRequires: json-glib-devel +BuildRequires: itstool #Explicitly Requires: gvfs since we need gtk_show_uri to be able to open a #web browser when associating frogr with a flickr account (this is how #application/flickr pairing works, through flickr.com) @@ -40,7 +40,6 @@ Setzen von Markierungen und Verwalten von Alben. %prep %setup -q -%patch0 -p1 %build %configure @@ -50,7 +49,7 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop -%find_lang %{name} +%find_lang %{name} --with-gnome %post @@ -74,15 +73,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}.xpm -%{_datadir}/gnome/help/%{name} +#%{_datadir}/help/%{name} %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/*/apps/%{name}.svg +%{_datadir}/icons/HighContrast/scalable/apps/%{name}.svg %{_datadir}/applications/%{name}.desktop %{_mandir}/man1/frogr.1.* %doc README NEWS COPYING AUTHORS THANKS MAINTAINERS TRANSLATORS %changelog +* Mon May 26 2014 Richard Hughes - 0.9-1 +- New upstream version. + * Tue Apr 22 2014 Tomáš Mráz - 0.8-6 - Rebuild for new libgcrypt diff --git a/sources b/sources index 99ac76a..e69f789 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5013c2620a8e54a722fcc163e1a0961e frogr-0.8.tar.xz +584037732056ae3691e9f5eec5c6c35d frogr-0.9.tar.xz