This is an updated version of gnome-themes-01-add-so8-a11y-icons.diff,
required due to file restructuring in the gnome-themes module prior to
the 2.18.0 release.
Also included below is a patch to update gnome-themes.spec file to use
gnome-themes-2.18.0, and to obsolete accessibility-icons.tar.gz which is
no longer required.
Cheeri,
Calum.
diff -urN -Xdiff-excludes.txt gnome-themes-2.18.0/configure.in
gnome-themes-2.18.0-patched
/configure.in
--- gnome-themes-2.18.0/configure.in 2007-03-12 23:13:49.000000000
+0000
+++ gnome-themes-2.18.0-patched/configure.in 2007-03-13
13:05:17.478390000 +0000
@@ -169,7 +169,19 @@
icon-themes/Crux/scalable/status/Makefile
icon-themes/Crux/scalable/places/Makefile
icon-themes/HighContrast/Makefile
+icon-themes/HighContrast/16x16/Makefile
+icon-themes/HighContrast/16x16/apps/Makefile
+icon-themes/HighContrast/16x16/mimetypes/Makefile
+icon-themes/HighContrast/32x32/Makefile
+icon-themes/HighContrast/32x32/apps/Makefile
+icon-themes/HighContrast/32x32/mimetypes/Makefile
icon-themes/HighContrastInverse/Makefile
+icon-themes/HighContrastInverse/16x16/Makefile
+icon-themes/HighContrastInverse/16x16/apps/Makefile
+icon-themes/HighContrastInverse/16x16/mimetypes/Makefile
+icon-themes/HighContrastInverse/32x32/Makefile
+icon-themes/HighContrastInverse/32x32/apps/Makefile
+icon-themes/HighContrastInverse/32x32/mimetypes/Makefile
icon-themes/HighContrastLargePrint/Makefile
icon-themes/HighContrastLargePrint/36x36/Makefile
icon-themes/HighContrastLargePrint/36x36/apps/Makefile
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrast/16x16/Makefile.
am
gnome-themes-2.18.0-patched/icon-themes/HighContrast/16x16/Makefile.am
--- gnome-themes-2.18.0/icon-themes/HighContrast/16x16/Makefile.am
1970-01-01 01:00:0
0.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrast/16x16/Makefile.am
2007-03-13
12:54:50.618909000 +0000
@@ -0,0 +1 @@
+SUBDIRS= apps mimetypes
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrast/16x16/apps/Make
file.am
gnome-themes-2.18.0-patched/icon-themes/HighContrast/16x16/apps/Makefile.am
--- gnome-themes-2.18.0/icon-themes/HighContrast/16x16/apps/Makefile.am
1970-01-01 01:00:0
0.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrast/16x16/apps/Makefile.am
2007-03-13
12:56:52.475879000 +0000
@@ -0,0 +1,16 @@
+NULL=
+
+icondir= $(datadir)/icons/HighContrast/16x16/apps/
+
+icon_DATA= \
+ staroffice-base.png \
+ staroffice-calc.png \
+ staroffice-draw.png \
+ staroffice-impress.png \
+ staroffice-main.png \
+ staroffice-math.png \
+ staroffice-printeradmin.png \
+ staroffice-writer.png \
+ $(NULL)
+
+EXTRA_DIST= $(icon_DATA)
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrast/16x16/mimetypes
/Makefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrast/16x16/mimetypes/Makefile
.am
---
gnome-themes-2.18.0/icon-themes/HighContrast/16x16/mimetypes/Makefile.am
1970-01-01
01:00:00.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrast/16x16/mimetypes/Makefile.am
20
07-03-13 12:57:56.896962000 +0000
@@ -0,0 +1,10 @@
+NULL=
+
+icondir= $(datadir)/icons/HighContrast/16x16/mimetypes/
+
+icon_DATA= \
+ staroffice-oasis-text-template.png \
+ staroffice-oasis-text.png \
+ $(NULL)
+
+EXTRA_DIST= $(icon_DATA)
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrast/32x32/Makefile.
am
gnome-themes-2.18.0-patched/icon-themes/HighContrast/32x32/Makefile.am
--- gnome-themes-2.18.0/icon-themes/HighContrast/32x32/Makefile.am
1970-01-01 01:00:0
0.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrast/32x32/Makefile.am
2007-03-13
12:58:08.492997000 +0000
@@ -0,0 +1 @@
+SUBDIRS= apps mimetypes
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrast/32x32/apps/Make
file.am
gnome-themes-2.18.0-patched/icon-themes/HighContrast/32x32/apps/Makefile.am
--- gnome-themes-2.18.0/icon-themes/HighContrast/32x32/apps/Makefile.am
1970-01-01 01:00:0
0.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrast/32x32/apps/Makefile.am
2007-03-13
12:58:39.700293000 +0000
@@ -0,0 +1,16 @@
+NULL=
+
+icondir= $(datadir)/icons/HighContrast/32x32/apps/
+
+icon_DATA= \
+ staroffice-base.png \
+ staroffice-calc.png \
+ staroffice-draw.png \
+ staroffice-impress.png \
+ staroffice-main.png \
+ staroffice-math.png \
+ staroffice-printeradmin.png \
+ staroffice-writer.png \
+ $(NULL)
+
+EXTRA_DIST= $(icon_DATA)
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrast/32x32/mimetypes
/Makefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrast/32x32/mimetypes/Makefile
.am
---
gnome-themes-2.18.0/icon-themes/HighContrast/32x32/mimetypes/Makefile.am
1970-01-01
01:00:00.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrast/32x32/mimetypes/Makefile.am
20
07-03-13 12:59:07.105231000 +0000
@@ -0,0 +1,10 @@
+NULL=
+
+icondir= $(datadir)/icons/HighContrast/32x32/mimetypes/
+
+icon_DATA= \
+ staroffice-oasis-text-template.png \
+ staroffice-oasis-text.png \
+ $(NULL)
+
+EXTRA_DIST= $(icon_DATA)
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrast/Makefile.am gno
me-themes-2.18.0-patched/icon-themes/HighContrast/Makefile.am
--- gnome-themes-2.18.0/icon-themes/HighContrast/Makefile.am
2007-03-05 17:43:58.000000
000 +0000
+++ gnome-themes-2.18.0-patched/icon-themes/HighContrast/Makefile.am
2007-03-13 12:53:5
8.934107000 +0000
@@ -3,3 +3,5 @@
indextheme_DATA = index.theme
EXTRA_DIST= $(indextheme_DATA)
+
+SUBDIRS= 16x16 32x32
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrastInverse/16x16/Ma
kefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/16x16/Makefile.am
---
gnome-themes-2.18.0/icon-themes/HighContrastInverse/16x16/Makefile.am
1970-01-01
01:00:00.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/16x16/Makefile.am
20
07-03-13 13:01:39.445844000 +0000
@@ -0,0 +1 @@
+SUBDIRS= apps mimetypes
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrastInverse/16x16/ap
ps/Makefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/16x16/apps/Make
file.am
---
gnome-themes-2.18.0/icon-themes/HighContrastInverse/16x16/apps/Makefile.am
1970-01-01
01:00:00.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/16x16/apps/Makefile.am
20
07-03-13 13:02:18.461578000 +0000
@@ -0,0 +1,16 @@
+NULL=
+
+icondir= $(datadir)/icons/HighContrastInverse/16x16/apps/
+
+icon_DATA= \
+ staroffice-base.png \
+ staroffice-calc.png \
+ staroffice-draw.png \
+ staroffice-impress.png \
+ staroffice-main.png \
+ staroffice-math.png \
+ staroffice-printeradmin.png \
+ staroffice-writer.png \
+ $(NULL)
+
+EXTRA_DIST= $(icon_DATA)
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrastInverse/16x16/mi
metypes/Makefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/16x16/mime
types/Makefile.am
---
gnome-themes-2.18.0/icon-themes/HighContrastInverse/16x16/mimetypes/Makefile.am
19
70-01-01 01:00:00.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/16x16/mimetypes/Makefile.a
m 2007-03-13 13:02:41.875591000 +0000
@@ -0,0 +1,10 @@
+NULL=
+
+icondir= $(datadir)/icons/HighContrastInverse/16x16/mimetypes/
+
+icon_DATA= \
+ staroffice-oasis-text-template.png \
+ staroffice-oasis-text.png \
+ $(NULL)
+
+EXTRA_DIST= $(icon_DATA)
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrastInverse/32x32/Ma
kefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/32x32/Makefile.am
---
gnome-themes-2.18.0/icon-themes/HighContrastInverse/32x32/Makefile.am
1970-01-01
01:00:00.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/32x32/Makefile.am
20
07-03-13 13:02:56.745156000 +0000
@@ -0,0 +1 @@
+SUBDIRS= apps mimetypes
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrastInverse/32x32/ap
ps/Makefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/32x32/apps/Make
file.am
---
gnome-themes-2.18.0/icon-themes/HighContrastInverse/32x32/apps/Makefile.am
1970-01-01
01:00:00.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/32x32/apps/Makefile.am
20
07-03-13 13:03:32.384477000 +0000
@@ -0,0 +1,16 @@
+NULL=
+
+icondir= $(datadir)/icons/HighContrastInverse/32x32/apps/
+
+icon_DATA= \
+ staroffice-base.png \
+ staroffice-calc.png \
+ staroffice-draw.png \
+ staroffice-impress.png \
+ staroffice-main.png \
+ staroffice-math.png \
+ staroffice-printeradmin.png \
+ staroffice-writer.png \
+ $(NULL)
+
+EXTRA_DIST= $(icon_DATA)
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrastInverse/32x32/mi
metypes/Makefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/32x32/mime
types/Makefile.am
---
gnome-themes-2.18.0/icon-themes/HighContrastInverse/32x32/mimetypes/Makefile.am
19
70-01-01 01:00:00.000000000 +0100
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/32x32/mimetypes/Makefile.a
m 2007-03-13 13:04:19.084828000 +0000
@@ -0,0 +1,10 @@
+NULL=
+
+icondir= $(datadir)/icons/HighContrastInverse/32x32/mimetypes/
+
+icon_DATA= \
+ staroffice-oasis-text-template.png \
+ staroffice-oasis-text.png \
+ $(NULL)
+
+EXTRA_DIST= $(icon_DATA)
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrastInverse/Makefile
.am
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/Makefile.am
--- gnome-themes-2.18.0/icon-themes/HighContrastInverse/Makefile.am
2007-03-05 17:43:5
6.000000000 +0000
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrastInverse/Makefile.am
2007-03-13
13:01:28.368281000 +0000
@@ -3,3 +3,5 @@
indextheme_DATA = index.theme
EXTRA_DIST= $(indextheme_DATA)
+
+SUBDIRS= 16x16 32x32
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrastLargePrint/48x48
/apps/Makefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrastLargePrint/48x48/app
s/Makefile.am
---
gnome-themes-2.18.0/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am
20
07-03-05 17:43:53.000000000 +0000
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am
2007-03-13 13:06:46.483746000 +0000
@@ -78,6 +78,14 @@
panel-force-quit.png \
perfmeter.png \
star.png \
+ staroffice-base.png \
+ staroffice-calc.png \
+ staroffice-draw.png \
+ staroffice-impress.png \
+ staroffice-main.png \
+ staroffice-math.png \
+ staroffice-printeradmin.png \
+ staroffice-writer.png \
start-here.png \
window-capplet.png \
$(NULL)
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrastLargePrint/48x48
/mimetypes/Makefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrastLargePrint/48x4
8/mimetypes/Makefile.am
---
gnome-themes-2.18.0/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile.am
20
07-03-05 17:43:53.000000000 +0000
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefil
e.am 2007-03-13 13:08:54.226247000 +0000
@@ -14,6 +14,8 @@
gnome-mime-application-x-executable.png \
gnome-mime-audio.png \
gnome-mime-video.png \
+ staroffice-oasis-text-template.png \
+ staroffice-oasis-text.png \
$(NULL)
EXTRA_DIST= $(icon_DATA) \
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrastLargePrintInvers
e/48x48/apps/Makefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrastLargePrintInv
erse/48x48/apps/Makefile.am
---
gnome-themes-2.18.0/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile.am
2007-03-05 17:43:52.000000000 +0000
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makef
ile.am 2007-03-13 13:10:21.108226000 +0000
@@ -78,6 +78,14 @@
panel-force-quit.png \
perfmeter.png \
star.png \
+ staroffice-base.png \
+ staroffice-calc.png \
+ staroffice-draw.png \
+ staroffice-impress.png \
+ staroffice-main.png \
+ staroffice-math.png \
+ staroffice-printeradmin.png \
+ staroffice-writer.png \
start-here.png \
window-capplet.png \
$(NULL)
diff -urN -Xdiff-excludes.txt
gnome-themes-2.18.0/icon-themes/HighContrastLargePrintInvers
e/48x48/mimetypes/Makefile.am
gnome-themes-2.18.0-patched/icon-themes/HighContrastLargePri
ntInverse/48x48/mimetypes/Makefile.am
---
gnome-themes-2.18.0/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile
.am 2007-03-05 17:43:52.000000000 +0000
+++
gnome-themes-2.18.0-patched/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/
Makefile.am 2007-03-13 13:11:04.689500000 +0000
@@ -14,6 +14,8 @@
gnome-mime-application-x-executable.png \
gnome-mime-audio.png \
gnome-mime-video.png \
+ staroffice-oasis-text-template.png \
+ staroffice-oasis-text.png \
$(NULL)
EXTRA_DIST= $(icon_DATA) \
Index: spec-files/base-specs/gnome-themes.spec
===================================================================
--- spec-files/base-specs/gnome-themes.spec (revision 10855)
+++ spec-files/base-specs/gnome-themes.spec (working copy)
@@ -11,14 +11,13 @@
License: GPL
Group: System/GUI/GNOME
# icon-naming-utils should be bumped at the same time - it's a
dependency.
-Version: 2.17.91
+Version: 2.18.0
Release: 3
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME themes
-Source:
http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
-Source1: accessibility-icons.tar.gz
-Source2: staroffice8-accessibility-icons.tar.gz
+Source:
http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
+Source1: staroffice8-accessibility-icons.tar.gz
#owner:calumb date:2005-05-27 bugster:6298139 type:bug
Patch1: gnome-themes-01-add-so8-a11y-icons.diff
URL: http://www.gnome.org/
@@ -41,7 +40,6 @@
%setup -q
%patch1 -p1
gzip -dc %SOURCE1 | tar xvf -
-gzip -dc %SOURCE2 | tar xvf -
%build
@@ -91,6 +89,10 @@
%{_datadir}/locale/*/LC_MESSAGES/*.mo
%changelog
+* Tue Mar 13 2007 - calum.benson at sun.com
+- Bump to 2.18.0, required for reworked
gnome-themes-01-add-so8-a11y-icons.diff.
+ Also removed accessibility-icons.tar.gz, which is now upstream.
+
* Mon Mar 05 2007 - damien.carbery at sun.com
- Bump to 2.17.92.
--
CALUM BENSON, Usability Engineer Sun Microsystems Ireland
mailto:calum.benson at sun.com GNOME Desktop Group
http://ie.sun.com +353 1 819 9771
Any opinions are personal and not necessarily those of Sun Microsystems
