[zukitwo] Update to latest upstream version (2012.07.08)

Sun Jul 15 08:02:23 UTC 2012

commit 6acab8f14dc7492c6921a3c9a4556cd9f29b35bd
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Sun Jul 15 10:02:05 2012 +0200

    Update to latest upstream version (2012.07.08)

 sources                                            |    2 +-
 ...vail.patch => zukitwo-20120708-rmnotavail.patch |   12 ++--
 zukitwo.spec                                       |   51 ++++++++++---------
 3 files changed, 34 insertions(+), 31 deletions(-)
---

diff --git a/sources b/sources
index 80d56f2..79ddc11 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-41c454e475e979e0e5d53b670efab067  zukitwo_by_lassekongo83-d3df2ot.zip
+1931da8fa375a0de20ae7af10419e195  zukitwo_by_lassekongo83-d3df2ot.zip
diff --git a/zukitwo-20120702-rmnotavail.patch b/zukitwo-20120708-rmnotavail.patch
similarity index 68%
rename from zukitwo-20120702-rmnotavail.patch
rename to zukitwo-20120708-rmnotavail.patch
index 50b4a14..2749cbf 100644
--- a/zukitwo-20120702-rmnotavail.patch
+++ b/zukitwo-20120708-rmnotavail.patch
@@ -1,6 +1,6 @@
 diff -up ./Zukitwo-Dark/gtk-3.0/gtk.css.orig ./Zukitwo-Dark/gtk-3.0/gtk.css
---- ./Zukitwo-Dark/gtk-3.0/gtk.css.orig	2012-07-07 08:13:22.285610289 +0200
-+++ ./Zukitwo-Dark/gtk-3.0/gtk.css	2012-07-07 08:16:58.354919788 +0200
+--- ./Zukitwo-Dark/gtk-3.0/gtk.css.orig	2012-07-08 08:59:12.000000000 +0200
++++ ./Zukitwo-Dark/gtk-3.0/gtk.css	2012-07-15 09:55:26.468700767 +0200
 @@ -61,6 +61,5 @@
  @import url("apps/gnome-panel.css");
  @import url("apps/gnome-terminal.css");
@@ -9,8 +9,8 @@ diff -up ./Zukitwo-Dark/gtk-3.0/gtk.css.orig ./Zukitwo-Dark/gtk-3.0/gtk.css
  @import url("apps/popover.css");
  @import url("apps/epiphany.css");
 diff -up ./Zukitwo/gtk-3.0/gtk.css.orig ./Zukitwo/gtk-3.0/gtk.css
---- ./Zukitwo/gtk-3.0/gtk.css.orig	2012-07-07 08:13:07.399004314 +0200
-+++ ./Zukitwo/gtk-3.0/gtk.css	2012-07-07 08:16:41.834137544 +0200
+--- ./Zukitwo/gtk-3.0/gtk.css.orig	2012-07-08 08:59:12.000000000 +0200
++++ ./Zukitwo/gtk-3.0/gtk.css	2012-07-15 09:54:51.327931945 +0200
 @@ -60,6 +60,5 @@
  @import url("apps/gnome-panel.css");
  @import url("apps/gnome-terminal.css");
@@ -19,8 +19,8 @@ diff -up ./Zukitwo/gtk-3.0/gtk.css.orig ./Zukitwo/gtk-3.0/gtk.css
  @import url("apps/popover.css");
  @import url("apps/epiphany.css");
 diff -up ./Zukitwo-Shell/gnome-shell/gnome-shell.css.orig ./Zukitwo-Shell/gnome-shell/gnome-shell.css
---- ./Zukitwo-Shell/gnome-shell/gnome-shell.css.orig	2012-07-07 08:13:47.836366717 +0200
-+++ ./Zukitwo-Shell/gnome-shell/gnome-shell.css	2012-07-07 08:17:32.870643305 +0200
+--- ./Zukitwo-Shell/gnome-shell/gnome-shell.css.orig	2012-07-08 08:59:12.000000000 +0200
++++ ./Zukitwo-Shell/gnome-shell/gnome-shell.css	2012-07-15 09:56:07.740127067 +0200
 @@ -25,7 +25,7 @@
  
  /* default text style */
diff --git a/zukitwo.spec b/zukitwo.spec
index 7ef64ec..d4814c6 100644
--- a/zukitwo.spec
+++ b/zukitwo.spec
@@ -4,7 +4,7 @@
 %global tag           d3df2ot
 
 Name:           zukitwo
-Version:        20120702
+Version:        20120708
 Release:        1%{?dist}
 Summary:        Themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4
 Group:          User Interface/Desktops
@@ -17,7 +17,7 @@ Source0:        http://www.deviantart.com/download/%{deviantart_id}/%{name}_by_%
 # gnome-shell.css (because these fonts are not available in Fedora) and two 
 # references to Unity-related stuff from Zukitwo/gtk-3.0/gtk.css and from 
 # Zukitwo-Dark/gtk-3.0/gtk.css, respectively.
-Patch0:         zukitwo-20120702-rmnotavail.patch
+Patch0:         %{name}-%{version}-rmnotavail.patch
 
 BuildArch:      noarch      
 
@@ -27,48 +27,48 @@ created by %{author}.
 
 
 %package gtk2-theme
-Summary:        Zukitwo GTK+2 themes
+Summary:        %{theme_name} GTK+2 themes
 Group:          User Interface/Desktops
 Requires:       gtk-murrine-engine >= 0.98.1.1 gtk2-engines
 
 %description gtk2-theme
-Themes for GTK+2 as part of the Zukitwo theme.
+Themes for GTK+2 as part of the %{theme_name} theme.
 
 
 %package gtk3-theme
-Summary:        Zukitwo GTK+3 themes
+Summary:        %{theme_name} GTK+3 themes
 Group:          User Interface/Desktops
 Requires:       gtk-unico-engine >= 1.0.2
 
 %description gtk3-theme
-Themes for GTK+3 as part of the Zukitwo theme.
+Themes for GTK+3 as part of the %{theme_name} theme.
 
 
 %package metacity-theme
-Summary:        Zukitwo Metacity themes
+Summary:        %{theme_name} Metacity themes
 Group:          User Interface/Desktops
 Requires:       metacity
 
 %description metacity-theme
-Themes for Metacity as part of the Zukitwo theme.
+Themes for Metacity as part of the %{theme_name} theme.
 
 
 %package -n gnome-shell-theme-%{name}
-Summary:        Zukitwo 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
 
 %description -n gnome-shell-theme-%{name}
-Zukitwo GNOME Shell theme.
+%{theme_name} GNOME Shell theme.
 
 
 %package xfwm4-theme
-Summary:        Zukitwo Xfwm4 themes
+Summary:        %{theme_name} Xfwm4 themes
 Group:          User Interface/Desktops
 Requires:       xfwm4
 
 %description xfwm4-theme
-Themes for Xfwm4 as part of the Zukitwo theme.
+Themes for Xfwm4 as part of the %{theme_name} theme.
 
 
 %prep
@@ -91,49 +91,52 @@ rm -r */unity/
 
 
 %install
-for theme_dir in Zukitwo Zukitwo-Dark
+for theme_dir in %{theme_name} %{theme_name}-Dark
 do
         mkdir -p -m755 %{buildroot}%{_datadir}/themes/$theme_dir
         cp -pr $theme_dir/* %{buildroot}%{_datadir}/themes/$theme_dir
 done
-mkdir -p -m755 %{buildroot}%{_datadir}/themes/Zukitwo-Shell/gnome-shell
-cp -pr Zukitwo-Shell/gnome-shell/* %{buildroot}%{_datadir}/themes/Zukitwo-Shell/gnome-shell
+mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{theme_name}-Shell/gnome-shell
+cp -pr %{theme_name}-Shell/gnome-shell/* %{buildroot}%{_datadir}/themes/%{theme_name}-Shell/gnome-shell
 
 
 %files gtk2-theme
 %doc COPYING README
-%dir %{_datadir}/themes/Zukitwo/
-%dir %{_datadir}/themes/Zukitwo-Dark/
+%dir %{_datadir}/themes/%{theme_name}/
+%dir %{_datadir}/themes/%{theme_name}-Dark/
 %{_datadir}/themes/*/gtk-2.0/
 
 
 %files gtk3-theme
 %doc COPYING README
-%dir %{_datadir}/themes/Zukitwo/
-%dir %{_datadir}/themes/Zukitwo-Dark/
+%dir %{_datadir}/themes/%{theme_name}/
+%dir %{_datadir}/themes/%{theme_name}-Dark/
 %{_datadir}/themes/*/gtk-3.0/
 
 
 %files metacity-theme
 %doc COPYING README
-%dir %{_datadir}/themes/Zukitwo/
-%dir %{_datadir}/themes/Zukitwo-Dark/
+%dir %{_datadir}/themes/%{theme_name}/
+%dir %{_datadir}/themes/%{theme_name}-Dark/
 %{_datadir}/themes/*/metacity-1/
 
 
 %files -n gnome-shell-theme-%{name}
 %doc COPYING README
-%{_datadir}/themes/Zukitwo-Shell/
+%{_datadir}/themes/%{theme_name}-Shell/
 
 
 %files xfwm4-theme
 %doc COPYING README
-%dir %{_datadir}/themes/Zukitwo/
-%dir %{_datadir}/themes/Zukitwo-Dark/
+%dir %{_datadir}/themes/%{theme_name}/
+%dir %{_datadir}/themes/%{theme_name}-Dark/
 %{_datadir}/themes/*/xfwm4/
 
 
 %changelog
+* Sun Jul 15 2012 Mattia Meneguzzo <odysseus at fedoraproject.org> - 20120708-1
+- Update to latest upstream version
+
 * Sat Jul 07 2012 Mattia Meneguzzo <odysseus at fedoraproject.org> - 20120702-1
 - Update to latest upstream version
 
