diff --git a/0001-correction-the-desktop-file.patch b/0001-correction-the-desktop-file.patch new file mode 100644 index 0000000..f8ecc6f --- /dev/null +++ b/0001-correction-the-desktop-file.patch @@ -0,0 +1,37 @@ +From c51c0b63ae60a63b4948ea832edaba965da3d1bd Mon Sep 17 00:00:00 2001 +From: tanyulong2021 +Date: Tue, 7 Feb 2023 09:18:30 +0800 +Subject: [PATCH] correction the desktop file + +--- + debian/control | 2 +- + indicator-china-weather.desktop | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/debian/control b/debian/control +index 8d0e1c7..34ca1d9 100644 +--- a/debian/control ++++ b/debian/control +@@ -2,7 +2,7 @@ Source: indicator-china-weather + Section: utils + Priority: optional + Maintainer: lixiang +-Build-Depends: debhelper-compat (=12), ++Build-Depends: debhelper-compat (>=9), + qtbase5-dev, + qt5-qmake, + qtchooser, +diff --git a/indicator-china-weather.desktop b/indicator-china-weather.desktop +index 8a77f48..b374c40 100644 +--- a/indicator-china-weather.desktop ++++ b/indicator-china-weather.desktop +@@ -13,5 +13,5 @@ Icon=indicator-china-weather + Terminal=false + Type=Application + X-GNOME-Autostart-Delay=10 +-Categories=System;Utility; ++Categories=System Settings Security; + X-UKUI-AutoRestart=true; +-- +2.33.0 + diff --git a/indicator-china-weather.spec b/indicator-china-weather.spec index c730b1d..7e3a929 100644 --- a/indicator-china-weather.spec +++ b/indicator-china-weather.spec @@ -1,12 +1,12 @@ -%define debug_package %{nil} Name: indicator-china-weather Version: 3.1.3 -Release: 2 +Release: 4 Summary: The weather data are from the heweather API s6 version. License: GPL-3.0+ URL: https://github.com/UbuntuKylin/indicator-china-weather Source0: %{name}-%{version}.tar.gz -Patch01: 0001-modify-version-info-error.patch +Patch01: 0001-correction-the-desktop-file.patch +Patch02: 0001-modify-version-info-error.patch BuildRequires: qtchooser BuildRequires: qt5-qtx11extras-devel @@ -30,8 +30,7 @@ BuildRequires: GeoIP-devel change it. %prep -%setup -q -%patch1 -p1 +%autosetup -n %{name}-%{version} -p1 %build %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default indicator-china-weather.pro @@ -63,12 +62,67 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/man/man1/indicator-china-weather.1.gz %changelog -* Mon Mar 14 2022 pei-jiankang - 3.1.3-2 -- modify version-info error +* Tue Mar 14 2023 douyan - 3.1.3-4 +- sync with master, add 0001-correction-the-desktop-file.patch -* Thu Mar 03 2022 tanyulong - 3.1.3-1 +* Tue Feb 07 2023 tanyulong - 3.1.3-3 +- correction the desktop file + +* Mon Feb 06 2023 peijiankang - 3.1.3-2 +- add build debuginfo and debugsource + +* Wed Aug 03 2022 peijiankang - 3.1.3-1 - update to uptream version 3.1.3 +* Thu Jul 14 2022 tanyulong - 3.1.0-18 +- The application category is changed to system + +* Wed Jul 13 2022 tanyulong - 3.1.0-17 +- update translation file + +* Wed Jul 13 2022 tanyulong - 3.1.0-16 +- Update ts file and add today translation + +* Mon Jul 11 2022 peijiankang - 3.1.0-15 +- 解决按钮反白的问题 + +* Wed Jun 29 2022 peijiankang - 3.1.0-14 +- 修复菜单按钮hover样式异常 + +* Wed Jun 29 2022 peijiankang - 3.1.0-13 +- 网络异常情况下隐藏托盘icon + +* Tue Jun 28 2022 peijiankang - 3.1.0-12 +- Increase the drag bar of forecast part + +* Mon Jun 27 2022 peijiankang - 3.1.0-11 +- update translation file + +* Fri Jun 24 2022 peijiankang - 3.1.0-10 +- add-X-UKUI-AutoRestart filed in desktop + +* Fri Jun 24 2022 peijiankang - 3.1.0-9 +- Modified kylin-weather display is incomplete + +* Mon Jan 10 2022 douyan - 3.1.0-8 +- add fix-auto-get-location.patch + +* Wed Dec 8 2021 douyan - 3.1.0-7 +- update to upstream version 3.1.0-36 +- fix open failed caused by gsetting + +* Tue Dec 7 2021 douyan - 3.1.0-6 +- update to upstream version 3.1.0-34 + +* Thu Oct 28 2021 douyan - 3.1.0-5 +- fetch upstream release to 3.1.0-33 + +* Wed Oct 27 2021 douyan - 3.1.0-4 +- fix city name display issue when offline + +* Tue Oct 26 2021 douyan - 3.1.0-3 +- fix vnc show issue + * Tue Jan 19 2021 lvhan - 3.1.0-2 - remove about diff --git a/indicator-china-weather.yaml b/indicator-china-weather.yaml index 85ac03b..3749f92 100644 --- a/indicator-china-weather.yaml +++ b/indicator-china-weather.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: UbuntuKylin/indicator-china-weather -tag_prefix: "indicator-china-weather-" -seperator: "." \ No newline at end of file +tag_prefix: "^v" +separator: "."