[csw-devel] SF.net SVN: gar:[16440] csw/mgar/pkg/shared-mime-info/trunk

[guengel at users.sourceforge.net]

Revision: 16440
          http://gar.svn.sourceforge.net/gar/?rev=16440&view=rev
Author:   guengel
Date:     2011-12-09 13:07:49 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
shared-mime-info/trunk: Added patch for XDG_DATA_DIRS defaults. Made checkpkg happy.

Modified Paths:
--------------
    csw/mgar/pkg/shared-mime-info/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/shared-mime-info/trunk/files/
    csw/mgar/pkg/shared-mime-info/trunk/files/0001-Set-default-XDG_DATA_DIRS-to-opt-csw-share.patch

Modified: csw/mgar/pkg/shared-mime-info/trunk/Makefile
===================================================================
--- csw/mgar/pkg/shared-mime-info/trunk/Makefile	2011-12-09 12:34:01 UTC (rev 16439)
+++ csw/mgar/pkg/shared-mime-info/trunk/Makefile	2011-12-09 13:07:49 UTC (rev 16440)
@@ -14,6 +14,10 @@
 MASTER_SITES = http://freedesktop.org/~hadess/
 DISTFILES    = $(NAME)-$(VERSION).tar.bz2
 
+# This is for replacing /usr/local/share by /opt/csw/share in the
+# default XDG_DATA_DIRS
+PATCHFILES += 0001-Set-default-XDG_DATA_DIRS-to-opt-csw-share.patch
+
 # This is because CSWlibglib2-0-0 is only available on Solaris 10+
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
@@ -24,10 +28,18 @@
 
 PACKAGES = CSWsharedmimeinfo
 CATALOGNAME = shared_mime_info
+CHECKPKG_OVERRIDES  = catalogname-does-not-match-pkgname|pkgname=CSWsharedmimeinfo|catalogname=shared_mime_info|expected-catalogname=sharedmimeinfo
 
+# /usr/local does no harm here
+CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/mime/mime.cache
+CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/mime/magic
+CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/mime/packages/freedesktop.org.xml
+# My patch does deliberately not remove /usr/share
+CHECKPKG_OVERRIDES += file-with-bad-content|/usr/share|root/opt/csw/bin/update-mime-database
+
 SPKG_SOURCEURL = http://freedesktop.org/Software/shared-mime-info
 
-RUNTIME_DEP_PKGS = CSWggettextrt CSWlibxml2 CSWlibglib2-0-0
+RUNTIME_DEP_PKGS += CSWlibglib2-0-0 CSWlibintl8 CSWlibxml2-2
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Added: csw/mgar/pkg/shared-mime-info/trunk/files/0001-Set-default-XDG_DATA_DIRS-to-opt-csw-share.patch
===================================================================
--- csw/mgar/pkg/shared-mime-info/trunk/files/0001-Set-default-XDG_DATA_DIRS-to-opt-csw-share.patch	                        (rev 0)
+++ csw/mgar/pkg/shared-mime-info/trunk/files/0001-Set-default-XDG_DATA_DIRS-to-opt-csw-share.patch	2011-12-09 13:07:49 UTC (rev 16440)
@@ -0,0 +1,25 @@
+From 132f3284d0dc791c72af10063524915de5e17a8d Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Fri, 9 Dec 2011 13:43:45 +0100
+Subject: [PATCH] Set default XDG_DATA_DIRS to /opt/csw/share
+
+---
+ update-mime-database.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/update-mime-database.c b/update-mime-database.c
+index d195594..9339b06 100644
+--- a/update-mime-database.c
++++ b/update-mime-database.c
+@@ -2077,7 +2077,7 @@ static void check_in_path_xdg_data(const char *mime_path)
+ 
+ 	env = getenv("XDG_DATA_DIRS");
+ 	if (!env)
+-		env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/";
++		env = "/opt/csw/share/"PATH_SEPARATOR"/usr/share/";
+ 	dirs = g_strsplit(env, PATH_SEPARATOR, 0);
+ 	g_return_if_fail(dirs != NULL);
+ 	for (n = 0; dirs[n]; n++)
+-- 
+1.7.6.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.