rpms/beryl-settings/devel beryl-settings.spec,1.7,1.8

Jarod Wilson (jwilson) fedora-extras-commits at redhat.com
Tue Feb 6 16:42:47 UTC 2007


Author: jwilson

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

Modified Files:
	beryl-settings.spec 
Log Message:
Get rid of duplicate desktop entries


Index: beryl-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/devel/beryl-settings.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- beryl-settings.spec	5 Feb 2007 16:47:03 -0000	1.7
+++ beryl-settings.spec	6 Feb 2007 16:42:14 -0000	1.8
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.9999.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager GUI config utility
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,13 +76,15 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora %{name}.desktop
+  --add-category X-Fedora \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 # beryl-settings-simple
 pushd beryl-settings-simple-%{version}
 make DESTDIR=$RPM_BUILD_ROOT install
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora %{name}-simple.desktop
+  --add-category X-Fedora \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-simple.desktop
 popd
 find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f
 %find_lang %{name}
@@ -129,6 +131,9 @@
 
 
 %changelog
+* Tue Feb 06 2007 Jarod Wilson <jwilson at redhat.com> 0.1.9999.1-3
+- Get rid of duplicate desktop entries
+
 * Mon Feb 05 2007 Jarod Wilson <jwilson at redhat.com> 0.1.9999.1-2
 - Fix pkg-config path so this actually builds
 - Reshuffle build section a bit




More information about the scm-commits mailing list