From 9374d19a842e99828fbb5658e6e62679d668e3a9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 03 2017 19:07:24 +0000 Subject: 5.36.0 --- diff --git a/.gitignore b/.gitignore index fcf8b4a..e694585 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1 @@ -/kservice-5.18.0.tar.xz -/kservice-5.19.0.tar.xz -/kservice-5.20.0.tar.xz -/kservice-5.21.0.tar.xz -/kservice-5.22.0.tar.xz -/kservice-5.23.0.tar.xz -/kservice-5.24.0.tar.xz -/kservice-5.25.0.tar.xz -/kservice-5.26.0.tar.xz -/kservice-5.27.0.tar.xz -/kservice-5.29.0.tar.xz -/kservice-5.31.0.tar.xz -/kservice-5.32.0.tar.xz -/kservice-5.33.0.tar.xz -/kservice-5.34.0.tar.xz -/kservice-5.35.0.tar.xz +/kservice-5.36.0.tar.xz diff --git a/kf5-kservice.spec b/kf5-kservice.spec index 15b13c7..d70d3b9 100644 --- a/kf5-kservice.spec +++ b/kf5-kservice.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Summary: KDE Frameworks 5 Tier 3 solution for advanced plugin and service introspection -Version: 5.35.0 +Version: 5.36.0 Release: 1%{?dist} # mixture of LGPLv2 and LGPLv2+ (mostly the latter) @@ -32,7 +32,7 @@ Patch100: kservice-5.15.0-xdg-menu.patch Patch101: kservice-5.17.0-vfolder_spam.patch # Workaround flex bug (https://bugzilla.redhat.com/show_bug.cgi?id=1364943) -Patch102: kservice-5.25-fix-build-with-flex-2.6.0.patch +Patch102: kservice-5.36-fix-build-with-flex-2.6.0.patch BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-kconfig-devel >= %{version} @@ -112,6 +112,9 @@ mkdir -p %{buildroot}%{_kf5_datadir}/kservicetypes5 %changelog +* Mon Jul 03 2017 Rex Dieter - 5.36.0-1 +- 5.36.0 + * Sun Jun 04 2017 Rex Dieter - 5.35.0-1 - 5.35.0 diff --git a/kservice-5.25-fix-build-with-flex-2.6.0.patch b/kservice-5.25-fix-build-with-flex-2.6.0.patch deleted file mode 100644 index 435ef04..0000000 --- a/kservice-5.25-fix-build-with-flex-2.6.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a521c8..2c0a323 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,6 +61,8 @@ set_package_properties(BISON PROPERTIES - PURPOSE "Required for the Trader parser" - ) - -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") -+ - # create a Config.cmake and a ConfigVersion.cmake file and install them - set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Service") - diff --git a/kservice-5.36-fix-build-with-flex-2.6.0.patch b/kservice-5.36-fix-build-with-flex-2.6.0.patch new file mode 100644 index 0000000..3afee18 --- /dev/null +++ b/kservice-5.36-fix-build-with-flex-2.6.0.patch @@ -0,0 +1,12 @@ +diff -up kservice-5.36.0/CMakeLists.txt.flex kservice-5.36.0/CMakeLists.txt +--- kservice-5.36.0/CMakeLists.txt.flex 2017-07-02 03:10:31.000000000 -0500 ++++ kservice-5.36.0/CMakeLists.txt 2017-07-03 14:06:30.065476955 -0500 +@@ -64,6 +64,8 @@ set_package_properties(BISON PROPERTIES + PURPOSE "Required for the Trader parser" + ) + ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") ++ + add_definitions(-DTRANSLATION_DOMAIN=\"kservice5\") + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") + ki18n_install(po) diff --git a/sources b/sources index e32f335..34cc464 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kservice-5.35.0.tar.xz) = 88646c37970be81515995d950e678a3187fe0dece079c82289fb75bf03c5f48d64a5c01373703db87c7c83ca1cdc755215a151136b5ab6b438fb9d20d2f1bea8 +SHA512 (kservice-5.36.0.tar.xz) = 3c618288d1e4343fc326229b17529d61b4f2a0265128bc7e4721887d6ea426da7b035d6f354e78c9372da6632e8e255589208b8ed564af939e1c1879ab5f059f