8 files changed, 160 insertions, 137 deletions

diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 9ec46a216b47..de94498353f1 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ggv2
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.0
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
 DISTNAME=	ggv-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -19,12 +19,14 @@ COMMENT=	GNOME 2 ghostscript viewer
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui desktopfileutils
 USE_GHOSTSCRIPT=yes
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	ggv.schemas
+
 pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO_MSG} ""
diff --git a/print/ggv2/distinfo b/print/ggv2/distinfo
index 5561d3d067a4..84cc3aba2a74 100644
--- a/print/ggv2/distinfo
+++ b/print/ggv2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/ggv-2.6.2.tar.bz2) = c02779b6ac22331c60df568301ca48c5
-SIZE (gnome2/ggv-2.6.2.tar.bz2) = 1234678
+MD5 (gnome2/ggv-2.8.0.tar.bz2) = 1a8e9e43ef793ef3221c5afb15d14a81
+SIZE (gnome2/ggv-2.8.0.tar.bz2) = 1280464
diff --git a/print/ggv2/pkg-descr b/print/ggv2/pkg-descr
index 7c8fde6e01a4..c59727e1facc 100644
--- a/print/ggv2/pkg-descr
+++ b/print/ggv2/pkg-descr
@@ -1 +1,4 @@
-GNOME 2 ghostscript viewer.
+GGV, the Gnome GhostView, is a Gnome PostScript document previewer.
+It can also preview PDFs, but as it is not a native PDF viewer, it
+does not take advantage of all the features of the PDF format.
+graphics/gpdf is a more capable PDF viewer.
diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist
index b8fadd8ad63e..0e2c4955abc6 100644
--- a/print/ggv2/pkg-plist
+++ b/print/ggv2/pkg-plist
@@ -1,10 +1,8 @@
 bin/ggv
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/ggv.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/ggv.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/ggv.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_GGV.server
 libexec/ggv-postscript-viewer
 share/gnome/applications/ggv.desktop
+@exec update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/gnome-2.0/ui/ggv-control-ui.xml
 share/gnome/gnome-2.0/ui/ggv-postscript-view-ui.xml
 share/gnome/gnome-2.0/ui/ggv-ui.xml
@@ -78,6 +76,7 @@ share/locale/az/LC_MESSAGES/ggv.mo
 share/locale/be/LC_MESSAGES/ggv.mo
 share/locale/bg/LC_MESSAGES/ggv.mo
 share/locale/bn/LC_MESSAGES/ggv.mo
+share/locale/bs/LC_MESSAGES/ggv.mo
 share/locale/ca/LC_MESSAGES/ggv.mo
 share/locale/cs/LC_MESSAGES/ggv.mo
 share/locale/cy/LC_MESSAGES/ggv.mo
@@ -107,11 +106,11 @@ share/locale/kn/LC_MESSAGES/ggv.mo
 share/locale/ko/LC_MESSAGES/ggv.mo
 share/locale/lt/LC_MESSAGES/ggv.mo
 share/locale/lv/LC_MESSAGES/ggv.mo
-share/locale/mi/LC_MESSAGES/ggv.mo
 share/locale/mk/LC_MESSAGES/ggv.mo
 share/locale/ml/LC_MESSAGES/ggv.mo
 share/locale/mn/LC_MESSAGES/ggv.mo
 share/locale/ms/LC_MESSAGES/ggv.mo
+share/locale/nb/LC_MESSAGES/ggv.mo
 share/locale/nl/LC_MESSAGES/ggv.mo
 share/locale/nn/LC_MESSAGES/ggv.mo
 share/locale/no/LC_MESSAGES/ggv.mo
@@ -167,3 +166,4 @@ share/locale/zh_TW/LC_MESSAGES/ggv.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ggv/ggv-sv.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ggv/ggv-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ggv/ggv-zh_TW.omf 2>/dev/null || /usr/bin/true
+@unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index c43318cc29f6..eed9204f9802 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.0.1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,13 +20,14 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier libbonobo libartlgpl2 \
-		gtk20 lthack
+		gtk20
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION=${PORTVERSION}
+PLIST_SUB=	VERSION=${PORTVERSION} \
+		LIBVERSION=2.2
 
 .include <bsd.port.pre.mk>
 
@@ -36,7 +37,7 @@ WITH_CUPS=	yes
 
 .if defined(WITH_CUPS) && !defined(WITHOUT_CUPS)
 CONFIGURE_ARGS+=	--with-cups
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+LIB_DEPENDS+=		gnomecups-1.0:${PORTSDIR}/print/libgnomecups
 PLIST_SUB+=		CUPS:=""
 .else
 CONFIGURE_ARGS+=	--without-cups
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 9ed244ed13f3..ec07a4247f69 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeprint-2.6.2.tar.bz2) = f742bb321fab833b67270f7b86af0fdb
-SIZE (gnome2/libgnomeprint-2.6.2.tar.bz2) = 701216
+MD5 (gnome2/libgnomeprint-2.8.0.1.tar.bz2) = 0473bf1976c2d4ec5a52bb66cf6b8464
+SIZE (gnome2/libgnomeprint-2.8.0.1.tar.bz2) = 751808
diff --git a/print/libgnomeprint/files/patch-libgnomeprint_ttsubset_sft.h b/print/libgnomeprint/files/patch-libgnomeprint_ttsubset_sft.h
new file mode 100644
index 000000000000..9a4a497820fa
--- /dev/null
+++ b/print/libgnomeprint/files/patch-libgnomeprint_ttsubset_sft.h
@@ -0,0 +1,11 @@
+--- libgnomeprint/ttsubset/sft.h.orig	Thu Jul  1 13:18:38 2004
++++ libgnomeprint/ttsubset/sft.h	Thu Jul  1 13:20:14 2004
+@@ -103,7 +103,7 @@
+ #endif
+ #endif
+ 
+-#ifdef __i386
++#if defined(__i386) || defined(__alpha__)
+ #ifndef G_LITTLE_ENDIAN
+ #define G_LITTLE_ENDIAN
+ #endif
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index b3799487bdbf..3de3913d7fdd 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -1,65 +1,69 @@
 etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
-include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h
-include/libgnomeprint-2.2/libgnomeprint/gnome-font.h
-include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h
-include/libgnomeprint-2.2/libgnomeprint/gnome-pgl.h
-include/libgnomeprint-2.2/libgnomeprint/gnome-print-config.h
-include/libgnomeprint-2.2/libgnomeprint/gnome-print-job.h
-include/libgnomeprint-2.2/libgnomeprint/gnome-print-paper.h
-include/libgnomeprint-2.2/libgnomeprint/gnome-print-unit.h
-include/libgnomeprint-2.2/libgnomeprint/gnome-print.h
-include/libgnomeprint-2.2/libgnomeprint/gnome-rfont.h
-include/libgnomeprint-2.2/libgnomeprint/gp-gc.h
-include/libgnomeprint-2.2/libgnomeprint/libgnomeprint-enum-types.h
-include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.h
-include/libgnomeprint-2.2/libgnomeprint/private/gnome-fontmap.h
-include/libgnomeprint-2.2/libgnomeprint/private/gnome-glyphlist-private.h
-include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-config-private.h
-include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-pango.h
-include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h
-include/libgnomeprint-2.2/libgnomeprint/private/gp-gc-private.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-config.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-key.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-list.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-model.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-node-private.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-node.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-option.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-printer.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-reference.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-root.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-settings.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-font-face.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-font.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-glyphlist.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-pango.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-pgl.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-config.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-job.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-paper.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-unit.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-rfont.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gp-gc.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/libgnomeprint-enum-types.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-font-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-fontmap.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-glyphlist-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-print-config-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-print-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gp-gc-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-config.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-key.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-list.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-model.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-node-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-node.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-option.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-printer.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-reference.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-root.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-settings.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-state.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-utils.h
 lib/libgnomeprint-2-2.a
 lib/libgnomeprint-2-2.so
 lib/libgnomeprint-2-2.so.1
 %%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so
+lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintlpd.so
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-custom.so
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-file.so
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.so
-libdata/pkgconfig/libgnomeprint-2.2.pc
-share/doc/libgnomeprint/home.png
-share/doc/libgnomeprint/index.html
-share/doc/libgnomeprint/index.sgml
-share/doc/libgnomeprint/left.png
-share/doc/libgnomeprint/libgnomeprint-building.html
-share/doc/libgnomeprint/libgnomeprint-compiling.html
-share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html
-share/doc/libgnomeprint/libgnomeprint-gnome-font.html
-share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html
-share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-job.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print.html
-share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html
-share/doc/libgnomeprint/libgnomeprint-resources.html
-share/doc/libgnomeprint/libgnomeprint.html
-share/doc/libgnomeprint/libgnomeprintunsorted.html
-share/doc/libgnomeprint/right.png
-share/doc/libgnomeprint/style.css
-share/doc/libgnomeprint/up.png
+libdata/pkgconfig/libgnomeprint-%%LIBVERSION%%.pc
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgnomeprint-Pango-Integration.html
+%%DOCSDIR%%/libgnomeprint-building.html
+%%DOCSDIR%%/libgnomeprint-compiling.html
+%%DOCSDIR%%/libgnomeprint-gnome-font-face.html
+%%DOCSDIR%%/libgnomeprint-gnome-font.html
+%%DOCSDIR%%/libgnomeprint-gnome-glyphlist.html
+%%DOCSDIR%%/libgnomeprint-gnome-pgl.html
+%%DOCSDIR%%/libgnomeprint-gnome-print-config.html
+%%DOCSDIR%%/libgnomeprint-gnome-print-job.html
+%%DOCSDIR%%/libgnomeprint-gnome-print-paper.html
+%%DOCSDIR%%/libgnomeprint-gnome-print-unit.html
+%%DOCSDIR%%/libgnomeprint-gnome-print.html
+%%DOCSDIR%%/libgnomeprint-gnome-rfont.html
+%%DOCSDIR%%/libgnomeprint-resources.html
+%%DOCSDIR%%/libgnomeprint.devhelp
+%%DOCSDIR%%/libgnomeprint.html
+%%DOCSDIR%%/libgnomeprintunsorted.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
 share/gnome/libgnomeprint/%%VERSION%%/globals.xml
 share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-GENERIC-PS.xml
 share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-PDF-WRITER.xml
@@ -67,80 +71,82 @@ share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled/GNOME-META.xml
 share/gnome/libgnomeprint/%%VERSION%%/printers/GENERIC.xml
 share/gnome/libgnomeprint/%%VERSION%%/printers/PDF-WRITER.xml
 share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled/META.xml
-share/locale/am/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ar/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/be/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/bn/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ca/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/cs/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/cy/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/el/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/en_CA/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/en_GB/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/es/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/et/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/eu/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/fa/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/fi/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/fr/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ga/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/gu/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/he/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/hi/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/hr/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/hu/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/id/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/is/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/it/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ja/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ko/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/lt/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/lv/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/mk/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ml/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/mn/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/mr/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/nn/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/no/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/pa/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/pl/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/pt/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ro/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ru/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/sk/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/sl/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/sq/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/sr/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/sr@Latn/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/sv/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ta/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/th/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/tr/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/uk/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/am/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ar/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/az/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/be/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/bg/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/bn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/bs/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ca/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/cs/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/cy/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/da/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/de/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/el/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/es/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/et/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/eu/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/fa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/fi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/fr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ga/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/gu/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/he/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/hi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/hr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/hu/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/id/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/is/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/it/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ja/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ko/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/lt/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/lv/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/mk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ml/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/mn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/mr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ms/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/nb/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/nl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/nn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/no/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/pa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/pl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/pt/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ro/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ru/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sq/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sv/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ta/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/th/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/tr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/uk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/vi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/wa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/models
 @dirrm share/gnome/libgnomeprint/%%VERSION%%
 @dirrm share/gnome/libgnomeprint
-@dirrm share/doc/libgnomeprint
+@dirrm %%DOCSDIR%%
 @dirrm lib/libgnomeprint/%%VERSION%%/modules/transports
 @dirrm lib/libgnomeprint/%%VERSION%%/modules
 @dirrm lib/libgnomeprint/%%VERSION%%
 @dirrm lib/libgnomeprint
-@dirrm include/libgnomeprint-2.2/libgnomeprint/private
-@dirrm include/libgnomeprint-2.2/libgnomeprint
-@dirrm include/libgnomeprint-2.2
+@dirrm include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private
+@dirrm include/libgnomeprint-%%LIBVERSION%%/libgnomeprint
+@dirrm include/libgnomeprint-%%LIBVERSION%%
 @dirrm etc/gnome/libgnomeprint-2.0/fonts
 @dirrm etc/gnome/libgnomeprint-2.0