[zukini] Update to latest upstream version (2012.07.08); add a common subpackage which owns files that are co

[odysseus]

commit 4a4a89f0032bc74747d8032b3864284e1bd59934
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Sun Jul 15 08:48:53 2012 +0200

    Update to latest upstream version (2012.07.08); add a common subpackage which owns files that are common to all themes.

 sources                          |    2 +-
 zukini-20120702-rmnotavail.patch |   22 ----------------
 zukini-20120708-rmnotavail.patch |   12 +++++++++
 zukini.spec                      |   51 ++++++++++++++++++++++---------------
 4 files changed, 43 insertions(+), 44 deletions(-)
---
diff --git a/sources b/sources
index d007ee9..c35dfcf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7695d4e72961d273b11750a2bd5363e  zukini_by_lassekongo83-d4ic1u2.zip
+b0f84e2abe8ed6a303da066fd2ab827e  zukini_by_lassekongo83-d4ic1u2.zip
diff --git a/zukini-20120708-rmnotavail.patch b/zukini-20120708-rmnotavail.patch
new file mode 100644
index 0000000..14062ae
--- /dev/null
+++ b/zukini-20120708-rmnotavail.patch
@@ -0,0 +1,12 @@
+diff -up ./Zukini/gnome-shell/gnome-shell.css.orig ./Zukini/gnome-shell/gnome-shell.css
+--- ./Zukini/gnome-shell/gnome-shell.css.orig	2012-07-08 08:59:12.000000000 +0200
++++ ./Zukini/gnome-shell/gnome-shell.css	2012-07-12 06:13:18.136031629 +0200
+@@ -25,7 +25,7 @@
+ 
+ /* default text style */
+ stage {
+-	font-family: Ubuntu, Droid Sans, Trebuchet MS, Liberation Sans, sans-serif;
++	font-family: Droid Sans, Liberation Sans, sans-serif;
+ 	font-size: 9pt; /* The default font size. */
+ 	color: white;
+ }
diff --git a/zukini.spec b/zukini.spec
index 058e614..cbfeb34 100644
--- a/zukini.spec
+++ b/zukini.spec
@@ -4,7 +4,7 @@
 %global tag           d4ic1u2
 
 Name:           zukini
-Version:        20120702
+Version:        20120708
 Release:        1%{?dist}
 Summary:        Themes for GTK+2, GTK+3, Metacity and GNOME Shell
 Group:          User Interface/Desktops
@@ -16,7 +16,7 @@ Source0:        http://www.deviantart.com/download/%{deviantart_id}/%{name}_by_%
 # This patch removes "Ubuntu" and "Trebuchet MS" from "font-family" in 
 # gnome-shell.css (because these fonts are not available in Fedora) and a 
 # reference to Unity-related stuff from Zukini/gtk-3.0/gtk.css.
-Patch0:         zukini-20120702-rmnotavail.patch
+Patch0:         %{name}-%{version}-rmnotavail.patch
 
 BuildArch:      noarch      
 
@@ -25,40 +25,48 @@ The %{theme_name} themes for GTK+2, GTK+3, Metacity and GNOME Shell, created by
 %{author}.
 
 
+%package common
+Summary:        Files common to %{theme_name} themes
+Group:          User Interface/Desktops
+
+%description common
+Files which are common to all %{theme_name} themes.
+
+
 %package gtk2-theme
-Summary:        Zukini GTK+2 themes
+Summary:        %{theme_name} GTK+2 themes
 Group:          User Interface/Desktops
-Requires:       gtk-murrine-engine >= 0.98.1.1 gtk2-engines
+Requires:       %{name}-common = %{version}-%{release}, gtk-murrine-engine >= 0.98.1.1, gtk2-engines
 
 %description gtk2-theme
-Themes for GTK+2 as part of the Zukini theme.
+Themes for GTK+2 as part of the %{theme_name} theme.
 
 
 %package gtk3-theme
-Summary:        Zukini GTK+3 themes
+Summary:        %{theme_name} GTK+3 themes
 Group:          User Interface/Desktops
-Requires:       gtk-unico-engine >= 1.0.2
+Requires:       %{name}-common = %{version}-%{release}, gtk-unico-engine >= 1.0.2
 
 %description gtk3-theme
-Themes for GTK+3 as part of the Zukini theme.
+Themes for GTK+3 as part of the %{theme_name} theme.
 
 
 %package metacity-theme
-Summary:        Zukini Metacity themes
+Summary:        %{theme_name} Metacity themes
 Group:          User Interface/Desktops
-Requires:       metacity
+Requires:       %{name}-common = %{version}-%{release}, metacity
 
 %description metacity-theme
-Themes for Metacity as part of the Zukini theme.
+Themes for Metacity as part of the %{theme_name} theme.
 
 
 %package -n gnome-shell-theme-%{name}
-Summary:        Zukini GNOME Shell theme
+Summary:        %{theme_name} GNOME Shell theme
 Group:          User Interface/Desktops
-Requires:       gnome-shell-extension-user-theme >= 3.4 google-droid-sans-fonts
+Requires:       %{name}-common = %{version}-%{release}, gnome-shell-extension-user-theme >= 3.4, google-droid-sans-fonts
 
 %description -n gnome-shell-theme-%{name}
-Zukini GNOME Shell theme.
+%{theme_name} GNOME Shell theme.
 
 
 %prep
@@ -85,31 +93,32 @@ mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{theme_name}
 cp -pr %{theme_name}/* %{buildroot}%{_datadir}/themes/%{theme_name}
 
 
-%files gtk2-theme
+%files common
 %doc COPYING README
 %dir %{_datadir}/themes/%{theme_name}/
+
+
+%files gtk2-theme
 %{_datadir}/themes/%{theme_name}/gtk-2.0/
 
 
 %files gtk3-theme
-%doc COPYING README
-%dir %{_datadir}/themes/%{theme_name}/
 %{_datadir}/themes/%{theme_name}/gtk-3.0/
 
 
 %files metacity-theme
-%doc COPYING README
-%dir %{_datadir}/themes/%{theme_name}/
 %{_datadir}/themes/%{theme_name}/metacity-1/
 
 
 %files -n gnome-shell-theme-%{name}
-%doc COPYING README
-%dir %{_datadir}/themes/%{theme_name}/
 %{_datadir}/themes/%{theme_name}/gnome-shell/
 
 
 %changelog
+* Sun Jul 15 2012 Mattia Meneguzzo <odysseus at fedoraproject.org> - 20120708-1
+- Update to latest upstream version
+- Add a "common" subpackage which owns files that are common to all themes
+
 * Sat Jul 07 2012 Mattia Meneguzzo <odysseus at fedoraproject.org> - 20120702-1
 - Update to latest upstream version