--- a/ChangeLog	Fri Sep 16 00:17:01 2005 +0000
+++ b/ChangeLog	Fri Sep 16 00:27:19 2005 +0000
@@ -1,3 +1,9 @@
+2005-09-15  Laszlo Peter  <[email protected]>
+
+	* iso-codes.spec: add patch msgfmt.diff
+	* patches/iso-codes-01-msgfmt.diff: new patch for removing GNU
+	  specific options of msgfmt
+
 2005-09-15  Laszlo Peter  <[email protected]>
 
 	* totem.spec: add iso-codes dependency

--- a/iso-codes.spec	Fri Sep 16 00:17:01 2005 +0000
+++ b/iso-codes.spec	Fri Sep 16 00:27:19 2005 +0000
@@ -17,6 +17,7 @@
 Vendor:       Sun Microsystems, Inc.
 Summary:      ISO code lists and translations
 Source:       ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes_%{version}.tar.gz
+Patch1:       iso-codes-01-msgfmt.diff
 URL:          http://alioth.debian.org/projects/pkg-isocodes/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -30,9 +31,14 @@
 
 %prep
 %setup -q -n iso-codes
+%patch -p1
 
 %build
+%ifos solaris
+make MSGFMT_OPTS=--verbose
+%else
 make
+%endif
 
 %install
 make install PREFIX=$RPM_BUILD_ROOT%{_prefix}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/iso-codes-01-msgfmt.diff	Fri Sep 16 00:27:19 2005 +0000
@@ -0,0 +1,123 @@
+diff -ur iso-codes.orig/iso_3166/Makefile iso-codes/iso_3166/Makefile
+--- iso-codes.orig/iso_3166/Makefile	2005-09-16 01:16:47.778880000 +0100
++++ iso-codes/iso_3166/Makefile	2005-09-16 01:19:00.071534000 +0100
+@@ -12,6 +12,7 @@
+ destdir=${PREFIX}/share/locale
+ SHAREDIR=${PREFIX}/share/iso-codes
+ SUBDIRS=iso_3166_1 iso_3166_2 iso_3166_3
++MSGFMT_OPTS=--verbose --check
+ 
+ all: iso_3166.pot ${MO_FILES}
+ 	for d in ${SUBDIRS} ; do ${MAKE} -C $$d all ; done
+@@ -34,7 +35,7 @@
+ 	  --no-location --add-comments $<
+ 
+ %.mo: %.po
+-	msgfmt --verbose --check $< -o $@
++	msgfmt $(MSGFMT_OPTS) $< -o $@
+ 
+ clean: 
+ 	rm -f iso_3166.pot *~ *.mo 
+diff -ur iso-codes.orig/iso_3166/iso_3166_1/Makefile iso-codes/iso_3166/iso_3166_1/Makefile
+--- iso-codes.orig/iso_3166/iso_3166_1/Makefile	2005-09-16 01:16:47.683110000 +0100
++++ iso-codes/iso_3166/iso_3166_1/Makefile	2005-09-16 01:18:28.935547000 +0100
+@@ -11,7 +11,7 @@
+ MKDIR_P=mkdir -p
+ destdir=${PREFIX}/share/locale
+ SHAREDIR=$(PREFIX)/share/iso-codes
+-
++MSGFMT_OPTS=--verbose --check
+ 
+ all: ${MO_FILES}
+ 
+@@ -34,7 +34,7 @@
+ 	 --from-code=UTF-8 --add-comments $<
+ 
+ %.mo: %.po
+-	msgfmt --verbose --check $< -o $@
++	msgfmt $(MSGFMT_OPTS) $< -o $@
+ 
+ clean: 
+ 	rm -f  *~ *.mo iso_*.h
+diff -ur iso-codes.orig/iso_3166/iso_3166_2/Makefile iso-codes/iso_3166/iso_3166_2/Makefile
+--- iso-codes.orig/iso_3166/iso_3166_2/Makefile	2005-09-16 01:16:47.841895000 +0100
++++ iso-codes/iso_3166/iso_3166_2/Makefile	2005-09-16 01:19:32.666453000 +0100
+@@ -11,7 +11,7 @@
+ MKDIR_P=mkdir -p
+ destdir=${PREFIX}/share/locale
+ SHAREDIR=$(PREFIX)/share/iso-codes
+-
++MSGFMT_OPTS=--verbose --check
+ 
+ all: ${MO_FILES}
+ 
+@@ -34,7 +34,7 @@
+ 	 --from-code=UTF-8  --output $@ $<
+ 
+ %.mo: %.po
+-	msgfmt --verbose --check $< -o $@
++	msgfmt $(MSGFMT_OPTS) $< -o $@
+ 
+ clean: 
+ 	rm -f  *~ *.mo iso_*.h
+diff -ur iso-codes.orig/iso_3166/iso_3166_3/Makefile iso-codes/iso_3166/iso_3166_3/Makefile
+--- iso-codes.orig/iso_3166/iso_3166_3/Makefile	2005-09-16 01:16:48.550787000 +0100
++++ iso-codes/iso_3166/iso_3166_3/Makefile	2005-09-16 01:19:53.465861000 +0100
+@@ -11,6 +11,7 @@
+ MKDIR_P=mkdir -p
+ destdir=${PREFIX}/share/locale
+ SHAREDIR=$(PREFIX)/share/iso-codes
++MSGFMT_OPTS=--verbose --check
+ 
+ all: ${MO_FILES}
+ 
+@@ -33,7 +34,7 @@
+ 	  --no-location --add-comments $<
+ 
+ %.mo: %.po
+-	msgfmt --verbose --check $< -o $@
++	msgfmt $(MSGFMT_OPTS) $< -o $@
+ 
+ clean: 
+ 	rm -f  *~ *.mo iso_*.h
+diff -ur iso-codes.orig/iso_4217/Makefile iso-codes/iso_4217/Makefile
+--- iso-codes.orig/iso_4217/Makefile	2005-09-16 01:16:48.578394000 +0100
++++ iso-codes/iso_4217/Makefile	2005-09-16 01:20:23.750675000 +0100
+@@ -12,6 +12,7 @@
+ INSTALL=/usr/bin/install -m 644 
+ destdir=${PREFIX}/share/locale
+ sharedir=${PREFIX}/share/iso-codes/
++MSGFMT_OPTS=--verbose --check
+ 
+ all: ${MO_FILES}
+ 
+@@ -34,7 +35,7 @@
+ 	  --from-code=UTF-8 --output $@ $<
+ 
+ %.mo: %.po
+-	msgfmt --verbose --check $< -o $@
++	msgfmt $(MSGFMT_OPTS) $< -o $@
+ 
+ clean: 
+ 	rm -f *.pot *~ *.mo *.h
+diff -ur iso-codes.orig/iso_639/Makefile iso-codes/iso_639/Makefile
+--- iso-codes.orig/iso_639/Makefile	2005-09-16 01:16:48.602853000 +0100
++++ iso-codes/iso_639/Makefile	2005-09-16 01:20:49.469291000 +0100
+@@ -14,6 +14,8 @@
+ includedir=${PREFIX}/include
+ destdir=${PREFIX}/share/locale
+ 
++MSGFMT_OPTS=--verbose --check
++
+ all: iso_639.pot ${MO_FILES}
+ 
+ install: ${HEADER_FILES} ${MO_FILES}
+@@ -36,7 +38,7 @@
+ 	 --output $@ --add-comments $<
+ 
+ %.mo: %.po
+-	msgfmt --verbose --check $< -o $@
++	msgfmt $(MSGFMT_OPTS) $< -o $@
+ 
+ clean: 
+ 	rm -f *.pot *~ *.mo *.h