From 7f0e62123ea1aae102643b37f0af38c3ffcf1618 Mon Sep 17 00:00:00 2001 From: Francois Aucamp Date: Apr 17 2007 11:03:53 +0000 Subject: - Update to version 0.4.7 - Removed unnecessary desktop-file-install statements (KDE-specific desktop files) - Removed desktop file patch - desktop file "Keywords" keys used internally by KDE - Added "OnlyShowIn=KDE" to kcm desktop file - Removed unnecessary BuildRequires: qt-devel desktop-file-utils - Simplified %post and %postun scriplets - Use RPM_BUILD_ROOT variable format consistently --- diff --git a/.cvsignore b/.cvsignore index 54383ed..eac3092 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -12956-knemo-0.4.3.tar.bz2 +12956-knemo-0.4.7.tar.bz2 diff --git a/knemo-desktop-file-fix.patch b/knemo-desktop-file-fix.patch deleted file mode 100644 index 6c26691..0000000 --- a/knemo-desktop-file-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/kcm/kcm_knemo.desktop.orig 2006-08-06 17:57:58.000000000 -0300 -+++ src/kcm/kcm_knemo.desktop 2006-08-06 17:58:15.000000000 -0300 -@@ -63,19 +63,4 @@ - Comment[xx]=xxMonitor network interfacesxx - Comment[zh_CN]=监视网络接口 - --Keywords=knemo,network monitor,wlan monitor,wifi monitor,ethernet monitor,wireless monitor,systray --Keywords[cs]=knemo,monitor sítě,monitor wlan,monitor wifi,monitor ethernetu,monitor bezdrátového připojení,systray --Keywords[da]=knemo,netværksovervågning,WLAN-overvågning,WIFI-overvågning,Ethernet-overvågning,trådløs overvågning,statusfelt --Keywords[de]=knemo,netzwerk-monitor,wlan-monitor,wifi-monitor,ethernet-monitor,wireless-monitor,kontrollleiste,überwachung,netzwerk,drahtlos-monitor --Keywords[el]=knemo,επόπτης δικτύου,επόπτης wlan,επόπτης wifi,επόπτης ethernet, επόπτης wireless,πλαίσιο συστήματος --Keywords[es]=knemo,monitor de red,monitor de wlan,monitor wifi,monitor de ethernet,monitor inalámbrico,bandeja del sistema --Keywords[et]=knemo,võrgumonitor,wlan monitor,wifi monitor,ethernet monitor,traadita võrgu monitor,süsteemne salv --Keywords[it]=knemo,monitor di rete,wlan monitor,monitor senza fili,ethernet monitor,vassoio di sistema --Keywords[ja]=knemo,ネットワークモニタ,wlan モニタ,wifi モニタ,ethernet モニタ,ワイヤレスモニタ,システムトレイ --Keywords[nl]=knemo,netwerkmonitor,wlan-monitor,wifi-monitor,ethernetmonitor,wireless-monitor,systeemvak --Keywords[pt]=knemo,monitor da rede,monitor de wlan,monitor wifi,monitor de ethernet,monitor sem-fios,bandeja do sistema --Keywords[pt_BR]=knemo,monitor de rede,wlan,monitor de wifi monitor,monitor ethernet monitor,monitor de wireless,painel do sistema, mini-aplicativo --Keywords[sv]=knemo,nätverksövervakning,WLAN-övervakning,WIFI-övervakning,Ethernet-övervakning,trådlös övervakning,systembricka --Keywords[xx]=xxknemo,network monitor,wlan monitor,wifi monitor,ethernet monitor,wireless monitor,systrayxx -- --Categories=Qt;KDE;X-KDE-settings-network -+Categories=Qt;KDE;X-KDE-settings-network; diff --git a/knemo.spec b/knemo.spec index f998feb..5a71608 100644 --- a/knemo.spec +++ b/knemo.spec @@ -1,19 +1,16 @@ Name: knemo -Version: 0.4.3 -Release: 2%{?dist} +Version: 0.4.7 +Release: 1%{?dist} Summary: A KDE network monitoring tool Group: Applications/Internet License: GPL URL: http://extragear.kde.org/apps/knemo/ Source0: http://kde-apps.org/content/files/12956-%{name}-%{version}.tar.bz2 -Patch0: knemo-desktop-file-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gettext, qt-devel, kdelibs-devel, desktop-file-utils -BuildRequires: wireless-tools, net-tools - -Requires: kdebase, wireless-tools, net-tools +BuildRequires: gettext kdelibs-devel wireless-tools net-tools +Requires: kdebase wireless-tools net-tools %description KNemo displays for every network interface an icon in the systray. Tooltips @@ -22,9 +19,10 @@ popups inform about interface changes. A traffic plotter is also integrated. It polls the network interface status every second using the ifconfig, route and iwconfig tools. + %prep %setup -q -%patch0 -p0 +echo "OnlyShowIn=KDE;" >> src/kcm/kcm_knemo.desktop %build @@ -37,19 +35,10 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -#rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la - -desktop-file-install --vendor="" \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \ - --add-category X-Fedora \ - --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kcm_knemo.desktop -desktop-file-install --vendor="" \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/services/kded \ - --add-category X-Fedora \ - --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/services/kded/knemod.desktop +# We do not use desktop-file-install to rename/validate the desktop files for +# this application, as it uses "Keywords" keys that are used internally by KDE +# - desktop-file-validate and -install do not like those %find_lang kcm_knemo kcm_knemo.lang %find_lang knemod knemod.lang @@ -57,16 +46,13 @@ cat kcm_knemo.lang knemod.lang > knemo.lang %post -touch --no-create %{_datadir}/icons/crystalsvg || : -if [ -x ${_bindir}/gtk-update-icon-cache ] ; then - ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : -fi +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + %postun -touch --no-create %{_datadir}/icons/crystalsvg || : -if [ -x ${_bindir}/gtk-update-icon-cache ] ; then - ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : -fi +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean @@ -89,6 +75,17 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 17 2007 Francois Aucamp - 0.4.7-1 +- Update to version 0.4.7 +- Removed unnecessary desktop-file-install statements (KDE-specific desktop + files) +- Removed desktop file patch - desktop file "Keywords" keys used internally + by KDE +- Added "OnlyShowIn=KDE" to kcm desktop file +- Removed unnecessary BuildRequires: qt-devel desktop-file-utils +- Simplified %%post and %%postun scriplets +- Use RPM_BUILD_ROOT variable format consistently + * Wed Sep 13 2006 Hugo Cisneiros 0.4.3-2 - Rebuilt for FC6 diff --git a/sources b/sources index 8dad7d7..1e8094f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70509dee1b4a86ef70ac2a3c032ece9b 12956-knemo-0.4.3.tar.bz2 +daaeeca789f3d4d7616f7856b29b7db7 12956-knemo-0.4.7.tar.bz2