rpms/leonidas-backgrounds/devel .cvsignore, 1.2, 1.3 leonidas-backgrounds.spec, 1.1, 1.2 sources, 1.2, 1.3

Fri Apr 10 19:45:31 UTC 2009

Author: mso

Update of /cvs/extras/rpms/leonidas-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6719

Modified Files:
	.cvsignore leonidas-backgrounds.spec sources 
Log Message:


Add lion backgrounds, split -common, -kdm and -landscape subpackges.

-common contains wallpapers shared between GNOME and KDE
-kdm contains background for KDM
-landscape contains the wallpapers from beta




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leonidas-backgrounds/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	10 Mar 2009 07:12:56 -0000	1.2
+++ .cvsignore	10 Apr 2009 19:45:01 -0000	1.3
@@ -1 +1 @@
-leonidas-backgrounds-10.92.1.tar.lzma
+leonidas-backgrounds-10.93.0.tar.lzma


Index: leonidas-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/leonidas-backgrounds/devel/leonidas-backgrounds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leonidas-backgrounds.spec	10 Mar 2009 07:12:56 -0000	1.1
+++ leonidas-backgrounds.spec	10 Apr 2009 19:45:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           leonidas-backgrounds
-Version:        10.92.1
-Release:        2%{?dist}
+Version:        10.93.0
+Release:        1%{?dist}
 Summary:        Leonidas desktop backgrounds
 
 Group:          Applications/Multimedia
@@ -11,10 +11,13 @@
 # The source is only available from within this srpm.
 # Images in the source archive are basically crops/resizes of 
 # https://fedoraproject.org/w/uploads/e/e9/Artwork_F11_Betamockup1_n.jpg
+# and
+# https://fedoraproject.org/wiki/Image:King_4070x1536.jpg
 Source0:        %{name}-%{version}.tar.lzma
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+Requires:       %{name}-common = %{version}-%{release}
 
 %description
 This package contains desktop backgrounds for the leonidas theme.
@@ -22,27 +25,72 @@
 %prep
 %setup -q
 
+%package        common
+Summary:        Leonidas desktop backgrounds shared between GNOME and KDE
+Group:          Applications/Multimedia
+
+%description    common
+This package includes the common files used by both GNOME and KDE.
+
+%package        kdm
+Summary:        Leonidas desktop background for KDM
+Group:          Applications/Multimedia
+
+%description    kdm
+Leonidas desktop background used in KDM.
+
+%package        landscape
+Summary:        Leonidas desktop backgrounds with the landscape theme
+Group:          Applications/Multimedia
+
+%description    landscape
+This package includes additional Leonidas backgrounds based on the landscape
+theme that was used in F11 Leonidas Beta.
+
 
 %build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# copy image files
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/normal
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/wide
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/normal.dual
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/wide.dual
+# prepare the dir structure
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape/normal
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape/wide
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape/normal.dual
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape/wide.dual
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/normal
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/normalish
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/wide
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/normal.dual
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/normalish.dual
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/wide.dual
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
 
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/normal \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/wide \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/normal.dual \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/wide.dual \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
+# copy the landscape images
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/landscape/normal \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/landscape/wide \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/landscape/normal.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/landscape/wide.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape
+
+# copy the lion images
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/normal \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/normalish \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/wide \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/normal.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/normalish.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/wide.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
 
 # copy slideshow xml files
 cp -a $RPM_BUILD_DIR/%{name}-%{version}/leonidas.xml \
@@ -53,9 +101,10 @@
         $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
 
 # copy metadata xmls file
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
 cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-leonidas.xml \
         $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-leonidas-landscape.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,11 +113,46 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING
-%{_datadir}/backgrounds/leonidas
-%{_datadir}/gnome-background-properties
+%{_datadir}/gnome-background-properties/desktop-backgrounds-leonidas.xml
+%{_datadir}/backgrounds/leonidas/leonidas.xml
+%{_datadir}/backgrounds/leonidas/lion/normal.dual
+%{_datadir}/backgrounds/leonidas/lion/normalish.dual
+%{_datadir}/backgrounds/leonidas/lion/wide.dual
+
+%files common
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/leonidas
+%dir %{_datadir}/backgrounds/leonidas/lion
+%dir %{_datadir}/backgrounds/leonidas/lion/normal
+%dir %{_datadir}/backgrounds/leonidas/lion/normal/2048x1536
+%{_datadir}/backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.jpg
+%{_datadir}/backgrounds/leonidas/lion/normalish
+%{_datadir}/backgrounds/leonidas/lion/wide
 
+%files kdm
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/leonidas
+%dir %{_datadir}/backgrounds/leonidas/lion/normal
+%dir %{_datadir}/backgrounds/leonidas/lion/normal/2048x1536
+%{_datadir}/backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon-simple.png
+
+%files landscape
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/leonidas
+%{_datadir}/backgrounds/leonidas/landscape
+%{_datadir}/gnome-background-properties/desktop-backgrounds-leonidas-landscape.xml
+%{_datadir}/backgrounds/leonidas/leonidas_left.xml
+%{_datadir}/backgrounds/leonidas/leonidas_right.xml
 
 %changelog
+* Fri Apr 10 2009 Martin Sourada <mso at fedoraproject.org> - 10.93.0-1
+- Add lion backgrounds
+- Split -common (shared between GNOME and KDE), -kdm (simplified version for 
+  KDM) and -landscape (F11 Leonidas Beta wallpapers) subpackages
+
 * Mon Mar 09 2009 Martin Sourada <mso at fedoraproject.org> - 10.92.1-2
 - Add note about source (we are upstream and don't host the source elsewhere)
 - Don't pass -r to cp, it's already implied by -a


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leonidas-backgrounds/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2009 07:12:56 -0000	1.2
+++ sources	10 Apr 2009 19:45:01 -0000	1.3
@@ -1 +1 @@
-752c6291a5b344d9fdbe79d9cfc669a8  leonidas-backgrounds-10.92.1.tar.lzma
+90b5344be91a49c99c1484e956d022e0  leonidas-backgrounds-10.93.0.tar.lzma


