The attached patch changes the font size back to 10 according to the updates of
UI spec.
Regards,
Jedy
-------------- next part --------------
Index: ChangeLog
===================================================================
--- ChangeLog (revision 15308)
+++ ChangeLog (working copy)
@@ -1,3 +1,14 @@
+2008-09-10 Wang Xin <jedy.wang at sun.com>
+
+ * base-specs/metacity.spec: Remove 11-font.diff.
+ * patches/metacity-11-font.diff: Removed.
+ * patches/libgnome-01-sun-default-background.diff: Change font size
back to
+ 10.
+ * patches/libgnome-02-indiana-default.diff: Change font size back to 10.
+ * patches/nautilus-14-interface-changes-indiana.diff: Change font size
back
+ to 10.
+ * patches/nautilus-14-interface-changes.diff: Change font size back to
10.
+
2008-09-10 Halton Huo <halton.huo at sun.com>
* SUNWgnome-remote-desktop.spec: Add %doc to %files
Index: patches/libgnome-01-sun-default-background.diff
===================================================================
--- patches/libgnome-01-sun-default-background.diff (revision 15308)
+++ patches/libgnome-01-sun-default-background.diff (working copy)
@@ -18,9 +18,9 @@
<owner>gnome</owner>
<type>string</type>
- <default>Sans 10</default>
-+ <default>Sans Condensed 8</default>
++ <default>Sans Condensed 10</default>
<locale name="C">
-+ <default><!-- SUN_BRANDING -->Sans Condensed 8</default>
++ <default><!-- SUN_BRANDING -->Sans Condensed 10</default>
<short>Default font</short>
<long>Name of the default font used by gtk+.</long>
</locale>
@@ -29,9 +29,9 @@
<owner>gnome</owner>
<type>string</type>
- <default>Sans 10</default>
-+ <default>Sans Condensed 8</default>
++ <default>Sans Condensed 10</default>
<locale name="C">
-+ <default><!-- SUN_BRANDING -->Sans Condensed 8</default>
++ <default><!-- SUN_BRANDING -->Sans Condensed 10</default>
<short>Document font</short>
<long>Name of the default font used for reading documents.</long>
</locale>
@@ -40,9 +40,9 @@
<owner>gnome</owner>
<type>string</type>
- <default>Monospace 10</default>
-+ <default>Monospace Book 8</default>
++ <default>Monospace Book 10</default>
<locale name="C">
-+ <default><!-- SUN_BRANDING -->Monospace Book 8</default>
++ <default><!-- SUN_BRANDING -->Monospace Book 10</default>
<short>Monospace font</short>
<long>Name of a monospaced (fixed-width) font for use
in locations like terminals.</long>
Index: patches/nautilus-14-interface-changes-indiana.diff
===================================================================
--- patches/nautilus-14-interface-changes-indiana.diff (revision 15308)
+++ patches/nautilus-14-interface-changes-indiana.diff (working copy)
@@ -15,12 +15,12 @@
<owner>nautilus</owner>
<type>string</type>
- <default>Sans 10</default>
-+ <default>Sans Book 8</default>
++ <default>Sans Book 10</default>
<locale name="C">
<default><!-- Translators: please note this can choose the size. e.g.
"Sans 15". Please do not change "Sans", only change the size if you need to.
In
-most cases, this should be left alone. -->Sans 10</default>
-+most cases, this should be left alone. SUN_BRANDING -->Sans Book 8</default>
++most cases, this should be left alone. SUN_BRANDING -->Sans Book 10</default>
<short>Desktop font</short>
<long>
The font description used for the icons on the desktop.
Index: patches/metacity-11-font.diff
===================================================================
--- patches/metacity-11-font.diff (revision 15308)
+++ patches/metacity-11-font.diff (working copy)
@@ -1,12 +0,0 @@
-diff -ur metacity-2.23.55-orig/src/metacity.schemas.in
metacity-2.23.55/src/metacity.schemas.in
---- metacity-2.23.55-orig/src/metacity.schemas.in 2008-08-18
14:06:20.306545794 +0800
-+++ metacity-2.23.55/src/metacity.schemas.in 2008-08-18 14:05:57.334993436
+0800
-@@ -245,7 +245,7 @@
- <applyto>/apps/metacity/general/titlebar_font</applyto>
- <owner>metacity</owner>
- <type>string</type>
-- <default>Sans Bold 10</default>
-+ <default>Sans Bold 8</default>
- <locale name="C">
- <short>Window title font</short>
- <long>
Index: patches/libgnome-02-indiana-default.diff
===================================================================
--- patches/libgnome-02-indiana-default.diff (revision 15308)
+++ patches/libgnome-02-indiana-default.diff (working copy)
@@ -38,9 +38,9 @@
<owner>gnome</owner>
<type>string</type>
- <default>Sans 10</default>
-+ <default>Sans Condensed 8</default>
++ <default>Sans Condensed 10</default>
<locale name="C">
-+ <default><!-- SUN_BRANDING -->Sans Condensed 8</default>
++ <default><!-- SUN_BRANDING -->Sans Condensed 10</default>
<short>Default font</short>
<long>Name of the default font used by gtk+.</long>
</locale>
@@ -49,9 +49,9 @@
<owner>gnome</owner>
<type>string</type>
- <default>Sans 10</default>
-+ <default>Sans Condensed 8</default>
++ <default>Sans Condensed 10</default>
<locale name="C">
-+ <default><!-- SUN_BRANDING -->Sans Condensed 8</default>
++ <default><!-- SUN_BRANDING -->Sans Condensed 10</default>
<short>Document font</short>
<long>Name of the default font used for reading documents.</long>
</locale>
@@ -60,9 +60,9 @@
<owner>gnome</owner>
<type>string</type>
- <default>Monospace 10</default>
-+ <default>Monospace Book 8</default>
++ <default>Monospace Book 10</default>
<locale name="C">
-++ <default><!-- SUN_BRANDING -->Monospace Book 8</default>
+++ <default><!-- SUN_BRANDING -->Monospace Book 10</default>
<short>Monospace font</short>
<long>Name of a monospaced (fixed-width) font for use
in locations like terminals.</long>
Index: patches/nautilus-14-interface-changes.diff
===================================================================
--- patches/nautilus-14-interface-changes.diff (revision 15308)
+++ patches/nautilus-14-interface-changes.diff (working copy)
@@ -15,12 +15,12 @@
<owner>nautilus</owner>
<type>string</type>
- <default>Sans 10</default>
-+ <default>Sans Book 8</default>
++ <default>Sans Book 10</default>
<locale name="C">
<default><!-- Translators: please note this can choose the size. e.g.
"Sans 15". Please do not change "Sans", only change the size if you need to.
In
-most cases, this should be left alone. -->Sans 10</default>
-+most cases, this should be left alone. SUN_BRANDING -->Sans Book 8</default>
++most cases, this should be left alone. SUN_BRANDING -->Sans Book 10</default>
<short>Desktop font</short>
<long>
The font description used for the icons on the desktop.
Index: base-specs/metacity.spec
===================================================================
--- base-specs/metacity.spec (revision 15308)
+++ base-specs/metacity.spec (working copy)
@@ -47,8 +47,6 @@
Patch9: metacity-09-wireframe.diff
#owner:erwannc date:2008-006-02 type:feature bugster:0000000
Patch10: metacity-10-remove-xopen-source-posix.diff
-#owner:jedy date:2008-08-18 type:branding
-Patch11: metacity-11-font.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -92,7 +90,6 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
%build
%ifos linux
@@ -170,6 +167,8 @@
%{_mandir}/man1/*
%changelog
+* Wed Sep 10 2008 - jedy.wang at sun.com
+- Remove 11-font.diff.
* Fri Sep 05 2008 - jedy.wang at sun.com
- Fix broken link.
- Merge 02-ctrl-esc-mod4-r.diff with 09-enable-sun-keys-Open-Front.dif
Index: SUNWevolution-jescs.spec
===================================================================
--- SUNWevolution-jescs.spec (revision 15308)
+++ SUNWevolution-jescs.spec (working copy)
@@ -105,8 +105,12 @@
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48/apps
%{_datadir}/icons/hicolor/48x48/apps/*
+%doc -d evolution-jescs-%{evojescs.version} AUTHORS
+%doc -d evolution-jescs-%{evojescs.version} README
+%doc -d evolution-jescs-%{evojescs.version} NEWS
+%doc(bzip2) -d evolution-jescs-%{evojescs.version} ChangeLog
+%doc(bzip2) -d evolution-jescs-%{evojescs.version} COPYING
-
%if %build_l10n
%files l10n
%defattr (-, root, bin)
