[f21-backgrounds/f21] Add supplemental wallpapers.

[Martin Sourada]

commit 5a6de05fb6e6891f56d4e67ea0abcb618e0cf1fc
Author: Martin Sourada 
Date:   Thu Oct 30 10:23:28 2014 +0100

Add supplemental wallpapers.

.gitignore           |    1 +
 f21-backgrounds.spec |  137 +++++++++++++++++++++++++------------------------
 sources              |    2 +-
 3 files changed, 72 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 04a2c12..1dc1ec3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /f21-backgrounds-20.91.0.tar.xz
+/f21-backgrounds-21.0.0.tar.xz
diff --git a/f21-backgrounds.spec b/f21-backgrounds.spec
index 3408da7..86bf7ba 100644
--- a/f21-backgrounds.spec
+++ b/f21-backgrounds.spec
@@ -2,8 +2,8 @@
 %global Bg_Name F21

Name:           %{bgname}-backgrounds
-Version:        20.91.0
-Release:        2%{?dist}
+Version:        21.0.0
+Release:        1%{?dist}
 Summary:        Fedora 21 default desktop background

Group:          Applications/Multimedia
@@ -37,9 +37,9 @@ This package contains base images for Fedora 21 default background.
 #~ %package        animated
 #~ Summary:        Time of day images for Fedora 21 default background
 #~ Group:          Applications/Multimedia
-#~
+#~ 
 #~ Requires:       %{name}-base = %{version}-%{release}
-#~
+#~ 
 #~ %description    animated
 #~ This package contains the time of day images for F21
 #~ Backgrounds.
@@ -87,51 +87,51 @@ This package contains XFCE4 desktop background for the Fedora 21
 default theme.

# Extras will be enabled later
-#~ %package        extras-base
-#~ Summary:        Base images for F21 Extras Backrounds
-#~ Group:          Applications/Multimedia
-#~ License:        CC-BY and CC-BY-SA
-#~ 
-#~ %description    extras-base
-#~ This package contains base images for F21 supplemental
-#~ wallpapers.
-#~ 
-#~ %package        extras-gnome
-#~ Summary:        Extra F21 Wallpapers for Gnome and Cinnamon
-#~ Group:          Applications/Multimedia
-#~ 
-#~ Requires:       %{name}-extras-base
-#~ 
-#~ %description    extras-gnome
-#~ This package contains F21 supplemental wallpapers for Gnome
-#~ and Cinnamon
-#~ 
-#~ %package        extras-mate
-#~ Summary:        Extra F21 Wallpapers for Mate
-#~ Group:          Applications/Multimedia
-#~ 
-#~ Requires:       %{name}-extras-base
-#~ 
-#~ %description    extras-mate
-#~ This package contains F21 supplemental wallpapers for Mate
-#~ 
-#~ %package        extras-kde
-#~ Summary:        Extra F21 Wallpapers for KDE
-#~ Group:          Applications/Multimedia
-#~ 
-#~ Requires:       %{name}-extras-base
-#~ 
-#~ %description    extras-kde
-#~ This package contains F21 supplemental wallpapers for Gnome
-#~ 
-#~ %package        extras-xfce
-#~ Summary:        Extra F21 Wallpapers for XFCE
-#~ Group:          Applications/Multimedia
-#~ 
-#~ Requires:       %{name}-extras-base
-#~ 
-#~ %description    extras-xfce
-#~ This package contains F21 supplemental wallpapers for XFCE
+%package        extras-base
+Summary:        Base images for F21 Extras Backrounds
+Group:          Applications/Multimedia
+License:        CC-BY and CC-BY-SA
+
+%description    extras-base
+This package contains base images for F21 supplemental
+wallpapers.
+
+%package        extras-gnome
+Summary:        Extra F21 Wallpapers for Gnome and Cinnamon
+Group:          Applications/Multimedia
+
+Requires:       %{name}-extras-base
+
+%description    extras-gnome
+This package contains F21 supplemental wallpapers for Gnome
+and Cinnamon
+
+%package        extras-mate
+Summary:        Extra F21 Wallpapers for Mate
+Group:          Applications/Multimedia
+
+Requires:       %{name}-extras-base
+
+%description    extras-mate
+This package contains F21 supplemental wallpapers for Mate
+
+%package        extras-kde
+Summary:        Extra F21 Wallpapers for KDE
+Group:          Applications/Multimedia
+
+Requires:       %{name}-extras-base
+
+%description    extras-kde
+This package contains F21 supplemental wallpapers for Gnome
+
+%package        extras-xfce
+Summary:        Extra F21 Wallpapers for XFCE
+Group:          Applications/Multimedia
+
+Requires:       %{name}-extras-base
+
+%description    extras-xfce
+This package contains F21 supplemental wallpapers for XFCE

%prep
@@ -177,26 +177,29 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %files xfce
 %{_datadir}/xfce4/backdrops/%{bgname}.png

-#~ %files extras-base
-#~ %doc CC-BY-SA-3.0 CC-BY-2.0 CC0-1.0 Attribution-Extras
-#~ %{_datadir}/backgrounds/%{bgname}/extras/*.jpg
-#~ %{_datadir}/backgrounds/%{bgname}/extras/*.png
-#~ %{_datadir}/backgrounds/%{bgname}/extras/%{bgname}-extras.xml
-#~ 
-#~ %files extras-gnome
-#~ %{_datadir}/gnome-background-properties/%{bgname}-extras.xml
-#~ 
-#~ %files extras-kde
-#~ %{_kde4_datadir}/wallpapers/%{Bg_Name}_*/
-#~ 
-#~ %files extras-mate
-#~ %{_datadir}/mate-background-properties/%{bgname}-extras.xml
-#~ 
-#~ %files extras-xfce
-#~ %{_datadir}/xfce4/backdrops/*.jpg
-#~ %{_datadir}/xfce4/backdrops/*.png
+%files extras-base
+%doc CC-BY-SA-3.0 CC-BY-3.0 CC0-1.0 Attribution-Extras
+%{_datadir}/backgrounds/%{bgname}/extras/*.jpg
+%{_datadir}/backgrounds/%{bgname}/extras/*.png
+%{_datadir}/backgrounds/%{bgname}/extras/%{bgname}-extras.xml
+
+%files extras-gnome
+%{_datadir}/gnome-background-properties/%{bgname}-extras.xml
+
+%files extras-kde
+%{_kde4_datadir}/wallpapers/%{Bg_Name}_*/
+
+%files extras-mate
+%{_datadir}/mate-background-properties/%{bgname}-extras.xml
+
+%files extras-xfce
+%{_datadir}/xfce4/backdrops/*.jpg
+%{_datadir}/xfce4/backdrops/*.png

%changelog
+* Thu Oct 30 2014 Martin Sourada  - 21.0.0-1
+- Add extras
+
 * Sat Aug 23 2014 Martin Sourada  - 20.91.0-2
 - Rename to f21-backgrounds

diff --git a/sources b/sources
index d88b1ba..46b39ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52ec358ec52e1524187974b5b10ba399  f21-backgrounds-20.91.0.tar.xz
+80b2484ceb559c340bb5789f0cf2f8c3  f21-backgrounds-21.0.0.tar.xz