rpms/switchdesk/F-8 sources,1.22,1.23 switchdesk.spec,1.33,1.34

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/switchdesk/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15683

Modified Files:
	sources switchdesk.spec 
Log Message:
add better advice for kde install (#440670)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/F-8/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Jan 2007 14:22:31 -0000	1.22
+++ sources	26 Nov 2008 14:38:42 -0000	1.23
@@ -1 +1 @@
-10c5df8023db091ff4fa60d5792a27fa  switchdesk-4.0.8-7.tar.bz2
+91290a583ef662d52845cf504356bbde  switchdesk-4.0.9-3.tar.bz2


Index: switchdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/F-8/switchdesk.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- switchdesk.spec	22 Jan 2007 14:22:31 -0000	1.33
+++ switchdesk.spec	26 Nov 2008 14:38:42 -0000	1.34
@@ -1,13 +1,12 @@
-%define desktop_file 1
-
+%define _release 3
 Name: switchdesk
 Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel.
-Version: 4.0.8
-Release: 7
-Source: %{name}-%{version}-%{release}.tar.bz2
-License: GPL
+Version: 4.0.9
+Release: %{_release}%{?dist}
+Source: %{name}-%{version}-%{_release}.tar.bz2
+License: GPLv2+
 Group: User Interface/Desktops
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: intltool
 BuildRequires: gettext
@@ -40,7 +39,7 @@
 
 %prep
 
-%setup -q -n %{name}-%{version}-%{release}
+%setup -q -n %{name}-%{version}-%{_release}
 
 %build
 make
@@ -50,13 +49,8 @@
 
 make install DESTDIR=%{buildroot}
 
-%if %{desktop_file}
-    mkdir -p %{buildroot}%{_datadir}/applications
-    install -m 644 switchdesk.desktop %{buildroot}%{_datadir}/applications/
-%else
-    mkdir %{buildroot}/etc/X11/applnk/System
-    install -m 644 switchdesk.desktop %{buildroot}/etc/X11/applnk/System/
-%endif
+mkdir -p %{buildroot}%{_datadir}/applications
+install -p -m 644 switchdesk.desktop %{buildroot}%{_datadir}/applications/
 
 %find_lang %{name}
 
@@ -65,6 +59,7 @@
 
 %files
 %defattr(-,root,root)
+%dir %{_datadir}/switchdesk
 %{_bindir}/switchdesk
 %{_bindir}/switchdesk-helper
 %{_datadir}/switchdesk/Xclients*
@@ -76,13 +71,23 @@
 %{_datadir}/%{name}/pixmaps
 %{_datadir}/%{name}/*.glade
 %{_datadir}/%{name}/*.py*
-%if %{desktop_file}
 %{_datadir}/applications/*
-%else
-/etc/X11/applnk/System/*
-%endif
 
 %changelog
+* Wed Nov 26 2008 Than Ngo <than at redhat.com> -  4.0.9-3
+- add better advice for kde install (#440670)
+
+* Mon Mar 10 2008 Than Ngo <than at redhat.com> 4.0.9-2
+- update po files
+
+* Fri Mar 07 2008 Than Ngo <than at redhat.com> 4.0.9-1
+- 4.0.9
+   - remove obsolete translation (#335231)
+   - fix permission of po files (#435031)
+   - start fluxbox correctly (#415181)
+   - start icewm correctly (#288891)
+   - own /usr/share/switchdesk (#233917)
+
 * Mon Jan 22 2007 Than Ngo <than at redhat.com> - 4.0.8-7
 - fix #174513, it supports any window manager