Merge branch 'master' into f17

.gitignore

@@ -0,0 +1 @@
+/zukitwo_by_lassekongo83-d3df2ot.zip

dead.package

@@ -1,3 +0,0 @@
-2016-05-19: Retired orphaned package, because it was orphaned for
-more than six weeks.
-

sources

@@ -0,0 +1 @@
+cad3b29e323b6aa279dfb2aeb5ee6519  zukitwo_by_lassekongo83-d3df2ot.zip

zukitwo-20120817-rmnotavail.patch

@@ -0,0 +1,32 @@
+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-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");
+ @import url("apps/nautilus.css");
+-@import url("apps/unity.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-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");
+ @import url("apps/nautilus.css");
+-@import url("apps/unity.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-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 */
+ 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;
+ }

zukitwo.spec

@@ -0,0 +1,211 @@
+%global theme_name    Zukitwo
+%global deviantart_id 203936861
+%global author        lassekongo83
+%global tag           d3df2ot
+
+Name:           zukitwo
+Version:        20120817
+Release:        3%{?dist}
+Summary:        Themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4
+Group:          User Interface/Desktops
+
+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
+
+BuildArch:      noarch      
+
+%description
+The %{theme_name} themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4, 
+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.
+
+
+%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
+
+%description gtk2-theme
+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
+
+%description gtk3-theme
+Themes for GTK+3 as part of the %{theme_name} theme.
+
+
+%package metacity-theme
+Summary:        %{theme_name} Metacity themes
+Group:          User Interface/Desktops
+Requires:       %{name}-common = %{version}-%{release}, metacity
+
+%description metacity-theme
+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
+
+%description -n gnome-shell-theme-%{name}
+%{theme_name} GNOME Shell theme.
+%endif
+
+
+%package xfwm4-theme
+Summary:        %{theme_name} Xfwm4 themes
+Group:          User Interface/Desktops
+Requires:       %{name}-common = %{version}-%{release}, xfwm4
+
+%description xfwm4-theme
+Themes for Xfwm4 as part of the %{theme_name} theme.
+
+
+%prep
+%setup -q -c -n %{name}_by_%{author}-%{tag}
+%patch0 -p0
+
+# Remove "Thumbs.db" files
+find . -name Thumbs.db -type f -exec rm -f '{}' \;
+# Fix end-of-line encoding of "README"
+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/
+
+
+%build
+# Nothing to build
+
+
+%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}/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
+* Tue Nov 20 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120817-3
+- Add fields "Provides" and "Obsoletes" to the "common" subpackage
+
+* Sun Nov 04 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120817-2
+- Package the GNOME Shell theme only for Fedora up to 17
+
+* Fri Aug 17 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120817-1
+- Update to latest upstream version
+
+* Sun Aug 05 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120708-5
+- Correct an error in .spec file
+
+* Sat Aug 04 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120708-4
+- Replace a copy of the directory containing the Gnome Shell theme with a symbolic link to the other 
+
+* Sat Aug 04 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120708-3
+- Add a "common" subpackage which owns files and directories that are common to all themes
+- Change directory structure
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20120708-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun Jul 15 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120708-1
+- Update to latest upstream version
+
+* Sat Jul 07 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120702-1
+- Update to latest upstream version
+
+* Mon Jun 18 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120612-1
+- Update to latest upstream version
+
+* Sat Jun 09 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120607-1
+- Update to latest upstream version
+- Add a patch to remove "Ubuntu" and "Trebuchet MS" from "font-family" in gnome-shell.css and two references to Unity-related stuff.
+
+* Tue Jun 05 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120602-2
+- Add google-droid-sans-fonts as a requirement for gnome-shell-theme-zukitwo
+- Add a patch to remove "Ubuntu" from "font-family" in gnome-shell.css
+
+* Sun Jun 03 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120602-1
+- Update to latest upstream version
+- Change "License" from "GPLv3+" to "GPLv3" in Spec file
+
+* Sat May 26 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120526-1
+- Update to latest upstream version
+
+* Fri May 25 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120523-1
+- Update to latest upstream version
+
+* Sat May 19 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120516-1
+- Update to latest upstream version
+
+* Sat May 12 2012 Mattia Meneguzzo <odysseus@fedoraproject.org> - 20120511-1
+- Initial package for Fedora (thanks to Tim Lauridsen and Mohamed El Morabity for their precious help)