From 6835ff342e86de51d42c96dff4a954e0b68b9514ac04cb4c1eb084ef6c2b2ade Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Tue, 6 Jun 2023 16:08:14 +0000 Subject: [PATCH] Accepting request 1091111 from home:slbtongying:branches:Education - Drop the version.txt patch OBS-URL: https://build.opensuse.org/request/show/1091111 OBS-URL: https://build.opensuse.org/package/show/Education/goldendict-ng?expand=0&rev=8 --- ...ct-ng-replace-version-txt-generation.patch | 19 ------------------- goldendict-ng.changes | 5 +++++ goldendict-ng.spec | 1 - 3 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 goldendict-ng-replace-version-txt-generation.patch diff --git a/goldendict-ng-replace-version-txt-generation.patch b/goldendict-ng-replace-version-txt-generation.patch deleted file mode 100644 index e37dbe5..0000000 --- a/goldendict-ng-replace-version-txt-generation.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./goldendict.pro 2023-06-05 07:46:03.433741407 -0400 -+++ ./goldendict.pro.orgi 2023-06-05 08:14:30.474500795 -0400 -@@ -7,15 +7,9 @@ - # rebuilt; and doing it here is required too since any other way the RCC - # compiler would complain if version.txt wouldn't exist (fresh checkouts). - --system(git describe --tags --always --dirty): hasGit=1 -- --!isEmpty(hasGit){ -- GIT_HASH=$$system(git rev-parse --short=8 HEAD ) --} -- - !exists( version.txt ) { - message( "generate version.txt...." ) -- system(echo $${VERSION}.$${GIT_HASH} on $${_DATE_} > version.txt) -+ system(echo "openSUSE" > version.txt) - } - - diff --git a/goldendict-ng.changes b/goldendict-ng.changes index e9f85e9..9878738 100644 --- a/goldendict-ng.changes +++ b/goldendict-ng.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 6 15:03:42 UTC 2023 - slb + +- Drop the version.txt patch + ------------------------------------------------------------------- Mon Jun 5 12:31:28 UTC 2023 - shenlebantongying diff --git a/goldendict-ng.spec b/goldendict-ng.spec index bdf4abe..cc2e5ca 100644 --- a/goldendict-ng.spec +++ b/goldendict-ng.spec @@ -25,7 +25,6 @@ License: GPL-3.0-or-later Group: Productivity/Office/Dictionary URL: https://xiaoyifang.github.io/goldendict-ng/ Source0: %{name}-%{version}.tar.xz -Patch0: %{name}-replace-version-txt-generation.patch BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: git