rpms/switchdesk/devel .cvsignore, 1.25, 1.26 sources, 1.27, 1.28 switchdesk.spec, 1.45, 1.46

[Than Ngo]

Author: than

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

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.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	29 Sep 2009 16:24:21 -0000	1.25
+++ .cvsignore	7 Jul 2010 12:30:38 -0000	1.26
@@ -14,3 +14,4 @@ switchdesk-4.0.9-2.tar.bz2
 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	29 Sep 2009 16:24:21 -0000	1.27
+++ sources	7 Jul 2010 12:30:38 -0000	1.28
@@ -1 +1 @@
-82d3586aa07defc44d200e8ca50966e3  switchdesk-4.0.9-5.tar.bz2
+73f9164e7c5f7db4dfbfa774e6821f9e  switchdesk-4.0.9-6.tar.bz2


Index: switchdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/devel/switchdesk.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- switchdesk.spec	29 Sep 2009 16:24:21 -0000	1.45
+++ switchdesk.spec	7 Jul 2010 12:30:39 -0000	1.46
@@ -1,9 +1,10 @@
-%define _release 5
+%define _release 6
 Name: switchdesk
-Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel.
+Summary: A desktop environment switcher
 Version: 4.0.9
 Release: %{_release}%{?dist}
-Source: %{name}-%{version}-%{_release}.tar.bz2
+Url: http://fedorahosted.org/switchdesk
+Source: http://fedorahosted.org/switchdesk/%{name}-%{version}-%{_release}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,8 +14,7 @@ BuildRequires: gettext
 
 %description
 The Desktop Switcher is a tool which enables users to easily switch
-between various desktop environments that they have installed.  The
-tool includes support for KDE, GNOME, XFce4 and twm.
+between various desktop environments that they have installed.
 
 Support for different environments on different computers is available, as
 well as support for setting a global default environment.
@@ -24,14 +24,10 @@ environments.
 
 %package gui
 Group: User Interface/Desktops
-Summary: A graphical interface for the Desktop Switcher.
-Requires: %{name}
+Summary: A graphical interface for the Desktop Switcher
+Requires: %{name} = %{version}-%{release}
 Requires: python
 Requires: pygtk2
-Obsoletes: %{name}-kde
-Obsoletes: %{name}-gnome
-Provides: %{name}-kde
-Provides: %{name}-gnome
 
 %description gui
 The switchdesk-gui package provides the graphical user interface for
@@ -42,7 +38,7 @@ the Desktop Switcher.
 %setup -q -n %{name}-%{version}-%{_release}
 
 %build
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -59,6 +55,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS COPYING
 %dir %{_datadir}/switchdesk
 %{_bindir}/switchdesk
 %{_bindir}/switchdesk-helper
@@ -74,6 +71,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jul 07 2010 Than Ngo <than at redhat.com> - 4.0.9-6
+- fixed 226443 - Merge Review
+
 * Tue Sep 29 2009 Than Ngo <than at redhat.com> - 4.0.9-5
 - update po files 
 
@@ -187,7 +187,7 @@ rm -rf %{buildroot}
 
 * Wed Nov 13 2002 Mike A. Harris <mharris at redhat.com> 3.9.8-11
 - Changed ./configure to rpm %%configure macro so libdir is set right on x86_64
-- More prefix/share -> %{_datadir} fixes, removal of {prefix}, and usage of
+- More prefix/share -> %%{_datadir} fixes, removal of {prefix}, and usage of
   {_prefix} instead
 - Changed make install to %%makeinstall macro
 
@@ -369,10 +369,3 @@ rm -rf %{buildroot}
 
 * Wed Feb 03 1999 Preston Brown <pbrown at redhat.com>
 - initial revision of spec file.
-
-
-
-
-
-
-