--- a/ChangeLog	Tue Mar 06 17:45:38 2007 +0000
+++ b/ChangeLog	Tue Mar 06 17:49:42 2007 +0000
@@ -1,3 +1,11 @@
+2007-03-06  Damien Carbery <[email protected]>
+
+	* SUNWgnome-themes.spec: Rename ICON_NAME_MAPPING_DIR var to INU_DATA_DIR
+	  after bumping icon-name-mapping.
+	* icon-name-mapping.spec: Remove upstream patch, 01-mapping-dir. Renumber rest.
+	* patches/icon-naming-utils-01-mapping-dir.diff: Removed, upstream.
+	* patches/icon-naming-utils-01-extra-file.diff: Added, renumber from 01.
+
 2007-03-06  Damien Carbery <[email protected]>
 
 	* base-specs/gnome-desktop.spec: Remove obsolete patch, 04-gok-menu.

--- a/SUNWgnome-themes.spec	Tue Mar 06 17:45:38 2007 +0000
+++ b/SUNWgnome-themes.spec	Tue Mar 06 17:49:42 2007 +0000
@@ -92,9 +92,7 @@
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 %icon_naming.build -d %name-%version
 
-# change ICON_NAME_MAPPING_DIR to INU_DATA_DIR when updating to the next
-# version of icon-naming-utils (and delete this comment ;)
-export ICON_NAME_MAPPING_DIR=%{_builddir}/%name-%version/icon-naming-utils-%{icon_naming.version}
+export INU_DATA_DIR=%{_builddir}/%name-%version/icon-naming-utils-%{icon_naming.version}
 chmod a+x $ICON_NAME_MAPPING_DIR/icon-name-mapping
 export PATH=$ICON_NAME_MAPPING_DIR:$PATH
 
@@ -177,6 +175,8 @@
 ) | $BASEDIR/lib/postrun -b -u -t 15 -c JDS
 
 %changelog
+* Tue Mar 06 2007 - [email protected]
+- Rename ICON_NAME_MAPPING_DIR var to INU_DATA_DIR after bumping icon-name-mapping.
 * Mon Aug 14 2006 - [email protected]
 - Fix path to icons dir in %preun.
 * Sat Aug 12 2006 - [email protected]

--- a/base-specs/icon-naming-utils.spec	Tue Mar 06 17:45:38 2007 +0000
+++ b/base-specs/icon-naming-utils.spec	Tue Mar 06 17:49:42 2007 +0000
@@ -18,14 +18,9 @@
 Vendor:       		Sun Microsystems, Inc.
 Summary:      		Icon naming utils
 Source:       		http://tango-project.org/releases/%name-%version.tar.gz
-# date:2005-10-15 owner:laca type:feature bugzilla:9101
-# you will need to update SUNWgnome-themes.spec after bumping to the
-# next version and removing this patch (which is now upstream)
-# search for ICON_NAME_MAPPING_DIR
-Patch1:                 icon-naming-utils-01-mapping-dir.diff
 # date:2006-09-19 owner:erwannc type:feature
 # FIXME: upstreamable?
-Patch2:                 icon-naming-utils-02-extra-file.diff
+Patch1:                 icon-naming-utils-01-extra-file.diff
 URL:          		http://www.tango-project.org/
 BuildRoot:    		%{_tmppath}/%{name}-%{version}-build
 Docdir:	      		%{_defaultdocdir}/doc
@@ -43,7 +38,6 @@
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 
 %build
 %ifos linux
@@ -83,7 +77,7 @@
 
 %changelog
 * Tue Mar 06 2006 - [email protected]
-- Bump to 0.8.2.
+- Bump to 0.8.2. Remove upstream patch, 01-mapping-dir. Renumber rest.
 * Wed Aug 23 2006 - [email protected]
 - Bump to 0.8.1.
 * Wed Aug 09 2006 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icon-naming-utils-01-extra-file.diff	Tue Mar 06 17:49:42 2007 +0000
@@ -0,0 +1,41 @@
+diff -u icon-naming-utils-0.8.1-orig/icon-name-mapping.pl.in icon-naming-utils-0.8.1/icon-name-mapping.pl.in
+--- icon-naming-utils-0.8.1-orig/icon-name-mapping.pl.in	Tue Sep 19 09:59:27 2006
++++ icon-naming-utils-0.8.1/icon-name-mapping.pl.in	Tue Sep 19 10:04:25 2006
+@@ -16,6 +16,7 @@
+ my $condir;
+ my $LN_S = ($^O eq 'MSWin32' ? 'cp' : 'ln -s');
+ my $mappingdir = "@DATADIR@";
++my $extrafile;
+ 
+ if (defined ($ENV{"ICON_NAME_MAPPING_DIR"})) {
+        $mappingdir = $ENV{ICON_NAME_MAPPING_DIR};
+@@ -27,9 +28,9 @@
+ 
+ Getopt::Long::Configure (@default_getopt_config);
+ GetOptions ("help|h" => \&usage,
+-	    "context|c=s" => \$condir);
++	    "context|c=s" => \$condir,
++	    "extrafile|e=s" => \$extrafile);
+ 
+-
+ ############################################################################
+ 
+ sub tls_load_mapping {
+@@ -75,6 +76,7 @@
+     print "Usage: $PROGRAM [OPTIONS] ...
+ 
+   -c, --context=<dirname>       Set up mapping for Context <dirname>
++  -e, --extrafile=<file>        Specify an extra mapping file <file>
+ 
+ This utility must be run from the <theme>/<size> directory, with a
+ context passsed in as the argument.
+@@ -89,4 +91,9 @@
+ } else {
+     my $iconmap = tls_load_mapping ("$mappingdir/legacy-icon-mapping.xml");
+     tls_map_icons ($iconmap, $condir);
++    if (defined $extrafile)
++    {
++      my $tmpiconmap = tls_load_mapping ("$extrafile");
++      tls_map_icons ($tmpiconmap, $condir);
++    }
+ }

--- a/patches/icon-naming-utils-01-mapping-dir.diff	Tue Mar 06 17:45:38 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
---- icon-naming-utils-0.6.2/icon-name-mapping.pl.in.orig	Wed Dec 21 16:34:15 2005
-+++ icon-naming-utils-0.6.2/icon-name-mapping.pl.in	Wed Dec 21 16:36:06 2005
-@@ -15,7 +15,12 @@
- 
- my $condir;
- my $LN_S = ($^O eq 'MSWin32' ? 'cp' : 'ln -s');
-+my $mappingdir = "@DATADIR@";
- 
-+if (defined ($ENV{"ICON_NAME_MAPPING_DIR"})) {
-+       $mappingdir = $ENV{ICON_NAME_MAPPING_DIR};
-+}
-+
- ############################################################################
- my @default_getopt_config = ("permute", "pass_through", "bundling",
- 			     "no_auto_abbrev", "no_ignore_case");
-@@ -80,6 +80,6 @@
- if (not defined $condir) {
-     usage ();
- } else {
--    my $iconmap = tls_load_mapping ("@DATADIR@/legacy-icon-mapping.xml");
-+    my $iconmap = tls_load_mapping ("$mappingdir/legacy-icon-mapping.xml");
-     tls_map_icons ($iconmap, $condir);
- }

--- a/patches/icon-naming-utils-02-extra-file.diff	Tue Mar 06 17:45:38 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-diff -u icon-naming-utils-0.8.1-orig/icon-name-mapping.pl.in icon-naming-utils-0.8.1/icon-name-mapping.pl.in
---- icon-naming-utils-0.8.1-orig/icon-name-mapping.pl.in	Tue Sep 19 09:59:27 2006
-+++ icon-naming-utils-0.8.1/icon-name-mapping.pl.in	Tue Sep 19 10:04:25 2006
-@@ -16,6 +16,7 @@
- my $condir;
- my $LN_S = ($^O eq 'MSWin32' ? 'cp' : 'ln -s');
- my $mappingdir = "@DATADIR@";
-+my $extrafile;
- 
- if (defined ($ENV{"ICON_NAME_MAPPING_DIR"})) {
-        $mappingdir = $ENV{ICON_NAME_MAPPING_DIR};
-@@ -27,9 +28,9 @@
- 
- Getopt::Long::Configure (@default_getopt_config);
- GetOptions ("help|h" => \&usage,
--	    "context|c=s" => \$condir);
-+	    "context|c=s" => \$condir,
-+	    "extrafile|e=s" => \$extrafile);
- 
--
- ############################################################################
- 
- sub tls_load_mapping {
-@@ -75,6 +76,7 @@
-     print "Usage: $PROGRAM [OPTIONS] ...
- 
-   -c, --context=<dirname>       Set up mapping for Context <dirname>
-+  -e, --extrafile=<file>        Specify an extra mapping file <file>
- 
- This utility must be run from the <theme>/<size> directory, with a
- context passsed in as the argument.
-@@ -89,4 +91,9 @@
- } else {
-     my $iconmap = tls_load_mapping ("$mappingdir/legacy-icon-mapping.xml");
-     tls_map_icons ($iconmap, $condir);
-+    if (defined $extrafile)
-+    {
-+      my $tmpiconmap = tls_load_mapping ("$extrafile");
-+      tls_map_icons ($tmpiconmap, $condir);
-+    }
- }