diff --git a/.gitignore b/.gitignore index 98040e5..cebac2a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /deepin-calculator-1.0.9.tar.gz /deepin-calculator-1.0.10.tar.gz /deepin-calculator-5.0.1.tar.gz +/deepin-calculator-5.6.0.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..38786ec --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,18 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: rpm/deepin-calculator.spec + +# add or remove files that should be synced +synced_files: + - rpm/deepin-calculator.spec + - .packit.yaml + +upstream_ref: 5.6.0.1 +upstream_package_name: deepin-calculator +# downstream (Fedora) RPM package name +downstream_package_name: deepin-calculator + +actions: + fix-spec-file: | + bash -c "sed -i -r \"0,/Version:/ s/Version:(\s*)\S*/Version:\1${PACKIT_PROJECT_VERSION}/\" rpm/deepin-calculator.spec" diff --git a/0001-chore.patch b/0001-chore.patch new file mode 100644 index 0000000..747f1b7 --- /dev/null +++ b/0001-chore.patch @@ -0,0 +1,38 @@ +From 0411f0a316d0fcfee5a0f5eff17a9bf30d7fed83 Mon Sep 17 00:00:00 2001 +From: jingzhou +Date: Thu, 29 Oct 2020 10:01:28 +0800 +Subject: [PATCH] =?UTF-8?q?chore:=20=E5=A2=9E=E5=8A=A0=E5=A4=B4=E6=96=87?= + =?UTF-8?q?=E4=BB=B6?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Qt5.15版本编译报错 + +Log: 增加头文件 + +link: +Change-Id: Ibdc1e29c39acbe7c70221d062448b020612673ae +Reviewed-on: http://gerrit.uniontech.com/c/nanjing/deepin-calculator/+/9460 +Reviewed-by: jingzhou +Reviewed-by: +Tested-by: +--- + src/views/simplelistdelegate.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/views/simplelistdelegate.cpp b/src/views/simplelistdelegate.cpp +index f95fa5f..e46dd3b 100644 +--- a/src/views/simplelistdelegate.cpp ++++ b/src/views/simplelistdelegate.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + + #include "dthememanager.h" +-- +2.26.2 + diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..0b7be24 --- /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.18.0. diff --git a/deepin-calculator.spec b/deepin-calculator.spec index df2e89c..30ada79 100644 --- a/deepin-calculator.spec +++ b/deepin-calculator.spec @@ -1,17 +1,28 @@ Name: deepin-calculator -Version: 5.0.1 -Release: 3%{?dist} +Version: 5.6.0.1 +Release: 1%{?dist} Summary: An easy to use calculator for ordinary users License: GPLv3 URL: https://github.com/linuxdeepin/deepin-calculator Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# PATCHES FROM SOURCE GIT: + +# chore: 增加头文件 +# Author: jingzhou +Patch0001: 0001-chore.patch + + BuildRequires: qt5-linguist +BuildRequires: cmake BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(dtkwidget) >= 2.0 +BuildRequires: pkgconfig(Qt5Multimedia) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(dframeworkdbus) BuildRequires: desktop-file-utils Requires: hicolor-icon-theme @@ -19,30 +30,31 @@ Requires: hicolor-icon-theme %{summary}. %prep -%setup -q -sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh +%autosetup -p1 sed -i 's|59 Temple Place, Suite 330|51 Franklin Street, Fifth Floor|; - s|Boston, MA 02111-1307 USA.|Boston, MA 02110-1335, USA.|' math/*.{c,h} + s|Boston, MA 02111-1307 USA.|Boston, MA 02110-1335, USA.|' src/math/*.{c,h} %build -%qmake_qt5 PREFIX=%{_prefix} -%make_build +%cmake +%cmake_build %install -%make_install INSTALL_ROOT=%{buildroot} +%cmake_install %check -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %files %doc README.md %license LICENSE %{_bindir}/%{name} -%{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %changelog +* Wed Nov 11 2020 Robin Lee - 5.6.0.1-1 +- new upstream release: 5.6.0.1 + * Mon Jul 27 2020 Fedora Release Engineering - 5.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index bd6a941..eec29a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (deepin-calculator-5.0.1.tar.gz) = 34e4abd117b26a796b91dd7550b86674f92f331cf0f7463fa7d0ab085260d189deb165d77658ccf2be43f79ac14db81a77b266c3bc14f98fea2516f2ba40cd61 +SHA512 (deepin-calculator-5.6.0.1.tar.gz) = b5b6cb108b8e8f350f493390482801dda297a64c4d8f1dae306553c19b9dc9a316f9e377701de606c27361a16045651c931c599dd936973599cc83e5e65a79f9