rpms/knemo/devel .cvsignore, 1.8, 1.9 knemo.spec, 1.17, 1.18 sources, 1.9, 1.10

[nucleo]

Author: nucleo

Update of /cvs/pkgs/rpms/knemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25236

Modified Files:
	.cvsignore knemo.spec sources 
Log Message:
update to 0.5.80 (0.6.0 beta1)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	1 Apr 2009 01:40:56 -0000	1.8
+++ .cvsignore	6 Nov 2009 00:45:03 -0000	1.9
@@ -1 +1 @@
-12956-knemo-0.5.2.tar.gz
+12956-knemo-0.5.80.tar.gz


Index: knemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/devel/knemo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- knemo.spec	25 Jul 2009 04:41:15 -0000	1.17
+++ knemo.spec	6 Nov 2009 00:45:03 -0000	1.18
@@ -1,6 +1,6 @@
 Name:             knemo
-Version:          0.5.2
-Release:          2%{?dist}
+Version:          0.5.80
+Release:          1%{?dist}
 Summary:          A KDE network monitoring tool
 Group:            Applications/Internet
 License:          GPLv2+
@@ -8,10 +8,7 @@ URL:              http://extragear.kde.o
 Source0:          http://kde-apps.org/CONTENT/content-files/12956-%{name}-%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake desktop-file-utils gettext
-BuildRequires:    kdelibs4-devel wireless-tools-devel net-tools
-Requires:         wireless-tools net-tools
-Requires(post):   xdg-utils
-Requires(postun): xdg-utils
+BuildRequires:    kdelibs4-devel wireless-tools-devel libnl-devel
 
 %description
 KNemo displays for every network interface an icon in the systray. Tooltips
@@ -32,41 +29,52 @@ popd
 make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=${RPM_BUILD_ROOT} -C %{_target_platform}
-
-desktop-file-install \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
-    $RPM_BUILD_ROOT%{_datadir}/applications/kde4/%{name}.desktop
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang %{name}
 %find_lang kcm_%{name}
 cat kcm_%{name}.lang >> %{name}.lang
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
+%clean
+rm -rf %{buildroot}
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
-%{_kde4_bindir}/knemo
+%{_kde4_bindir}/%{name}
 %{_kde4_libdir}/kde4/kcm_knemo.so
-%{_kde4_appsdir}/knemo/
-%{_kde4_datadir}/applications/kde4/knemo.desktop
+%{_kde4_appsdir}/%{name}
+%{_kde4_datadir}/applications/kde4/%{name}.desktop
 %{_kde4_datadir}/kde4/services/kcm_knemo.desktop
-%{_kde4_datadir}/autostart/knemo.desktop
-%{_kde4_iconsdir}/hicolor/*/apps/knemo.*
+%{_kde4_datadir}/autostart/%{name}.desktop
+%{_kde4_iconsdir}/hicolor/*/apps/%{name}*
+%{_kde4_iconsdir}/hicolor/22x22/status/%{name}*
 
 %changelog
+* Fri Nov  6 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.80-1
+- update to 0.5.80 (0.6.0 beta1)
+- drop xdg-utils references
+- removed Requires net-tools wireless-tools
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Apr 2009 01:40:56 -0000	1.9
+++ sources	6 Nov 2009 00:45:03 -0000	1.10
@@ -1 +1 @@
-ab4c9519f5dcfe46530edf3d9f24b647  12956-knemo-0.5.2.tar.gz
+d8e5600eda795c1acc1ec56dd5242391  12956-knemo-0.5.80.tar.gz