rpms/beryl-manager/devel beryl-manager.spec, 1.8, 1.9 beryl-manager.desktop, 1.2, NONE

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv857

Modified Files:
	beryl-manager.spec 
Removed Files:
	beryl-manager.desktop 
Log Message:
remove duplicate desktop file


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- beryl-manager.spec	5 Feb 2007 15:10:11 -0000	1.8
+++ beryl-manager.spec	6 Feb 2007 15:57:51 -0000	1.9
@@ -3,12 +3,11 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.9999.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Beryl window decorator and theme management utility
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
-Source1:        beryl-manager.desktop
 Patch0:         beryl-manager-0.1.4-pidof.patch
 
 # libdrm is not available on these arches
@@ -46,9 +45,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora %{SOURCE1}
+  --add-category X-Fedora \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 # Fix up xy_XY to just xy
 for lang in ar_AR gl_GL my_MY sk_SK tr_TR
 do
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Tue Feb 06 2007 Jarod Wilson <jwilson at redhat.com> 0.1.9999.1-2
+- Remove duplicate desktop file
+
 * Mon Feb 05 2007 Jarod Wilson <jwilson at redhat.com> 0.1.9999.1-1
 - beryl 0.1.9999.1 (aka 0.2.0-rc1)
 


--- beryl-manager.desktop DELETED ---