rpms/switchdesk/devel .cvsignore, 1.26, 1.27 sources, 1.28, 1.29 switchdesk.spec, 1.46, 1.47

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/switchdesk/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17806

Modified Files:
	.cvsignore sources switchdesk.spec 
Log Message:
fixed 226443 - Merge Review



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	7 Jul 2010 12:30:38 -0000	1.26
+++ .cvsignore	7 Jul 2010 15:52:08 -0000	1.27
@@ -15,3 +15,4 @@ switchdesk-4.0.9-3.tar.bz2
 switchdesk-4.0.9-4.tar.bz2
 switchdesk-4.0.9-5.tar.bz2
 switchdesk-4.0.9-6.tar.bz2
+switchdesk-4.0.9-8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	7 Jul 2010 12:30:38 -0000	1.28
+++ sources	7 Jul 2010 15:52:09 -0000	1.29
@@ -1 +1 @@
-73f9164e7c5f7db4dfbfa774e6821f9e  switchdesk-4.0.9-6.tar.bz2
+aec9fa18218125a31835ede4cfa5a6c3  switchdesk-4.0.9-8.tar.bz2


Index: switchdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/devel/switchdesk.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- switchdesk.spec	7 Jul 2010 12:30:39 -0000	1.46
+++ switchdesk.spec	7 Jul 2010 15:52:09 -0000	1.47
@@ -1,16 +1,19 @@
-%define _release 6
+%define _release 8
+
 Name: switchdesk
 Summary: A desktop environment switcher
 Version: 4.0.9
 Release: %{_release}%{?dist}
-Url: http://fedorahosted.org/switchdesk
-Source: http://fedorahosted.org/switchdesk/%{name}-%{version}-%{_release}.tar.bz2
+Url: http://than.fedorapeople.org/
+Source: http://than.fedorapeople.org/%{name}-%{version}-%{_release}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: intltool
 BuildRequires: gettext
+BuildRequires: python-devel
+BuildRequires: desktop-file-utils
 
 %description
 The Desktop Switcher is a tool which enables users to easily switch
@@ -46,7 +49,8 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 mkdir -p %{buildroot}%{_datadir}/applications
-install -p -m 644 switchdesk.desktop %{buildroot}%{_datadir}/applications/
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+install -p -m 644 %{name}.desktop %{buildroot}%{_datadir}/applications/
 
 %find_lang %{name}
 
@@ -56,12 +60,11 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING
-%dir %{_datadir}/switchdesk
-%{_bindir}/switchdesk
-%{_bindir}/switchdesk-helper
-%{_datadir}/switchdesk/Xclients*
-%{_mandir}/man1/*
-%lang(fr)%{_mandir}/fr/man1/*
+%dir %{_datadir}/%{name}
+%{_bindir}/%{name}*
+%{_datadir}/%{name}/Xclients*
+%{_mandir}/man1/%{name}*
+%lang(fr)%{_mandir}/fr/man1/%{name}*
 
 %files gui -f %{name}.lang
 %defattr(-,root,root)
@@ -71,6 +74,12 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jul 07 2010 Than Ngo <than at redhat.com> - 4.0.9-8
+- fixed 226443 - Merge Review
+
+* Wed Jul 07 2010 Than Ngo <than at redhat.com> - 4.0.9-7
+- fixed 226443 - Merge Review
+
 * Wed Jul 07 2010 Than Ngo <than at redhat.com> - 4.0.9-6
 - fixed 226443 - Merge Review