rpms/gdesklets/F-9 gdesklets.spec,1.36,1.37

[Luya Tshimbalanga]

Author: luya

Update of /cvs/pkgs/rpms/gdesklets/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28587

Modified Files:
	gdesklets.spec 
Log Message:
upstream update and clean up


Index: gdesklets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdesklets/F-9/gdesklets.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gdesklets.spec	23 Feb 2008 09:49:49 -0000	1.36
+++ gdesklets.spec	20 Nov 2008 19:52:33 -0000	1.37
@@ -1,15 +1,15 @@
 #%define alphatag beta
 
 Name:		gdesklets
-Version:	0.36
+Version:	0.36.1
 Release:	1%{?dist}
 Summary:	An interactive Imlib2 console for the X Window system
 
 Group:		User Interface/Desktops
 License:	GPL+
 
-URL:		http://www.gdesklets.de/
-Source0:	http://gdesklets.de/files/gdesklets-%{version}.tar.bz2
+URL:		http://www.%{name}.de/
+Source0:	http://%{name}.de/files/%{name}-%{version}.tar.bz2
 Patch0:		transition.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,24 +40,21 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 %find_lang %{name}
 
 desktop-file-install --vendor=fedora  \
-	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+	--dir %{buildroot}%{_datadir}/applications \
 	--add-category X-Fedora \
 	--add-category Application \
 	--add-category Utility \
 	data/%{name}.desktop
 
-mkdir -p  ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/,%{_datadir}/%{name}/Displays/,%{_datadir}/%{name}/Controls/}
-ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png
-ln -sf ../../%{_libdir}/%{name}/%{name} ${RPM_BUILD_ROOT}%{_bindir}/%{name}
-
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/application
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses,mime.cache}
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/{%{name}.desktop,mimeinfo.cache}
+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}/mime/{globs2,generic-icons,icons,treemagic,types}
 
 
 %post
@@ -68,7 +65,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files -f %{name}.lang
@@ -85,6 +82,11 @@
 
 
 %changelog
+* Thu Nov 20 2008 Luya Tshimbalanga <luya at fedoraproject.org> - 0.36.1-1
+- Updated from upstream
+- Removed autogenerated-mime data for integrating check
+  courtesy of Christian Krause (chkr at plauener.de)
+
 * Fri Feb 22 2008 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.36-1
 - Update from upstream
 - Added libcap-devel for dependancy