[zukitwo] Update to latest upstream version (2012.12.07). Remove everything related to Zukitwo-Dark. Remove fi
odysseus
odysseus at fedoraproject.org
Sat Dec 8 08:44:32 UTC 2012
commit 50ecb92ff77a46873c75569b7a9b749fe14c8bdb
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date: Sat Dec 8 09:44:02 2012 +0100
Update to latest upstream version (2012.12.07). Remove everything related to Zukitwo-Dark. Remove fields Provides and Obsoletes. Update requirements.
sources | 2 +-
zukitwo-20120817-rmnotavail.patch | 32 ---------------------
zukitwo-rm_unity.patch | 8 +++++
zukitwo.spec | 56 ++++++++++++-------------------------
4 files changed, 27 insertions(+), 71 deletions(-)
---
diff --git a/sources b/sources
index b29135f..9d85e7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cad3b29e323b6aa279dfb2aeb5ee6519 zukitwo_by_lassekongo83-d3df2ot.zip
+63517c71e133091d79e89e6ca377c57a zukitwo_by_lassekongo83-d3df2ot.zip
diff --git a/zukitwo-rm_unity.patch b/zukitwo-rm_unity.patch
new file mode 100644
index 0000000..ba58421
--- /dev/null
+++ b/zukitwo-rm_unity.patch
@@ -0,0 +1,8 @@
+--- Zukitwo/gtk-3.0/gtk.css.orig 2012-12-08 09:08:19.750421631 +0100
++++ Zukitwo/gtk-3.0/gtk.css 2012-12-08 09:08:40.956696685 +0100
+@@ -113,5 +113,4 @@
+ @import url("apps/gnome-panel.css");
+ @import url("apps/gnome-terminal.css");
+ @import url("apps/nautilus.css");
+- at import url("apps/unity.css");
+ @import url("apps/popover.css");
diff --git a/zukitwo.spec b/zukitwo.spec
index eee759e..117ef79 100644
--- a/zukitwo.spec
+++ b/zukitwo.spec
@@ -4,8 +4,8 @@
%global tag d3df2ot
Name: zukitwo
-Version: 20120817
-Release: 3%{?dist}
+Version: 20121207
+Release: 1%{?dist}
Summary: Themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4
Group: User Interface/Desktops
@@ -13,11 +13,9 @@ License: GPLv3
URL: http://%{author}.deviantart.com/art/%{theme_name}-%{deviantart_id}
Source0: http://www.deviantart.com/download/%{deviantart_id}/%{name}_by_%{author}-%{tag}.zip
-# This patch removes "Ubuntu" and "Trebuchet MS" from "font-family" in
-# 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: %{name}-%{version}-rmnotavail.patch
+# This patch removes two references to Unity-related stuff from
+# Zukitwo/gtk-3.0/gtk.css
+Patch0: %{name}-rm_unity.patch
BuildArch: noarch
@@ -29,10 +27,6 @@ created by %{author}.
%package common
Summary: Files common to %{theme_name} themes
Group: User Interface/Desktops
-%if 0%{?fedora} >= 18
-Provides: gnome-shell-theme-%{name} = %{version}-%{release}
-Obsoletes: gnome-shell-theme-%{name} < %{version}-%{release}
-%endif
%description common
Files which are common to all %{theme_name} themes.
@@ -41,7 +35,7 @@ Files which are common to all %{theme_name} themes.
%package gtk2-theme
Summary: %{theme_name} GTK+2 themes
Group: User Interface/Desktops
-Requires: %{name}-common = %{version}-%{release}, 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 %{theme_name} theme.
@@ -50,7 +44,7 @@ Themes for GTK+2 as part of the %{theme_name} theme.
%package gtk3-theme
Summary: %{theme_name} GTK+3 themes
Group: User Interface/Desktops
-Requires: %{name}-common = %{version}-%{release}, gtk-unico-engine >= 1.0.2
+Requires: %{name}-common = %{version}-%{release}
%description gtk3-theme
Themes for GTK+3 as part of the %{theme_name} theme.
@@ -65,15 +59,13 @@ Requires: %{name}-common = %{version}-%{release}, metacity
Themes for Metacity as part of the %{theme_name} theme.
-%if 0%{?fedora} < 18
%package -n gnome-shell-theme-%{name}
Summary: %{theme_name} GNOME Shell theme
Group: User Interface/Desktops
-Requires: %{name}-common = %{version}-%{release}, gnome-shell-extension-user-theme >= 3.4 google-droid-sans-fonts
+Requires: %{name}-common = %{version}-%{release}, gnome-shell-extension-user-theme >= 3.6, liberation-sans-fonts
%description -n gnome-shell-theme-%{name}
%{theme_name} GNOME Shell theme.
-%endif
%package xfwm4-theme
@@ -96,8 +88,8 @@ sed -i 's/\r//' README
# Fix text encoding of "README"
iconv -f iso8859-1 -t utf-8 README > README.conv && mv -f README.conv README
# Remove Unity stuff
-rm */gtk-3.0/apps/unity.css
-rm -r */unity/
+rm %{theme_name}/gtk-3.0/apps/unity.css
+rm -r %{theme_name}/unity/
%build
@@ -105,56 +97,44 @@ rm -r */unity/
%install
-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/%{theme_name}
+cp -pr %{theme_name}/* %{buildroot}%{_datadir}/themes/%{theme_name}
mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{theme_name}/gnome-shell
cp -pr %{theme_name}-Shell/gnome-shell/* %{buildroot}%{_datadir}/themes/%{theme_name}/gnome-shell
-ln -sfn %{_datadir}/themes/%{theme_name}/gnome-shell %{buildroot}%{_datadir}/themes/%{theme_name}-Dark/gnome-shell
-%if 0%{?fedora} > 17
- for theme_dir in %{theme_name} %{theme_name}-Dark
- do
- rm -rf %{buildroot}%{_datadir}/themes/$theme_dir/gnome-shell
- done
-%endif
%files common
%doc COPYING README
%dir %{_datadir}/themes/%{theme_name}/
-%dir %{_datadir}/themes/%{theme_name}-Dark/
%files gtk2-theme
%{_datadir}/themes/%{theme_name}/gtk-2.0/
-%{_datadir}/themes/%{theme_name}-Dark/gtk-2.0/
%files gtk3-theme
%{_datadir}/themes/%{theme_name}/gtk-3.0/
-%{_datadir}/themes/%{theme_name}-Dark/gtk-3.0/
%files metacity-theme
%{_datadir}/themes/%{theme_name}/metacity-1/
-%{_datadir}/themes/%{theme_name}-Dark/metacity-1/
-%if 0%{?fedora} < 18
%files -n gnome-shell-theme-%{name}
%{_datadir}/themes/%{theme_name}/gnome-shell/
-%{_datadir}/themes/%{theme_name}-Dark/gnome-shell
-%endif
%files xfwm4-theme
%{_datadir}/themes/%{theme_name}/xfwm4/
-%{_datadir}/themes/%{theme_name}-Dark/xfwm4/
%changelog
+* Sat Dec 08 2012 Mattia Meneguzzo <odysseus at fedoraproject.org> - 20121207-1
+- Update to latest upstream version
+- Remove everything related to "Zukitwo-Dark"
+- Remove fields "Provides" and "Obsoletes"
+- Update requirements
+
* Tue Nov 20 2012 Mattia Meneguzzo <odysseus at fedoraproject.org> - 20120817-3
- Add fields "Provides" and "Obsoletes" to the "common" subpackage
More information about the scm-commits
mailing list