rpms/knemo/devel .cvsignore, 1.5, 1.6 knemo.spec, 1.6, 1.7 sources, 1.5, 1.6 knemo-desktop-file-fix.patch, 1.3, NONE

[Francois Aucamp (faucamp)]

Author: faucamp

Update of /cvs/extras/rpms/knemo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30885

Modified Files:
	.cvsignore knemo.spec sources 
Removed Files:
	knemo-desktop-file-fix.patch 
Log Message:
- 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/knemo/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Aug 2006 20:59:55 -0000	1.5
+++ .cvsignore	17 Apr 2007 11:03:53 -0000	1.6
@@ -1 +1 @@
-12956-knemo-0.4.3.tar.bz2
+12956-knemo-0.4.7.tar.bz2


Index: knemo.spec
===================================================================
RCS file: /cvs/extras/rpms/knemo/devel/knemo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- knemo.spec	13 Sep 2006 19:41:54 -0000	1.6
+++ knemo.spec	17 Apr 2007 11:03:53 -0000	1.7
@@ -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 @@
 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 @@
 %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 @@
 
 
 %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 @@
 
 
 %changelog
+* Tue Apr 17 2007 Francois Aucamp <faucamp at csir.co.za> - 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 <hugo at devin.com.br> 0.4.3-2
 - Rebuilt for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/knemo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Aug 2006 20:59:55 -0000	1.5
+++ sources	17 Apr 2007 11:03:53 -0000	1.6
@@ -1 +1 @@
-70509dee1b4a86ef70ac2a3c032ece9b  12956-knemo-0.4.3.tar.bz2
+daaeeca789f3d4d7616f7856b29b7db7  12956-knemo-0.4.7.tar.bz2


--- knemo-desktop-file-fix.patch DELETED ---