[light-themes/f20] Update to latest version bundled in Ubuntu 13.10 + move fixes from tarball generation to script to p
Mohamed ElMorabity
melmorabity at fedoraproject.org
Tue Nov 12 14:31:59 UTC 2013
commit db51ffe936fb4e82b3ffde02d2683831d6b81c6f
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date: Tue Nov 12 15:25:56 2013 +0100
Update to latest version bundled in Ubuntu 13.10 + move fixes from tarball generation to script to patches
.gitignore | 1 +
light-themes-13.04-cursor.patch | 20 +++++++
light-themes-13.04-icons.patch | 42 ++++++++++++++
light-themes-13.04-metacity.patch | 114 +++++++++++++++++++++++++++++++++++++
light-themes-generate-tarball.sh | 33 ++---------
light-themes.spec | 49 +++++++++++-----
sources | 2 +-
7 files changed, 217 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5b81e21..d034d21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/light-themes_0.1.93.tar.gz
/light-themes-13.04-bzr283.tar.xz
/light-themes-13.10-bzr307.tar.xz
+/light-themes-13.10-bzr324.tar.xz
diff --git a/light-themes-13.04-cursor.patch b/light-themes-13.04-cursor.patch
new file mode 100644
index 0000000..d2e4855
--- /dev/null
+++ b/light-themes-13.04-cursor.patch
@@ -0,0 +1,20 @@
+diff -up ./Ambiance/index.theme.orig ./Ambiance/index.theme
+--- ./Ambiance/index.theme.orig 2013-11-02 13:36:19.293911000 +0100
++++ ./Ambiance/index.theme 2013-11-02 13:36:41.483462971 +0100
+@@ -8,5 +8,5 @@ Encoding=UTF-8
+ GtkTheme=Ambiance
+ MetacityTheme=Ambiance
+ IconTheme=ubuntu-mono-dark
+-CursorTheme=DMZ-White
++CursorTheme=dmz
+ ButtonLayout=close,minimize,maximize:
+diff -up ./Radiance/index.theme.orig ./Radiance/index.theme
+--- ./Radiance/index.theme.orig 2013-11-02 13:36:19.293911000 +0100
++++ ./Radiance/index.theme 2013-11-02 13:36:41.483462971 +0100
+@@ -8,5 +8,5 @@ Encoding=UTF-8
+ GtkTheme=Radiance
+ MetacityTheme=Radiance
+ IconTheme=ubuntu-mono-light
+-CursorTheme=DMZ-White
++CursorTheme=dmz
+ ButtonLayout=close,minimize,maximize:
diff --git a/light-themes-13.04-icons.patch b/light-themes-13.04-icons.patch
new file mode 100644
index 0000000..932f653
--- /dev/null
+++ b/light-themes-13.04-icons.patch
@@ -0,0 +1,42 @@
+diff -up ./Ambiance/index.theme.orig ./Ambiance/index.theme
+--- ./Ambiance/index.theme.orig 2013-11-02 13:36:58.485459000 +0100
++++ ./Ambiance/index.theme 2013-11-02 13:39:32.248451949 +0100
+@@ -7,6 +7,6 @@ Encoding=UTF-8
+ [X-GNOME-Metatheme]
+ GtkTheme=Ambiance
+ MetacityTheme=Ambiance
+-IconTheme=ubuntu-mono-dark
++IconTheme=Monochrome-dark
+ CursorTheme=dmz
+ ButtonLayout=close,minimize,maximize:
+diff -up ./Radiance/index.theme.orig ./Radiance/index.theme
+--- ./Radiance/index.theme.orig 2013-11-02 13:36:58.485459000 +0100
++++ ./Radiance/index.theme 2013-11-02 13:40:20.376448842 +0100
+@@ -7,6 +7,6 @@ Encoding=UTF-8
+ [X-GNOME-Metatheme]
+ GtkTheme=Radiance
+ MetacityTheme=Radiance
+-IconTheme=ubuntu-mono-light
++IconTheme=Monochrome-light
+ CursorTheme=dmz
+ ButtonLayout=close,minimize,maximize:
+diff -up ./ubuntu-mono-dark/index.theme.orig ./ubuntu-mono-dark/index.theme
+--- ./ubuntu-mono-dark/index.theme.orig 2013-11-02 13:36:58.485459000 +0100
++++ ./ubuntu-mono-dark/index.theme 2013-11-02 13:39:53.552450573 +0100
+@@ -1,5 +1,5 @@
+ [Icon Theme]
+-Name=Ubuntu-Mono-Dark
++Name=Monochrome-dark
+ Comment=Smooth modern theme designed to be intuitive.
+ Inherits=Humanity-Dark,gnome,hicolor
+
+diff -up ./ubuntu-mono-light/index.theme.orig ./ubuntu-mono-light/index.theme
+--- ./ubuntu-mono-light/index.theme.orig 2013-11-02 13:36:58.485459000 +0100
++++ ./ubuntu-mono-light/index.theme 2013-11-02 13:39:44.543451155 +0100
+@@ -1,5 +1,5 @@
+ [Icon Theme]
+-Name=Ubuntu-Mono-Light
++Name=Monochrome-light
+ Comment=Smooth modern theme designed to be intuitive.
+ Inherits=Humanity,gnome,hicolor
+
diff --git a/light-themes-13.04-metacity.patch b/light-themes-13.04-metacity.patch
new file mode 100644
index 0000000..7bdeea1
--- /dev/null
+++ b/light-themes-13.04-metacity.patch
@@ -0,0 +1,114 @@
+diff -up ./Ambiance/metacity-1/metacity-theme-1.xml.orig ./Ambiance/metacity-1/metacity-theme-1.xml
+--- ./Ambiance/metacity-1/metacity-theme-1.xml.orig 2013-11-02 13:29:31.182807000 +0100
++++ ./Ambiance/metacity-1/metacity-theme-1.xml 2013-11-02 13:31:58.035481267 +0100
+@@ -389,8 +389,6 @@
+ <button function="close" state="normal" draw_ops="close_focused_normal"/>
+ <button function="close" state="prelight" draw_ops="close_focused_prelight"/>
+ <button function="close" state="pressed" draw_ops="close_focused_pressed"/>
+- <shadow radius="8.0" opacity="0.75" color="#abde4f" x_offset="1" y_offset="4"/>
+- <padding left="7" right="7" bottom="7"/>
+ </frame_style>
+
+ <frame_style name="normal_unfocused" geometry="frame_geometry_normal">
+@@ -429,8 +427,6 @@
+ <button function="close" state="normal" draw_ops="close_unfocused_normal"/>
+ <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
+ <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
+- <shadow radius="8.0" opacity="0.5" color="#abde4f" x_offset="1" y_offset="4"/>
+- <padding left="7" right="7" bottom="7"/>
+ </frame_style>
+
+ <frame_style name="maximized_focused" geometry="geometry_maximized" parent="normal_focused">
+@@ -439,8 +435,6 @@
+ <button function="maximize" state="normal" draw_ops="unmaximize_focused_normal"/>
+ <button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/>
+ <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/>
+- <shadow radius="0.0" opacity="0.0" color="#000000" x_offset="0" y_offset="0"/>
+- <padding left="0" right="0" bottom="0"/>
+ </frame_style>
+
+ <frame_style name="maximized_unfocused" geometry="geometry_maximized" parent="normal_unfocused">
+@@ -449,8 +443,6 @@
+ <button function="maximize" state="normal" draw_ops="unmaximize_unfocused_normal"/>
+ <button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/>
+ <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/>
+- <shadow radius="0.0" opacity="0.0" color="#000000" x_offset="0" y_offset="0"/>
+- <padding left="0" right="0" bottom="0"/>
+ </frame_style>
+
+ <frame_style name="utility_focused" parent="normal_focused">
+@@ -464,8 +456,6 @@
+ <button function="close" state="normal" draw_ops="close_focused_normal"/>
+ <button function="close" state="prelight" draw_ops="close_focused_prelight"/>
+ <button function="close" state="pressed" draw_ops="close_focused_pressed"/>
+- <shadow radius="8.0" opacity="0.3" color="#abde4f" x_offset="1" y_offset="1"/>
+- <padding left="2" right="2" bottom="2"/>
+ </frame_style>
+
+ <frame_style name="utility_unfocused" parent="normal_unfocused">
+@@ -479,8 +469,6 @@
+ <button function="close" state="normal" draw_ops="close_unfocused_normal"/>
+ <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
+ <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
+- <shadow radius="8.0" opacity="0.3" color="#abde4f" x_offset="1" y_offset="1"/>
+- <padding left="2" right="2" bottom="2"/>
+ </frame_style>
+
+ <frame_style name="border" geometry="border" parent="normal_focused">
+diff -up ./Radiance/metacity-1/metacity-theme-1.xml.orig ./Radiance/metacity-1/metacity-theme-1.xml
+--- ./Radiance/metacity-1/metacity-theme-1.xml.orig 2013-11-02 13:29:31.182807000 +0100
++++ ./Radiance/metacity-1/metacity-theme-1.xml 2013-11-02 13:31:58.030481267 +0100
+@@ -386,8 +386,6 @@
+ <button function="close" state="normal" draw_ops="close_focused_normal"/>
+ <button function="close" state="prelight" draw_ops="close_focused_prelight"/>
+ <button function="close" state="pressed" draw_ops="close_focused_pressed"/>
+- <shadow radius="8.0" opacity="0.75" color="#abde4f" x_offset="1" y_offset="4"/>
+- <padding left="7" right="7" bottom="7"/>
+ </frame_style>
+
+ <frame_style name="normal_unfocused" geometry="frame_geometry_normal">
+@@ -426,8 +424,6 @@
+ <button function="close" state="normal" draw_ops="close_unfocused_normal"/>
+ <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
+ <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
+- <shadow radius="8.0" opacity="0.5" color="#abde4f" x_offset="1" y_offset="4"/>
+- <padding left="7" right="7" bottom="7"/>
+ </frame_style>
+
+ <frame_style name="maximized_focused" geometry="geometry_maximized" parent="normal_focused">
+@@ -436,8 +432,6 @@
+ <button function="maximize" state="normal" draw_ops="unmaximize_focused_normal"/>
+ <button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/>
+ <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/>
+- <shadow radius="0.0" opacity="0.0" color="#000000" x_offset="0" y_offset="0"/>
+- <padding left="0" right="0" bottom="0"/>
+ </frame_style>
+
+ <frame_style name="maximized_unfocused" geometry="geometry_maximized" parent="normal_unfocused">
+@@ -446,8 +440,6 @@
+ <button function="maximize" state="normal" draw_ops="unmaximize_unfocused_normal"/>
+ <button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/>
+ <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/>
+- <shadow radius="0.0" opacity="0.0" color="#000000" x_offset="0" y_offset="0"/>
+- <padding left="0" right="0" bottom="0"/>
+ </frame_style>
+
+ <frame_style name="utility_focused" parent="normal_focused">
+@@ -461,8 +453,6 @@
+ <button function="close" state="normal" draw_ops="close_focused_normal"/>
+ <button function="close" state="prelight" draw_ops="close_focused_prelight"/>
+ <button function="close" state="pressed" draw_ops="close_focused_pressed"/>
+- <shadow radius="8.0" opacity="0.3" color="#abde4f" x_offset="1" y_offset="1"/>
+- <padding left="2" right="2" bottom="2"/>
+ </frame_style>
+
+ <frame_style name="utility_unfocused" parent="normal_unfocused">
+@@ -476,8 +466,6 @@
+ <button function="close" state="normal" draw_ops="close_unfocused_normal"/>
+ <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
+ <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
+- <shadow radius="8.0" opacity="0.3" color="#abde4f" x_offset="1" y_offset="1"/>
+- <padding left="2" right="2" bottom="2"/>
+ </frame_style>
+
+ <frame_style name="border" geometry="border" parent="normal_focused">
diff --git a/light-themes-generate-tarball.sh b/light-themes-generate-tarball.sh
index 18d2f4f..48e371c 100644
--- a/light-themes-generate-tarball.sh
+++ b/light-themes-generate-tarball.sh
@@ -10,43 +10,20 @@ ARCHIVE=$FOLDER.tar.xz
bzr export $FOLDER/ -r $REVISION lp:ubuntu-themes
pushd $FOLDER/
-# Drop useless ubuntu-mobile icon theme
-rm -r ubuntu-mobile/
-
-# Drop useless Unity theme
-rm -r {Ambiance,Radiance}/unity/
-
-# Rename ubuntu-mono-* icon themes to Monochrome-*
-mv ubuntu-mono-dark/ Monochrome-dark/
-mv ubuntu-mono-light/ Monochrome-light/
-sed -i "s/Name=Ubuntu-Mono-Dark/Name=Monochrome-dark/" Monochrome-dark/index.theme
-sed -i "s/Name=Ubuntu-Mono-Light/Name=Monochrome-light/" Monochrome-light/index.theme
-sed -i "s/IconTheme=ubuntu-mono/IconTheme=Monochrome/" {Ambiance,Radiance}/index.theme
-
-# Fix cursor theme name in Ambiance/Radiance themes (named "DMZ-White" in
-# Ubuntu, "dmz" in Fedora)
-sed -i "s/CursorTheme=DMZ-White/CursorTheme=dmz/" {Ambiance,Radiance}/index.theme
-
-# Remove <shadow> and <padding> tags from metacity-theme-1.xml files, not
-# supported by GNOME Shell (see
-# https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/850060)
-sed -i "/<shadow .*\/>/d; /<padding .*\/>/d" {Ambiance,Radiance}/metacity-1/metacity-theme-1.xml
-
# Remove copyrighted logo icons
rm distributor-logo.png
-find Monochrome-*/ LoginIcons \
+find ubuntu-mono-*/ ubuntu-mobile LoginIcons \
\( \
-name "computer.*" \
+ -o -name "dash-home.*" \
-o -name "distributor-logo.*" \
-o -name "package-supported.*" \
-o -name "preferences-system-directory.*" \
-o -name "start-here.*" \
+ -o -name "ubuntu*.*" \
\) -delete
-# Delete dead icon symlinks
-find -L . -type l -exec rm {} \;
-
popd
-tar -cJf $ARCHIVE $FOLDER
-rm -r $FOLDER
+tar -cJf $ARCHIVE $FOLDER/
+rm -r $FOLDER/
diff --git a/light-themes.spec b/light-themes.spec
index 6ffed79..1f8e5c2 100644
--- a/light-themes.spec
+++ b/light-themes.spec
@@ -1,22 +1,29 @@
-%global revision 307
-%global revision_date 20130812
+%global revision 324
+%global revision_date 20131014
Name: light-themes
Version: 13.10
-Release: 0.1.%{revision_date}bzr%{revision}%{?dist}
-Summary: Light Themes (Ambiance and Radiance)
+Release: 0.2.%{revision_date}bzr%{revision}%{?dist}
+Summary: Themes for Ubuntu
Group: User Interface/Desktops
License: CC-BY-SA
URL: https://launchpad.net/ubuntu-themes/
Source0: %{name}-%{version}-bzr%{revision}.tar.xz
-# light-themes is based on ubuntu-themes, which contains copyrighted
+# light-themes is based on ubuntu-themes project, which contains copyrighted
# trademarks. Therefore we use this script to remove them before shipping
-# it. Somes fixes are also applied to the sources (see
-# https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/850060). Invoke
-# this script to generate the light-themes tarball
+# it. Invoke this script to generate the light-themes tarball
Source1: %{name}-generate-tarball.sh
-
+# Remove <shadow> and <padding> tags from metacity-theme-1.xml files, not
+# supported by GNOME Shell (see
+# https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/850060)
+Patch0: %{name}-13.04-metacity.patch
+# Fix DMZ cursor theme name in index.theme files (named "DMZ-White" in Ubuntu,
+# "dmz" in Fedora)
+Patch1: %{name}-13.04-cursor.patch
+# Fix Ubuntu icon dependency themes in index.theme files (themes renamed from
+# "ubuntu-mono-*" to "Monochrome-*" in Fedora for copyright reasons)
+Patch2: %{name}-13.04-icons.patch
BuildArch: noarch
%description
@@ -28,10 +35,10 @@ in one package as they all define what Ubuntu is.
Summary: Ambiance and Radiance GNOME themes
Group: User Interface/Desktops
Requires: dmz-cursor-themes
-Requires: light-gtk2-theme = %{version}-%{release}
-Requires: light-gtk3-theme = %{version}-%{release}
-Requires: light-metacity-theme = %{version}-%{release}
-Requires: monochrome-icon-theme = %{version}-%{release}
+Requires: light-gtk2-theme = %{epoch}:%{version}-%{release}
+Requires: light-gtk3-theme = %{epoch}:%{version}-%{release}
+Requires: light-metacity-theme = %{epoch}:%{version}-%{release}
+Requires: monochrome-icon-theme = %{epoch}:%{version}-%{release}
%description -n light-theme-gnome
Includes matching Ambiance and Radiance GNOME themes.
@@ -84,6 +91,15 @@ Dark and Light panel icons to make your desktop beautiful.
%prep
%setup -q -n %{name}-%{version}-bzr%{revision}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+# Remove useless Unity themes
+rm -r */unity/
+
+# Delete dead symlinks
+find -L . -type l -exec rm {} \;
%build
@@ -97,8 +113,8 @@ cp -a Ambiance/ Radiance/ $RPM_BUILD_ROOT%{_datadir}/themes/
# Install icon themes
install -dm 0755 $RPM_BUILD_ROOT%{_datadir}/icons/
cp -a LoginIcons/ $RPM_BUILD_ROOT%{_datadir}/icons/
-cp -a Monochrome-dark/ $RPM_BUILD_ROOT%{_datadir}/icons/
-cp -a Monochrome-light/ $RPM_BUILD_ROOT%{_datadir}/icons/
+cp -a ubuntu-mono-dark/ $RPM_BUILD_ROOT%{_datadir}/icons/Monochrome-dark/
+cp -a ubuntu-mono-light/ $RPM_BUILD_ROOT%{_datadir}/icons/Monochrome-light/
%post -n monochrome-icon-theme
@@ -152,6 +168,9 @@ done
%changelog
+* Tue Nov 12 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 13.10-0.2.20131014bzr324
+- Synchronise with version bundled in Ubuntu 13.10
+
* Mon Sep 02 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 13.10-0.1.20130812bzr307
- Update to the latest development version available in Ubuntu 13.10
diff --git a/sources b/sources
index 20dba8c..04e76b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e75cbceff5cc055a6567ccc212990c6d light-themes-13.10-bzr307.tar.xz
+aab947601aa69bec0d65d9e85d452cc2 light-themes-13.10-bzr324.tar.xz
More information about the scm-commits
mailing list