this is a fix (much like the hal fix) for using FOSSglib2 on S10
or SUNWgnome-base-libs in SXCE for sharedmimeinfo.

Thoughts?

Index: SPECS/include/foss.inc
===================================================================
--- SPECS/include/foss.inc      (revision 2644)
+++ SPECS/include/foss.inc      (working copy)
@@ -39,10 +39,13 @@
 %define with_SUNWhal %(pkginfo -q SUNWhal && echo 1 || echo 0)
 # SUNWavahi-bridge-dsd is avahi from NEVADA
 %define with_SUNWavahi_bridge_dsd %(pkginfo -q SUNWavahi-bridge-dsd
&& echo 1 || echo 0)
+# SUNWgnome-base-libs is glib2 from NEVADA
+%define with_SUNWgnome_base_libs %(pkginfo -q SUNWgnome-base-libs &&
echo 1 || echo 0)
 # FOSS* are our Dude's things
 %define with_FOSSdbus %(pkginfo -q FOSSdbus && echo 1 || echo 0)
 %define with_FOSShal %(pkginfo -q FOSShal && echo 1 || echo 0)
 %define with_FOSSavahi %(pkginfo -q FOSSavahi && echo 1 || echo 0)
+%define with_FOSSglib2 %(pkginfo -q FOSSglib2 && echo 1 || echo 0)

 %if %with_FOSSavahi
 %define FOSSavahi_or_SUNWavahi FOSSavahi
@@ -50,6 +53,12 @@
 %define FOSSavahi_or_SUNWavahi SUNWavahi-bridge-dsd
 %endif

+%if %with_SUNWgnome_base_libs
+%define FOSSglib2_or_SUNWgnome_base_libs SUNWgnome_base_libs
+%else
+%define FOSSglib2_or_SUNWgnome_base_libs FOSSglib2
+%endif
+
 #

 %if %with_SUNWdbus
Index: SPECS/sharedmimeinfo.pspc
===================================================================
--- SPECS/sharedmimeinfo.pspc   (revision 2644)
+++ SPECS/sharedmimeinfo.pspc   (working copy)
@@ -7,7 +7,7 @@
 %define site_url
http://www.freedesktop.org/wiki/Software/shared-mime-info
 %define description    A collection of tools for the creation and
manipulation of Shared MIME-info specification
 %define build
-%define requires       FOSSgettext
+%define requires       FOSSgettext %FOSSglib2_or_SUNWgnome_base_libs
 #
 %define CPPFLAGS       %CPPFLAGS_C
 %define LDFLAGS                %LDFLAGS_C

Reply via email to