diff --git a/ukui-system-monitor-0.1.1.tar.gz b/ukui-system-monitor-0.1.1.tar.gz deleted file mode 100644 index a07686c6909a133d15bd35035dc2939e9ac5dc3a..0000000000000000000000000000000000000000 Binary files a/ukui-system-monitor-0.1.1.tar.gz and /dev/null differ diff --git a/ukui-system-monitor-1.0.1.tar.gz b/ukui-system-monitor-1.0.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..cc6686ef309543dae5a4ab3154410113009e2b85 Binary files /dev/null and b/ukui-system-monitor-1.0.1.tar.gz differ diff --git a/ukui-system-monitor.spec b/ukui-system-monitor.spec index fd16c057788dc31330e3a0718b4e6c8ec6060b53..5482faae987acddcf735f840e2ae17ef7386adbe 100644 --- a/ukui-system-monitor.spec +++ b/ukui-system-monitor.spec @@ -1,6 +1,6 @@ %define debug_package %{nil} Name: ukui-system-monitor -Version: 0.1.1 +Version: 1.0.1 Release: 1 Summary: A simple system monitor written in QT License: GPL-3+ GPL-2+ @@ -18,6 +18,8 @@ BuildRequires: libgtop2-devel BuildRequires: systemd-devel >= 209 BuildRequires: gsettings-qt-devel BuildRequires: qt5-qtx11extras-devel +BuildRequires: libpcap-devel +BuildRequires: kf5-kwindowsystem-devel #Requires: inotify-hookable #Requires: bsdutils @@ -28,6 +30,7 @@ Requires: lshw Requires: dmidecode Requires: kernel-tools Requires: pciutils +Requires: libpcap #patch0: fix-monitor-default.patch @@ -39,27 +42,36 @@ A simple system monitor written in QT #%%patch0 -p1 %build -#mkdir build && cd build -qmake-qt5 -make +export PATH=%{_qt5_bindir}:$PATH +mkdir qmake-build +pushd qmake-build +%{qmake_qt5} .. +%{make_build} +popd %install -rm -rf $RPM_BUILD_ROOT -#make INSTALL_ROOT=/root/rpmbuild/BUILDROOT install - -mkdir -p %{buildroot}/usr/bin/ -cp -rf %{_builddir}/%{name}-%{version}/ukui-system-monitor %{buildroot}/usr/bin/ukui-system-monitor +pushd qmake-build +%{make_install} INSTALL_ROOT=%{buildroot} +popd -mkdir -p %{buildroot}/usr/share/applications/ -cp -rf %{_builddir}/%{name}-%{version}/ukui-system-monitor.desktop %{buildroot}/usr/share/applications/ukui-system-monitor.desktop +%post +setcap "cap_net_admin,cap_net_raw+ep" /usr/bin/ukui-system-monitor +set -e +glib-compile-schemas /usr/share/glib-2.0/schemas/ %clean rm -rf $RPM_BUILD_ROOT %files +%doc debian/changelog %{_bindir}/ukui-system-monitor %{_datadir}/applications/ukui-system-monitor.desktop +%{_datadir}/icons/hicolor/ukui-system-monitor.png +%{_datadir}/glib-2.0/schemas/org.ukui.system-monitor.menu.gschema.xml %changelog +* Mon Oct 26 2020 douyan - 1.0.1-1 +- update to upstream version 1.0.0-1+1027 + * Thu Jul 9 2020 douyan - 0.1.1-1 - Init package for openEuler \ No newline at end of file