rpms/solar-kde-theme/devel solar-kde-theme.spec,1.10,1.11

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/solar-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3077/devel

Modified Files:
	solar-kde-theme.spec 
Log Message:
* Thu Oct 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.10-2
- use backgrounds from solar-backgrounds-common (>= 0.91.0, with the new look)
- support aspect ratios in the KDM theme
- add some more 4:3 and 8:5 resolutions to the symlink lists (KDM, wallpapers)
- use solar_wide.png for 800x480 and 1024x600 in KDM and wallpapers


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/solar-kde-theme.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- solar-kde-theme.spec	27 Oct 2008 15:47:27 -0000	1.10
+++ solar-kde-theme.spec	30 Oct 2008 03:08:48 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		solar-kde-theme
 Version:	0.1.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
@@ -13,6 +13,7 @@
 BuildRequires:	kde-filesystem
 Requires:	kde-filesystem
 Requires:	system-logos >= 10.0.0-2
+Requires:       solar-backgrounds-common >= 0.91.0
 
 
 %description
@@ -33,14 +34,40 @@
 
 # wallpapers
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers
-cp -rp wallpapers/solar.png* %{buildroot}%{_kde4_datadir}/wallpapers/
-cp -rp wallpapers/solar_wide.png* %{buildroot}%{_kde4_datadir}/wallpapers/
-cp -rp wallpapers/solar_high.png* %{buildroot}%{_kde4_datadir}/wallpapers/
+ln -sf ../backgrounds/solar/standard/2048x1536/solar-0-morn.png %{buildroot}%{_kde4_datadir}/wallpapers/solar.png
+ln -sf ../backgrounds/solar/wide/1920x1200/solar-0-morn.png %{buildroot}%{_kde4_datadir}/wallpapers/solar_wide.png
+ln -sf ../backgrounds/solar/normalish/1280x1024/solar-0-morn.png %{buildroot}%{_kde4_datadir}/wallpapers/solar_high.png
+cp -p wallpapers/solar.png.desktop %{buildroot}%{_kde4_datadir}/wallpapers/
+cp -p wallpapers/solar_wide.png.desktop %{buildroot}%{_kde4_datadir}/wallpapers/
+cp -p wallpapers/solar_high.png.desktop %{buildroot}%{_kde4_datadir}/wallpapers/
 
 # KDM
 mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/themes/
 cp -rp kdm/SolarMania/ %{buildroot}/%{_kde4_appsdir}/kdm/themes/
-ln -s ../../../../../wallpapers/solar.png %{buildroot}/%{_kde4_appsdir}/kdm/themes/SolarMania/
+(cd %{buildroot}/%{_kde4_appsdir}/kdm/themes/SolarMania/
+ln -s ../../../../../wallpapers/solar.png solar-640x480.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../../wallpapers/solar_wide.png solar-800x480.png
+ln -s ../../../../../wallpapers/solar.png solar-800x600.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../../wallpapers/solar_wide.png solar-1024x600.png
+ln -s ../../../../../wallpapers/solar.png solar-1024x768.png
+ln -s ../../../../../wallpapers/solar_wide.png solar-1152x720.png
+ln -s ../../../../../wallpapers/solar.png solar-1152x864.png
+ln -s ../../../../../wallpapers/solar_wide.png solar-1280x800.png
+ln -s ../../../../../wallpapers/solar.png solar-1280x960.png
+ln -s ../../../../../wallpapers/solar_high.png solar-1280x1024.png
+ln -s ../../../../../wallpapers/solar_wide.png solar-1440x900.png
+ln -s ../../../../../wallpapers/solar.png solar-1440x1080.png
+ln -s ../../../../../wallpapers/solar.png solar-1600x1200.png
+ln -s ../../../../../wallpapers/solar_high.png solar-1600x1280.png
+ln -s ../../../../../wallpapers/solar_wide.png solar-1680x1050.png
+ln -s ../../../../../wallpapers/solar_wide.png solar-1920x1200.png
+ln -s ../../../../../wallpapers/solar.png solar-1920x1440.png
+ln -s ../../../../../wallpapers/solar.png solar-2048x1536.png
+# KDM falls back to this one if there's no match
+ln -s ../../../../../wallpapers/solar.png solar.png
+)
 
 mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/pics/users
 cp -rp kdm/users %{buildroot}/%{_kde4_appsdir}/kdm/pics
@@ -52,21 +79,32 @@
 ln -s ../../../../../../wallpapers/solar.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/2048x1536/solar.png
 mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1920x1200
 ln -s ../../../../../../wallpapers/solar_wide.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1920x1200/solar.png
-mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1600x1280
-ln -s ../../../../../../wallpapers/solar_high.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1600x1280/solar.png
+ln -s ../../../../../../wallpapers/solar_high.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/solar.png
 
 # KDE 4 wallpapers theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers/Solar/contents/images
 cp -rp wallpapers/Solar/metadata.desktop %{buildroot}%{_kde4_datadir}/wallpapers/Solar
 cp -rp wallpapers/Solar/screenshot.png %{buildroot}%{_kde4_datadir}/wallpapers/Solar/contents
 (cd %{buildroot}%{_kde4_datadir}/wallpapers/Solar/contents/images
+ln -s ../../../solar.png 640x480.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../solar_wide.png 800x480.png
+ln -s ../../../solar.png 800x600.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../solar_wide.png 1024x600.png
 ln -s ../../../solar.png 1024x768.png
+ln -s ../../../solar_wide.png 1152x720.png
+ln -s ../../../solar.png 1152x864.png
 ln -s ../../../solar_wide.png 1280x800.png
+ln -s ../../../solar.png 1280x960.png
 ln -s ../../../solar_high.png 1280x1024.png
 ln -s ../../../solar_wide.png 1440x900.png
+ln -s ../../../solar.png 1440x1080.png
 ln -s ../../../solar.png 1600x1200.png
 ln -s ../../../solar_high.png 1600x1280.png
+ln -s ../../../solar_wide.png 1680x1050.png
 ln -s ../../../solar_wide.png 1920x1200.png
+ln -s ../../../solar.png 1920x1440.png
 ln -s ../../../solar.png 2048x1536.png
 )
 
@@ -88,6 +126,12 @@
 
 
 %changelog
+* Thu Oct 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.10-2
+- use backgrounds from solar-backgrounds-common (>= 0.91.0, with the new look)
+- support aspect ratios in the KDM theme
+- add some more 4:3 and 8:5 resolutions to the symlink lists (KDM, wallpapers)
+- use solar_wide.png for 800x480 and 1024x600 in KDM and wallpapers
+
 * Mon Oct 27 2008 Than Ngo <than at redhat.com> 0.1.10-1
 - fix layout issue