diff --git a/.gitignore b/.gitignore index 2f8fe0d..b69cdbc 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /dtkcore-2.0.9.17.tar.gz /dtkcore-2.0.16.1.tar.gz /dtkcore-2.1.1.tar.gz +/dtkcore-5.2.2.15.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..8e98d76 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,17 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: rpm/dtkcore.spec + +# add or remove files that should be synced +synced_files: + - rpm/dtkcore.spec + - .packit.yaml + +upstream_package_name: dtkcore +# downstream (Fedora) RPM package name +downstream_package_name: dtkcore + +actions: + fix-spec-file: | + bash -c "sed -i -e \"s/Version:.*/Version: ${PACKIT_PROJECT_VERSION}/\" rpm/dtkcore.spec" diff --git a/0001-Fix-shebang.patch b/0001-Fix-shebang.patch deleted file mode 100644 index 2583a1a..0000000 --- a/0001-Fix-shebang.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5262f90a3984155b2829b7000274008c344c1e97 Mon Sep 17 00:00:00 2001 -From: Robin Lee -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/README.packit b/README.packit new file mode 100644 index 0000000..c23ffbd --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.16.0. diff --git a/dtkcore.spec b/dtkcore.spec index eb3ab3f..24959cd 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,12 +1,14 @@ Name: dtkcore -Version: 2.1.1 -Release: 3%{?dist} +Version: 5.2.2.15 +Release: 1%{?dist} Summary: Deepin tool kit core modules License: GPLv3 URL: https://github.com/linuxdeepin/dtkcore +%if 0%{?fedora} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# https://github.com/linuxdeepin/dtkcore.git -Patch0: 0001-Fix-shebang.patch +%else +Source0: %{name}_%{version}.orig.tar.xz +%endif BuildRequires: gcc-c++ BuildRequires: annobin BuildRequires: pkgconfig(Qt5Core) @@ -23,14 +25,13 @@ Deepin tool kit core modules. %package devel Summary: Development package for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt5-qtbase-devel +Requires: qt5-qtbase-devel%{?_isa} %description devel Header files and libraries for %{name}. %prep -%setup -q -%patch0 -p1 +%autosetup %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -38,21 +39,24 @@ export PATH=%{_qt5_bindir}:$PATH %qmake_qt5 PREFIX=%{_prefix} \ DTK_VERSION=%{version} \ LIB_INSTALL_DIR=%{_libdir} \ - BIN_INSTALL_DIR=%{_libexecdir}/dtk2 \ - TOOL_INSTALL_DIR=%{_libexecdir}/dtk2 + BIN_INSTALL_DIR=%{_libexecdir}/dtk5 \ + TOOL_INSTALL_DIR=%{_libexecdir}/dtk5 %make_build %install %make_install INSTALL_ROOT=%{buildroot} +# no-op since Fedora 28 +%ldconfig_scriptlets + %files %doc README.md %license LICENSE -%{_libdir}/lib%{name}.so.2* -%{_libexecdir}/dtk2/dtk-settings -%{_libexecdir}/dtk2/dtk-license.py -%{_libexecdir}/dtk2/dtk-translate.py -%{_libexecdir}/dtk2/deepin-os-release +%{_libdir}/lib%{name}.so.5* +%{_libexecdir}/dtk5/dtk-settings +%{_libexecdir}/dtk5/dtk-license.py +%{_libexecdir}/dtk5/dtk-translate.py +%{_libexecdir}/dtk5/deepin-os-release %files devel %doc doc/Specification.md @@ -62,10 +66,15 @@ export PATH=%{_qt5_bindir}:$PATH %{_libdir}/cmake/Dtk/ %{_libdir}/cmake/DtkCore/ %{_libdir}/cmake/DtkCMake/ +%{_libdir}/cmake/DtkTools/ %{_libdir}/pkgconfig/dtkcore.pc %{_libdir}/lib%{name}.so +%{_datadir}/glib-2.0/schemas/* %changelog +* Tue Sep 22 2020 Robin Lee - 5.2.2.15-1 +- new upstream release: 5.2.2.15 + * Mon Jul 27 2020 Fedora Release Engineering - 2.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 5faeec6..933c6cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dtkcore-2.1.1.tar.gz) = 4af5e0fcb06c1945e043c64d28f73ea99c4541b64630b95a573a1cd50d28bb851e6dcf76b4d14b66c10e9544f8151c1cf5429d2c0cce3fcf862b6e6687b3a3bf +SHA512 (dtkcore-5.2.2.15.tar.gz) = 5ca4559bce5c0179eefea72aee15f075d8afbf80d28b298d0957326e769bc30bcbf003fa5159c09a9723b9cc33b171e26641664fc9ebdffff0a7b6156c728ea9