rpms/leonidas-kde-theme/F-11 leonidas-kde-theme.spec,1.1,1.2

Jaroslav Reznik jreznik at fedoraproject.org
Tue Apr 21 16:10:44 UTC 2009 

Author: jreznik

Update of /cvs/pkgs/rpms/leonidas-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14884

Modified Files:
	leonidas-kde-theme.spec 
Log Message:
* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-1
- wallpaper screenshot
- fixes

* Fri Apr 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.1-1
- use KDM PNG for KDM, KSplash, JPGs for wallpaper
- does not link wallpapers to wallpapers directory

* Wed Apr 15 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-2
- fix license
- upstream url + source url



Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/leonidas-kde-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leonidas-kde-theme.spec	16 Apr 2009 18:07:33 -0000	1.1
+++ leonidas-kde-theme.spec	21 Apr 2009 16:10:42 -0000	1.2
@@ -1,14 +1,14 @@
 Name:		leonidas-kde-theme
-Version:	0.2.0
+Version:	0.2.2
 Release:	1%{?dist}
 Summary:	Leonidas KDE Theme
 
 Group:		User Interface/Desktops
-License:	GPLv2 and CC-BY-SA
+License:	GPLv2+ and CC-BY-SA
 
-URL:		https://fedoraproject.org/wiki/F11_Artwork
 # We are upstream for this package
-Source0:	%{name}-%{version}.tar.bz2
+URL:		https://fedorahosted.org/fedora-kde-artwork/
+Source0:	https://fedorahosted.org/releases/f/e/fedora-kde-artwork/%{name}-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 BuildRequires:	kde-filesystem
@@ -34,48 +34,18 @@
 rm -rf %{buildroot}
 
 # wallpapers
+# no more wallpapers links in wallpapers directory which causes all wp in list,
+# not only theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers
-ln -sf ../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas.png
-ln -sf ../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas_wide.png
-ln -sf ../backgrounds/leonidas/lion/normalish/1280x1024/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas_high.png
 
 # KDM
+# for KDM and splash we use PNG wallpaper from leonidas-kdm package
+# thus only one aspect ratio
+
 mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/themes/
 cp -rp kdm/leonidas/ %{buildroot}/%{_kde4_appsdir}/kdm/themes/
 (cd %{buildroot}/%{_kde4_appsdir}/kdm/themes/leonidas/
-ln -s ../../../../../wallpapers/leonidas.png leonidas-640x480.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-800x480.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-800x600.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1024x600.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1024x768.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1152x720.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1152x864.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1200x900.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x720.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x768.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x800.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1280x960.png
-#ln -s ../../../../../wallpapers/leonidas_high.png leonidas-1280x1024.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x1024.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1366x768.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1440x900.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1440x1080.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1600x1200.png
-#ln -s ../../../../../wallpapers/leonidas_high.png leonidas-1600x1280.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1600x1280.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1680x1050.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1920x1080.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1920x1200.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1920x1440.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-2048x1536.png
-# KDM falls back to this one if there's no match
-ln -s ../../../../../wallpapers/leonidas.png leonidas.png
+ln -s ../../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png leonidas.png
 )
 
 mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/pics/users
@@ -84,47 +54,46 @@
 # KSplash
 mkdir -p %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
 cp -rp ksplash/Leonidas/ %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
-mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536
-ln -s ../../../../../../wallpapers/leonidas.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/leonidas.png
-mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1920x1200
-ln -s ../../../../../../wallpapers/leonidas_wide.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1920x1200/leonidas.png
-ln -s ../../../../../../wallpapers/leonidas_high.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1280x1024/leonidas.png
-ln -s ../../../../../../pixmaps/system-logo-white.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1280x1024/logo.png
+ln -s ../../../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/leonidas.png
+
+# logo from fedora-logos package
+# TODO: remove old one from fedora-logos as we're using default one
+ln -s ../../../../../../pixmaps/system-logo-white.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
 
 # KDE 4 wallpapers theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents/images
 cp -rp wallpapers/leonidas/metadata.desktop %{buildroot}%{_kde4_datadir}/wallpapers/leonidas
-#cp -rp wallpapers/leonidas/screenshot.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents
+cp -rp wallpapers/leonidas/screenshot.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents
 (cd %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents/images
-ln -s ../../../leonidas.png 640x480.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 640x480.png
 # That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 800x480.png
-ln -s ../../../leonidas.png 800x600.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 800x480.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 800x600.png
 # That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1024x600.png
-ln -s ../../../leonidas.png 1024x768.png
-ln -s ../../../leonidas_wide.png 1152x720.png
-ln -s ../../../leonidas.png 1152x864.png
-ln -s ../../../leonidas.png 1200x900.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1280x720.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1280x768.png
-ln -s ../../../leonidas_wide.png 1280x800.png
-ln -s ../../../leonidas.png 1280x960.png
-ln -s ../../../leonidas_high.png 1280x1024.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1366x768.png
-ln -s ../../../leonidas_wide.png 1440x900.png
-ln -s ../../../leonidas.png 1440x1080.png
-ln -s ../../../leonidas.png 1600x1200.png
-ln -s ../../../leonidas_high.png 1600x1280.png
-ln -s ../../../leonidas_wide.png 1680x1050.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1920x1080.png
-ln -s ../../../leonidas_wide.png 1920x1200.png
-ln -s ../../../leonidas.png 1920x1440.png
-ln -s ../../../leonidas.png 2048x1536.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1024x600.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1024x768.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1152x720.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1152x864.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1200x900.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1280x720.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1280x768.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1280x800.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1280x960.png
+ln -s ../../../../backgrounds/leonidas/lion/normalish/1280x1024/leonidas-1-noon.png 1280x1024.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1366x768.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1440x900.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1440x1080.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1600x1200.png
+ln -s ../../../../backgrounds/leonidas/lion/normalish/1280x1024/leonidas-1-noon.png 1600x1280.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1680x1050.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1920x1080.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1920x1200.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1920x1440.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 2048x1536.png
 )
 
 
@@ -137,15 +106,24 @@
 %doc README COPYING.CC-BY-SA COPYING.GPLv2
 %{_kde4_appsdir}/kdm/themes/leonidas/
 %{_kde4_appsdir}/ksplash/Themes/Leonidas/
-%{_kde4_datadir}/wallpapers/leonidas.png
-%{_kde4_datadir}/wallpapers/leonidas_wide.png
-%{_kde4_datadir}/wallpapers/leonidas_high.png
 %{_kde4_datadir}/wallpapers/leonidas/
 #%{_kde4_appsdir}/kdm/pics/users/default_leonidas.png
 
 
 %changelog
-* Tue Apr 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-1
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-1
+- wallpaper screenshot
+- fixes
+
+* Fri Apr 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.1-1
+- use KDM PNG for KDM, KSplash, JPGs for wallpaper
+- does not link wallpapers to wallpapers directory
+
+* Wed Apr 15 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-2
+- fix license
+- upstream url + source url 
+ 
+* Tue Apr 7 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-1
 - updated to lion theme
 
 * Tue Mar 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.0-1

More information about the scm-commits mailing list