[light-themes/f19] - Fix RHBZ #1003640 - Externalize patches from the repackaged sources
Mohamed ElMorabity
melmorabity at fedoraproject.org
Thu Sep 5 18:52:55 UTC 2013
commit e0a28f00a6a1f12a078181689cfe5527cf3eb0fb
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date: Thu Sep 5 20:52:27 2013 +0200
- Fix RHBZ #1003640
- Externalize patches from the repackaged sources
light-themes-13.04-cursor.patch | 20 +++++++
light-themes-13.04-icons.patch | 20 +++++++
light-themes-13.04-metacity.patch | 114 +++++++++++++++++++++++++++++++++++++
light-themes-13.04-nautilus.patch | 22 +++++++
light-themes-generate-tarball.sh | 30 +---------
light-themes.spec | 37 ++++++++++--
sources | 2 +-
7 files changed, 209 insertions(+), 36 deletions(-)
---
diff --git a/light-themes-13.04-cursor.patch b/light-themes-13.04-cursor.patch
new file mode 100644
index 0000000..187fa50
--- /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-09-04 22:04:20.446948615 +0200
++++ ./Ambiance/index.theme 2013-09-04 22:11:53.395170957 +0200
+@@ -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-09-04 22:04:20.264956186 +0200
++++ ./Radiance/index.theme 2013-09-04 22:11:53.396170916 +0200
+@@ -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..b441000
--- /dev/null
+++ b/light-themes-13.04-icons.patch
@@ -0,0 +1,20 @@
+diff -up ./ubuntu-mono-dark/index.theme.orig ./ubuntu-mono-dark/index.theme
+--- ./ubuntu-mono-dark/index.theme.orig 2013-09-04 22:03:51.943568000 +0200
++++ ./ubuntu-mono-dark/index.theme 2013-09-04 22:06:45.174954110 +0200
+@@ -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-09-04 22:03:51.943568000 +0200
++++ ./ubuntu-mono-light/index.theme 2013-09-04 22:06:59.312368259 +0200
+@@ -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..04a0999
--- /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-09-04 22:04:18.850015045 +0200
++++ ./Ambiance/metacity-1/metacity-theme-1.xml 2013-09-04 22:09:54.922086996 +0200
+@@ -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-09-04 22:04:18.664022782 +0200
++++ ./Radiance/metacity-1/metacity-theme-1.xml 2013-09-04 22:09:54.924086913 +0200
+@@ -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-13.04-nautilus.patch b/light-themes-13.04-nautilus.patch
new file mode 100644
index 0000000..5ceaa6b
--- /dev/null
+++ b/light-themes-13.04-nautilus.patch
@@ -0,0 +1,22 @@
+diff -up ./Ambiance/gtk-3.0/apps/nautilus.css.orig ./Ambiance/gtk-3.0/apps/nautilus.css
+--- ./Ambiance/gtk-3.0/apps/nautilus.css.orig 2013-09-04 22:04:21.651898624 +0200
++++ ./Ambiance/gtk-3.0/apps/nautilus.css 2013-09-04 22:13:04.679211715 +0200
+@@ -2,6 +2,7 @@
+
+ NautilusWindow * {
+ -GtkPaned-handle-size: 1;
++ background-color: transparent;
+ }
+
+ .nautilus-canvas-item {
+diff -up ./Radiance/gtk-3.0/apps/nautilus.css.orig ./Radiance/gtk-3.0/apps/nautilus.css
+--- ./Radiance/gtk-3.0/apps/nautilus.css.orig 2013-09-04 22:04:21.412908518 +0200
++++ ./Radiance/gtk-3.0/apps/nautilus.css 2013-09-04 22:13:06.822122738 +0200
+@@ -2,6 +2,7 @@
+
+ NautilusWindow * {
+ -GtkPaned-handle-size: 1;
++ background-color: transparent;
+ }
+
+ .nautilus-canvas-item {
diff --git a/light-themes-generate-tarball.sh b/light-themes-generate-tarball.sh
index eeeed51..ce2e1e5 100644
--- a/light-themes-generate-tarball.sh
+++ b/light-themes-generate-tarball.sh
@@ -10,33 +10,12 @@ 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.*" \
@@ -44,11 +23,6 @@ find Monochrome-*/ LoginIcons \
-o -name "ubuntu*.*" \
\) -delete
-#
-
-# Delete dead icon symlinks
-find -L . -type l -exec rm {} \;
popd
-
tar -cJf $ARCHIVE $FOLDER
rm -r $FOLDER
diff --git a/light-themes.spec b/light-themes.spec
index 27a1e11..e9314d5 100644
--- a/light-themes.spec
+++ b/light-themes.spec
@@ -3,7 +3,7 @@
Name: light-themes
Version: 13.04
-Release: 0.1.%{revision_date}bzr%{revision}%{?dist}
+Release: 0.2.%{revision_date}bzr%{revision}%{?dist}
Summary: Light Themes (Ambiance and Radiance)
Group: User Interface/Desktops
@@ -12,11 +12,20 @@ URL: https://launchpad.net/ubuntu-themes/
Source0: %{name}-%{version}-bzr%{revision}.tar.xz
# light-themes is based on ubuntu-themes, 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
+# Fix RHBZ #1003640
+Patch3: %{name}-13.04-nautilus.patch
BuildArch: noarch
%description
@@ -84,6 +93,16 @@ Dark and Light panel icons to make your desktop beautiful.
%prep
%setup -q -n %{name}-%{version}-bzr%{revision}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+# Remove useless Unity themes
+rm -r */unity/
+
+# Delete dead symlinks
+find -L . -type l -exec rm {} \;
%build
@@ -97,8 +116,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 +171,10 @@ done
%changelog
+* Wed Sep 04 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 13.04-0.2.20130412bzr283
+- Fix RHBZ #1003640
+- Externalize patches from the repackaged sources
+
* Sun May 12 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 13.04-0.1.20130412bzr283
- Rebase to ubuntu-themes upstream project
- Synchronise with version bundled in Ubuntu 13.04
diff --git a/sources b/sources
index 3a0aaf9..86b75bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-609c97fdaa740b3bfededd415f00242b light-themes-13.04-bzr283.tar.xz
+3cf75ab4ad21a8cdc9671bb3b84ea9c5 light-themes-13.04-bzr283.tar.xz
More information about the scm-commits
mailing list