From 60fa408032a7d83a4eb5e89790c233d8d945823d Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Aug 09 2019 14:55:20 +0000
Subject: Release 2.1.1


---

diff --git a/.gitignore b/.gitignore
index 8843845..2f8fe0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /dtkcore-2.0.9.15.tar.gz
 /dtkcore-2.0.9.17.tar.gz
 /dtkcore-2.0.16.1.tar.gz
+/dtkcore-2.1.1.tar.gz
diff --git a/0001-Fix-shebang.patch b/0001-Fix-shebang.patch
new file mode 100644
index 0000000..2583a1a
--- /dev/null
+++ b/0001-Fix-shebang.patch
@@ -0,0 +1,33 @@
+From 5262f90a3984155b2829b7000274008c344c1e97 Mon Sep 17 00:00:00 2001
+From: Robin Lee <cheeselee@fedoraproject.org>
+Date: Fri, 9 Aug 2019 22:42:56 +0800
+Subject: [PATCH] Fix shebang
+
+---
+ tools/script/dtk-license.py   | 2 +-
+ tools/script/dtk-translate.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/script/dtk-license.py b/tools/script/dtk-license.py
+index bc3a071..cf49e81 100644
+--- a/tools/script/dtk-license.py
++++ b/tools/script/dtk-license.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ import fnmatch
+ import os
+diff --git a/tools/script/dtk-translate.py b/tools/script/dtk-translate.py
+index 9cb06f8..97bb7e6 100644
+--- a/tools/script/dtk-translate.py
++++ b/tools/script/dtk-translate.py
+@@ -1,4 +1,4 @@
+-#!env python
++#!/usr/bin/env python3
+ 
+ import sys,os,fnmatch
+ from subprocess import call
+-- 
+2.21.0
+
diff --git a/dtkcore.spec b/dtkcore.spec
index 5f1825b..b94edd0 100644
--- a/dtkcore.spec
+++ b/dtkcore.spec
@@ -1,14 +1,17 @@
 Name:           dtkcore
-Version:        2.0.16.1
-Release:        2%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        Deepin tool kit core modules
 License:        GPLv3
 URL:            https://github.com/linuxdeepin/dtkcore
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+# https://github.com/linuxdeepin/dtkcore.git
+Patch0:         0001-Fix-shebang.patch
 BuildRequires:  gcc-c++
 BuildRequires:  annobin
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(gsettings-qt)
+# since f30
 Obsoletes:      deepin-tool-kit <= 0.3.3
 Obsoletes:      deepin-tool-kit-devel <= 0.3.3
 Obsoletes:      dtksettings <= 0.1.7
@@ -27,11 +30,7 @@ Header files and libraries for %{name}.
 
 %prep
 %setup -q
-
-sed -i 's|/lib|/libexec|' tools/settings/settings.pro
-## consider relying on %%_qt5_bindir (see %%build below) instead of patching -- rex
-#sed -i 's|qmake|qmake-qt5|' src/dtk_module.prf
-#sed -i 's|lrelease|lrelease-qt5|' tools/script/dtk-translate.py src/dtk_translation.prf
+%patch0 -p1
 
 %build
 # help find (and prefer) qt5 utilities, e.g. qmake, lrelease
@@ -46,15 +45,13 @@ export PATH=%{_qt5_bindir}:$PATH
 %install
 %make_install INSTALL_ROOT=%{buildroot}
 
-%ldconfig_scriptlets
-
 %files
 %doc README.md
 %license LICENSE
-%{_libdir}/libdtkcore.so.2*
+%{_libdir}/lib%{name}.so.2*
 %{_libexecdir}/dtk2/dtk-settings
-%{_libexecdir}/dtk2/dtk-license.py*
-%{_libexecdir}/dtk2/dtk-translate.py*
+%{_libexecdir}/dtk2/dtk-license.py
+%{_libexecdir}/dtk2/dtk-translate.py
 %{_libexecdir}/dtk2/deepin-os-release
 
 %files devel
@@ -66,9 +63,12 @@ export PATH=%{_qt5_bindir}:$PATH
 %{_libdir}/cmake/DtkCore/
 %{_libdir}/cmake/DtkCMake/
 %{_libdir}/pkgconfig/dtkcore.pc
-%{_libdir}/libdtkcore.so
+%{_libdir}/lib%{name}.so
 
 %changelog
+* Mon Aug 05 2019 Robin Lee <cheeselee@fedoraproject.org> - 2.1.1-1
+- Release 2.1.1
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.16.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 81f88d1..5faeec6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dtkcore-2.0.16.1.tar.gz) = f14c4ebc3484840019861795e21336688b8e060091e799042fc9d9015411dc688f4656845ca91e6378936f58604870b9c2a7368595382930406b29e3e1d19c09
+SHA512 (dtkcore-2.1.1.tar.gz) = 4af5e0fcb06c1945e043c64d28f73ea99c4541b64630b95a573a1cd50d28bb851e6dcf76b4d14b66c10e9544f8151c1cf5429d2c0cce3fcf862b6e6687b3a3bf