diff --git a/.gitignore b/.gitignore index 0f8b920..7512ba1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /dde-network-utils-0.0.9.tar.gz /dde-network-utils-5.0.1.tar.gz /dde-network-utils-5.1.0.2.tar.gz +/dde-network-utils-5.3.0.5.tar.gz diff --git a/.packit.yaml b/.packit.yaml index f7776ad..9f62dec 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -14,4 +14,6 @@ downstream_package_name: deepin-network-utils actions: fix-spec-file: | - bash -c "sed -i -r \"s/Version:(\s*)\S*/Version:\1${PACKIT_PROJECT_VERSION}/\" rpm/deepin-network-utils.spec" + bash -c "sed -i -r \"0,/Version:/ s/Version:(\s*)\S*/Version:\1${PACKIT_PROJECT_VERSION}/\" rpm/deepin-network-utils.spec" + post-upstream-clone: | + cp rpm/dde-network-utils.spec rpm/deepin-network-utils.spec diff --git a/README.packit b/README.packit index 73ac72c..0b7be24 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.16.1.dev31+g5d22fb7. +The file was generated using packit 0.18.0. diff --git a/deepin-network-utils.spec b/deepin-network-utils.spec index 84c9a80..33dcf7a 100644 --- a/deepin-network-utils.spec +++ b/deepin-network-utils.spec @@ -1,17 +1,26 @@ %global repo dde-network-utils +%if 0%{?fedora} Name: deepin-network-utils -Version: 5.1.0.2 +%else +Name: %{repo} +%endif +Version: 5.3.0.5 Release: 1%{?dist} Summary: Deepin desktop-environment - network utils License: GPLv3 URL: https://github.com/linuxdeepin/dde-network-utils +%if 0%{?fedora} Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz +%else +Source0: %{name}_%{version}.orig.tar.xz +%endif BuildRequires: gcc-c++ -BuildRequires: pkgconfig(dframeworkdbus) >= 2.0 +BuildRequires: pkgconfig(dframeworkdbus) BuildRequires: pkgconfig(Qt5Core) BuildRequires: qt5-linguist +BuildRequires: pkgconfig(gsettings-qt) %description Deepin desktop-environment - network utils. @@ -24,11 +33,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Header files and libraries for %{name}. %prep -%setup -q -n %{repo}-%{version} -sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh +%autosetup -p1 -n %{repo}-%{version} sed -i 's|/lib$|/%{_lib}|' dde-network-utils.pro %build +# help find (and prefer) qt5 utilities, e.g. qmake, lrelease +export PATH=%{_qt5_bindir}:$PATH %qmake_qt5 PREFIX=%{_prefix} %make_build @@ -47,6 +57,9 @@ sed -i 's|/lib$|/%{_lib}|' dde-network-utils.pro %{_libdir}/lib*.so %changelog +* Tue Nov 10 2020 Robin Lee - 5.3.0.5-1 +- new upstream release: 5.3.0.5 + * Tue Sep 29 2020 Robin Lee - 5.1.0.2-1 - new upstream release: 5.1.0.2 diff --git a/sources b/sources index 620e313..eac4418 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dde-network-utils-5.1.0.2.tar.gz) = a68bd8c0174a0170722511f2a09f858fbeffc9d7cf8b2d5dd64fc42a5b846172e9d810bf7db2e2e70bc6267cc80a86e8dc02564c095b2373259b2294adcfba04 +SHA512 (dde-network-utils-5.3.0.5.tar.gz) = 7ac8ba86b492bcb0614e559cc0228e5cf1d4146d83a92e27562c18bb83d856bb331ed890bbcb1d0d818c98c9686ca28cd9b66f5bf6327c0070c5108bde4be66f