rpms/solar-backgrounds/devel solar-backgrounds.spec,1.4,1.5

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	solar-backgrounds.spec 
Log Message:
Revert the -common split for now, waiting for the final wallpapers and directory layout.


Index: solar-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-backgrounds/devel/solar-backgrounds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- solar-backgrounds.spec	28 Oct 2008 17:36:51 -0000	1.4
+++ solar-backgrounds.spec	29 Oct 2008 15:13:36 -0000	1.5
@@ -1,7 +1,7 @@
 Name:           solar-backgrounds
 Version:        0.90.0
-Release:        2%{?dist}
-Summary:        Solar desktop backgrounds for GNOME
+Release:        1%{?dist}
+Summary:        Solar desktop backgrounds
 
 Group:          Applications/Multimedia
 License:        CC-BY-SA
@@ -11,20 +11,8 @@
 
 BuildArch:      noarch
 
-Requires:       %{name}-common = %{version}-%{release}
-
 %description
-This package contains desktop backgrounds for the Solar theme, to be used in
-the GNOME desktop environment.
-
-%package common
-Group:          Applications/Multimedia
-Summary:        Solar desktop backgrounds shared between GNOME and KDE
-
-%description common
-This package includes the common files for the solar-backgrounds and
-solar-kde-theme packages.
-
+This package contains desktop backgrounds for the Solar theme.
 
 %prep
 %setup -q -n solar-%{version}
@@ -55,28 +43,16 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING
-%{_datadir}/backgrounds/solar/solar-dual-0-morn.png
-%{_datadir}/backgrounds/solar/solar-*-1-noon.png
-%{_datadir}/backgrounds/solar/solar-*-2-evening.png
-%{_datadir}/backgrounds/solar/solar-*-3-night.png
+%dir %{_datadir}/backgrounds
+%dir %{_datadir}/backgrounds/solar
+%{_datadir}/backgrounds/solar/*.png
 %{_datadir}/backgrounds/solar/solar.xml
 %dir %{_datadir}/gnome-background-properties
 %{_datadir}/gnome-background-properties/desktop-backgrounds-solar.xml
 
-%files common
-%defattr(-,root,root,-)
-%dir %{_datadir}/backgrounds
-%dir %{_datadir}/backgrounds/solar
-%{_datadir}/backgrounds/solar/solar-normal-0-morn.png
-%{_datadir}/backgrounds/solar/solar-normalish-0-morn.png
-%{_datadir}/backgrounds/solar/solar-wide-0-morn.png
 
 
 %changelog
-* 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