diff --git a/.gitignore b/.gitignore index 326adec..98157b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ kaccounts-integration-16.04.3.tar.xz /kaccounts-integration-16.07.80.tar.xz +/kaccounts-integration-16.07.90.tar.xz diff --git a/kaccounts-integration-16.04.3-cmakeconfig_path.patch b/kaccounts-integration-16.04.3-cmakeconfig_path.patch deleted file mode 100644 index ada7b3a..0000000 --- a/kaccounts-integration-16.04.3-cmakeconfig_path.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 868f7b29df5d72d3bb62d6527c9c09464b751b85 -Author: Rex Dieter -Date: Fri Jul 29 10:28:38 2016 -0500 - - better CMAKECONFIG_INSTALL_DIR fix - - this should handle both relative and full paths properly - -diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt -index 9aaf488..650f046 100644 ---- a/src/lib/CMakeLists.txt -+++ b/src/lib/CMakeLists.txt -@@ -4,7 +4,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ) - --set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KAccounts") -+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KAccounts") - - include(ECMPackageConfigHelpers) - include(ECMSetupVersion) -diff --git a/src/lib/KAccountsConfig.cmake.in b/src/lib/KAccountsConfig.cmake.in -index 3a1e524..0922496 100644 ---- a/src/lib/KAccountsConfig.cmake.in -+++ b/src/lib/KAccountsConfig.cmake.in -@@ -9,4 +9,4 @@ include("${CMAKE_CURRENT_LIST_DIR}/FindAccountsFileDir.cmake") - include("${CMAKE_CURRENT_LIST_DIR}/KAccountsTargets.cmake") - include("${CMAKE_CURRENT_LIST_DIR}/KAccountsMacros.cmake") - --set(KACCOUNTS_MACROS_PATH "@CMAKE_INSTALL_PREFIX@/@CMAKECONFIG_INSTALL_DIR@") -+set(KACCOUNTS_MACROS_PATH "@CMAKECONFIG_INSTALL_DIR@") diff --git a/kaccounts-integration.spec b/kaccounts-integration.spec index 3a81e7f..6d7bf30 100644 --- a/kaccounts-integration.spec +++ b/kaccounts-integration.spec @@ -1,6 +1,6 @@ Name: kaccounts-integration -Version: 16.07.80 +Version: 16.07.90 Release: 1%{?dist} Summary: Small system to administer web accounts across the KDE desktop License: GPLv2+ @@ -17,8 +17,6 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-% ## upstream fixes ## upstreamable fixes -# fix KAccountsConfig to not make any assumptions about relative/full paths -Patch100: kaccounts-integration-16.04.3-cmakeconfig_path.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-rpm-macros @@ -98,6 +96,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sat Aug 06 2016 Rex Dieter - 16.07.90-1 +- 16.07.90 + * Sun Jul 31 2016 Rex Dieter - 16.07.80-1 - 16.07.80 diff --git a/sources b/sources index 04bc4d9..cd33ab2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -418a20919487fcdb1fb5e90df572dc71 kaccounts-integration-16.07.80.tar.xz +9e44d1786fe6c891e94386bf1130bb9f kaccounts-integration-16.07.90.tar.xz