diff --git a/.gitignore b/.gitignore index d27b973..25014d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ krecipes-1.0-beta2.tar.gz /krecipes-2.0-beta2.tar.gz +/krecipes-2.1.0.tar.xz diff --git a/krecipes-2.1.0-gcc6.patch b/krecipes-2.1.0-gcc6.patch new file mode 100644 index 0000000..0cfd667 --- /dev/null +++ b/krecipes-2.1.0-gcc6.patch @@ -0,0 +1,25 @@ +From: Pino Toscano +Date: Sun, 14 Feb 2016 07:49:09 +0000 +Subject: Fix flags for KFontDialog::getFont() +X-Git-Url: http://quickgit.kde.org/?p=krecipes.git&a=commitdiff&h=f6d4f709ec57835b3fa4a660239a07321c9d02ff +--- +Fix flags for KFontDialog::getFont() + +Pass a proper value for flags, instead of a boolean. + +This fixes the build with GCC 6. +--- + + +--- a/src/dialogs/setupdisplay.cpp ++++ b/src/dialogs/setupdisplay.cpp +@@ -562,7 +562,7 @@ + void SetupDisplay::setFont() + { + KreDisplayItem *item = *node_item_map->find( m_currNodeId ); +- if ( KFontDialog::getFont( item->font, false, view() ) == QDialog::Accepted ) { ++ if ( KFontDialog::getFont( item->font, KFontChooser::NoDisplayFlags, view() ) == QDialog::Accepted ) { + m_currentItem = item; + loadFont(m_currNodeId,item->font); + m_currentItem = 0; + diff --git a/krecipes.spec b/krecipes.spec index ae021bf..1973074 100644 --- a/krecipes.spec +++ b/krecipes.spec @@ -1,13 +1,16 @@ -%global beta beta2 Name: krecipes -Version: 2.0 -Release: 0.10.%{beta}%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Application to manage recipes and shopping-lists License: GPLv2+ -URL: http://krecipes.sourceforge.net/ -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-%{beta}.tar.gz +URL: https://userbase.kde.org/Krecipes +Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz + +# Fix FTBFS with GCC 6 (#1307698), upstream patch by Pino Toscano +# http://commits.kde.org/krecipes/f6d4f709ec57835b3fa4a660239a07321c9d02ff +Patch100: krecipes-2.1.0-gcc6.patch BuildRequires: desktop-file-utils BuildRequires: shared-mime-info @@ -16,7 +19,6 @@ BuildRequires: kdelibs4-devel BuildRequires: kdelibs4-webkit-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel -BuildRequires: qimageblitz-devel BuildRequires: sqlite-devel %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api}} @@ -35,7 +37,8 @@ your menu/diet in advance. %prep -%setup -q -n %{name}-%{version}-%{beta} +%setup -q -n %{name}-%{version} +%patch100 -p1 -b .gcc6 %build mkdir -p %{_target_platform} @@ -87,6 +90,12 @@ fi %{_kde4_appsdir}/krecipes/ %changelog +* Sun Feb 14 2016 Kevin Kofler - 2.1.0-1 +- Update to 2.1.0 +- Update URL from SourceForge to https://userbase.kde.org/Krecipes +- Drop BR qimageblitz-devel, not used anymore +- Backport upstream patch to fix FTBFS with GCC 6 (#1307698) + * Thu Feb 04 2016 Fedora Release Engineering - 2.0-0.10.beta2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index e044a10..c254518 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c01ccad7ad1409cb35c824a61250fe2 krecipes-2.0-beta2.tar.gz +422ff3df8ab5aac56617d87942762e88 krecipes-2.1.0.tar.xz