sergiomb pushed to gdesklets (f22). "added patch addressing memory leak"

[notifications at fedoraproject.org]

From a1eb553eed4f1c8585f741fbd1ac89a60736f64c Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya at fedoraproject.org>
Date: Sat, 7 Apr 2012 21:27:40 -0700
Subject: added patch addressing memory leak


diff --git a/gdesklets.spec b/gdesklets.spec
index 9093f4d..6bb15fc 100644
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@ -1,16 +1,17 @@
 #%define alphatag beta
 
 Name:		gdesklets
-Version:	0.36.3
-Release:	2%{?dist}
-Summary:	Architecture for desktop applets
+Version:		0.36.3
+Release:		3%{?dist}
+Summary:		Architecture for desktop applets
 
 Group:		User Interface/Desktops
-License:	GPL+
+License:		GPL+
 
-URL:		http://%{name}.de/
-Source0:	http://%{name}.de/files/%{name}-%{version}.tar.bz2
+URL:			http://%{name}.de/
+Source0:		http://%{name}.de/files/%{name}-%{version}.tar.bz2
 Patch0:		transition.patch
+Patch1:		gdesklets-desktop.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
@@ -31,6 +32,7 @@ bars, weather sensors, news tickers.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .transition
+%patch1 -p3 -b .gdesklets-desktop
 
 %build
 %configure \
@@ -41,20 +43,17 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 %find_lang %{name}
-
-desktop-file-install --vendor=fedora  \
-	--dir %{buildroot}%{_datadir}/applications \
-	--add-category Application \
-	--add-category Utility \
-	%{buildroot}/%{_datadir}/%{name}.desktop
-
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+desktop-file-install --vendor="fedora"  					\
+	--delete-original									\
+	--dir=%{buildroot}%{_datadir}/applications			 	\
+		%{buildroot}%{_datadir}/applications/%{name}.desktop	\
+	
 
 mkdir -p  %{buildroot}{%{_bindir},%{_datadir}/%{name}/data/,%{_datadir}/%{name}/Displays/,%{_datadir}/%{name}/Controls/}
 
 rm -rf %{buildroot}%{_datadir}/mime/application
 rm -rf %{buildroot}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses,mime.cache}
-rm -f %{buildroot}%{_datadir}/applications/{%{name}.desktop,mimeinfo.cache}
+rm -f %{buildroot}%{_datadir}/applications/{mimeinfo.cache}
 rm -f %{buildroot}%{_datadir}/mime/{globs2,generic-icons,icons,treemagic,types}
 
 
@@ -77,14 +76,19 @@ rm -rf %{buildroot}
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
 #%{_datadir}/pixmaps/%{name}.png
 %{_sysconfdir}/xdg/autostart/%{name}.desktop
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/applications/%{name}.desktop.in
+%{_datadir}/applications/*.desktop
+%{_datadir}/applications/*.desktop.in
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Mar 20 2012 Luya Tshimbalanga <luya at fedoraproject.org> - 0.36.3-3
+- Adhered to Fedora guideline for desktop declaration
+- Ported patch from OpenSuse spec version
+- Patch addressing memory leak (rhbz #747420, launchpad #190894)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gdesklets.git/commit/?h=f22&id=a1eb553eed4f1c8585f741fbd1ac89a60736f64c