rpms/solar-backgrounds/devel .cvsignore, 1.4, 1.5 solar-backgrounds.spec, 1.5, 1.6 sources, 1.4, 1.5

[Martin Sourada]

Author: mso

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

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


New version, split -common and -extras subpackages, fixed wallpapers and new
size/ratio variants.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/solar-backgrounds/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2008 19:30:57 -0000	1.4
+++ .cvsignore	29 Oct 2008 23:04:22 -0000	1.5
@@ -1 +1 @@
-solar-0.90.0.tar.gz
+solar-0.91.0.tar.gz


Index: solar-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/solar-backgrounds/devel/solar-backgrounds.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- solar-backgrounds.spec	29 Oct 2008 15:13:36 -0000	1.5
+++ solar-backgrounds.spec	29 Oct 2008 23:04:22 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           solar-backgrounds
-Version:        0.90.0
+Version:        0.91.0
 Release:        1%{?dist}
 Summary:        Solar desktop backgrounds
 
@@ -14,6 +14,24 @@
 %description
 This package contains desktop backgrounds for the Solar theme.
 
+%package        common
+Summary:        Solar desktop backgrounds shared between GNOME and KDE
+Group:          Applications/Multimedia
+
+%description    common
+This package includes the common files for the solar-backgrounds-extras and
+solar-kde-theme packages.
+
+%package        extras
+Summary:        Solar HD desktop backgrounds
+Group:          Applications/Multimedia
+
+%description    extras
+This package includes more resolutions for the Solar theme desktop backgrounds.
+
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+
 %prep
 %setup -q -n solar-%{version}
 
@@ -25,15 +43,34 @@
 rm -rf $RPM_BUILD_ROOT
 # copy image files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar
-cp -a $RPM_BUILD_DIR/solar-%{version}/*.png \
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar/standard
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar/standard.dual
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar/wide
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar/wide.dual
+
+cp -a -r $RPM_BUILD_DIR/solar-%{version}/standard \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar
+cp -a -r $RPM_BUILD_DIR/solar-%{version}/standard.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar 
+cp -a -r $RPM_BUILD_DIR/solar-%{version}/wide \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar
+cp -a -r $RPM_BUILD_DIR/solar-%{version}/wide.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar
+cp -a -r $RPM_BUILD_DIR/solar-%{version}/normalish \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar
+cp -a -r $RPM_BUILD_DIR/solar-%{version}/normalish.dual \
         $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar
-# copy slideshow xml file
+# copy slideshow xml files
 cp -a $RPM_BUILD_DIR/solar-%{version}/solar.xml \
         $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar
-# copy metadata xml file
+cp -a $RPM_BUILD_DIR/solar-%{version}/solar-hd.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar
+# copy metadata xmls file
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
 cp -a $RPM_BUILD_DIR/solar-%{version}/desktop-backgrounds-solar.xml \
         $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+cp -a $RPM_BUILD_DIR/solar-%{version}/desktop-backgrounds-solar-hd.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
 
 
 %clean
@@ -45,14 +82,57 @@
 %doc COPYING
 %dir %{_datadir}/backgrounds
 %dir %{_datadir}/backgrounds/solar
-%{_datadir}/backgrounds/solar/*.png
-%{_datadir}/backgrounds/solar/solar.xml
+%dir %{_datadir}/backgrounds/solar/standard
+%dir %{_datadir}/backgrounds/solar/wide
 %dir %{_datadir}/gnome-background-properties
+%{_datadir}/backgrounds/solar/standard/1600x1200
+%{_datadir}/backgrounds/solar/wide/1680x1050
+%{_datadir}/backgrounds/solar/solar.xml
 %{_datadir}/gnome-background-properties/desktop-backgrounds-solar.xml
 
+%files common
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds
+%dir %{_datadir}/backgrounds/solar/standard
+%dir %{_datadir}/backgrounds/solar/wide
+%dir %{_datadir}/backgrounds/solar/normalish
+%dir %{_datadir}/backgrounds/solar/standard/2048x1536
+%dir %{_datadir}/backgrounds/solar/wide/1920x1200
+%dir %{_datadir}/backgrounds/solar/normalish/1280x1024
+%{_datadir}/backgrounds/solar/standard/2048x1536/solar-0-morn.png
+%{_datadir}/backgrounds/solar/wide/1920x1200/solar-0-morn.png
+%{_datadir}/backgrounds/solar/normalish/1280x1024/solar-0-morn.png
+
+%files extras
+%defattr(-,root,root,-)
+%doc COPYING
+%{_datadir}/backgrounds/solar/standard.dual
+%{_datadir}/backgrounds/solar/wide.dual
+%{_datadir}/backgrounds/solar/normalish.dual
+%{_datadir}/backgrounds/solar/standard/1024x768
+%{_datadir}/backgrounds/solar/standard/2048x1536/solar-1-noon.png
+%{_datadir}/backgrounds/solar/standard/2048x1536/solar-2-evening.png
+%{_datadir}/backgrounds/solar/standard/2048x1536/solar-3-night.png
+%{_datadir}/backgrounds/solar/wide/1920x1200/solar-1-noon.png
+%{_datadir}/backgrounds/solar/wide/1920x1200/solar-2-evening.png
+%{_datadir}/backgrounds/solar/wide/1920x1200/solar-3-night.png
+%{_datadir}/backgrounds/solar/normalish/1280x1024/solar-1-noon.png
+%{_datadir}/backgrounds/solar/normalish/1280x1024/solar-2-evening.png
+%{_datadir}/backgrounds/solar/normalish/1280x1024/solar-3-night.png
+%{_datadir}/backgrounds/solar/solar-hd.xml
+%{_datadir}/gnome-background-properties/desktop-backgrounds-solar-hd.xml
 
 
 %changelog
+* Tue Oct 28 2008 Maritn Sourada <mso at fedoraproject.org> - 0.90.1-1
+- Split into basic wallpapers with standard resolution (for Live CD Spins) and
+  -extras package with more resolutions
+
+* Tue Oct 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.90.0-2
+- Split out a -common so we can symlink the wallpapers we need in the KDE theme
+- without having to require all the ones we can't use.
+
 * Wed Oct 15 2008 Martin Sourada <mso at fedoraproject.org> - 0.90.0-1
 - New release, adds dual screen wallpapers
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/solar-backgrounds/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2008 19:30:57 -0000	1.4
+++ sources	29 Oct 2008 23:04:22 -0000	1.5
@@ -1 +1 @@
-e2089c4129a655b1e449a4d74740b024  solar-0.90.0.tar.gz
+e039ab6477eba77456b61f62b67fd41c  solar-0.91.0.tar.gz