Revision: 16447
http://gar.svn.sourceforge.net/gar/?rev=16447&view=rev
Author: guengel
Date: 2011-12-09 17:58:48 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
gdk-pixbuf/trunk: Fixed some checkpkg complains. Renamed packages. Removed
unnecessary CATALOGNAMEs.
Modified Paths:
--------------
csw/mgar/pkg/gdk-pixbuf/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall
Removed Paths:
-------------
csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall
Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-09 16:09:08 UTC (rev
16446)
+++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-09 17:58:48 UTC (rev
16447)
@@ -12,60 +12,57 @@
MASTER_SITES = $(GNOME_MIRROR)
DISTFILES = $(DISTNAME).tar.xz
-DISTFILES += CSWgdkpixbuf.postinstall
+DISTFILES += CSWgdkpixbuf-loaders.postinstall
-EXPANDVARS = CSWgdkpixbuf.postinstall
+EXPANDVARS = CSWgdkpixbuf-loaders.postinstall
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
PACKAGES += CSWgdkpixbuf
-CATALOGNAME_CSWgdkpixbuf = gdkpixbuf
SPKG_DESC_CSWgdkpixbuf = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWgdkpixbuf = CSWlibgdk_pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk_pixbuf_xlib2-0-0
+RUNTIME_DEP_PKGS_CSWgdkpixbuf = CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0
+RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWgdkpixbuf-loaders
RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgio2-0-0
RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgmodule2-0-0
RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibintl8
RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibz1
+# I assume if one installs CSWgdkpixbuf, one wants all the stuff
+# except -dev
+CHECKPKG_OVERRIDES_CSWgdkpixbuf +=
surplus-dependency|CSWlibgdk-pixbuf-xlib2-0-0
+CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWgdkpixbuf-loaders
+PACKAGES += CSWlibgdk-pixbuf2-0-0
+SPKG_DESC_CSWlibgdk-pixbuf2-0-0 = $(DESCRIPTION), libgdk_pixbuf-2.0.so.0
+PKGFILES_CSWlibgdk-pixbuf2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf-2.0.so.0)
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 = CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibintl8
-PACKAGES += CSWlibgdk_pixbuf2-0-0
-SPKG_DESC_CSWlibgdk_pixbuf2-0-0 = $(DESCRIPTION), libgdk_pixbuf-2.0.so.0
-PKGFILES_CSWlibgdk_pixbuf2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf-2.0.so.0)
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 = CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibz1
+PACKAGES += CSWlibgdk-pixbuf-xlib2-0-0
+SPKG_DESC_CSWlibgdk-pixbuf-xlib2-0-0 = $(DESCRIPTION),
libgdk_pixbuf_xlib-2.0.so.0
+PKGFILES_CSWlibgdk-pixbuf-xlib2-0-0 = $(call
pkgfiles_lib,libgdk_pixbuf_xlib-2.0.so.0)
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 = CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibpng12-0
-PACKAGES += CSWlibgdk_pixbuf_xlib2-0-0
-SPKG_DESC_CSWlibgdk_pixbuf_xlib2-0-0 = $(DESCRIPTION),
libgdk_pixbuf_xlib-2.0.so.0
-PKGFILES_CSWlibgdk_pixbuf_xlib2-0-0 = $(call
pkgfiles_lib,libgdk_pixbuf_xlib-2.0.so.0)
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 = CSWlibgdk_pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibz1
-
PACKAGES += CSWgdkpixbuf-loaders
-CATALOGNAME_CSWgdkpixbuf-loaders = gdkpixbuf_loaders
SPKG_DESC_CSWgdkpixbuf-loaders = $(DESCRIPTION), loader modules
-PKGFILES_CSWgdkpixbuf-loaders = .*/loaders/.*\.so
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders = CSWlibgdk_pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWjbigkit
+PKGFILES_CSWgdkpixbuf-loaders = .*/loaders/.*\.so
+PKGFILES_CSWgdkpixbuf-loaders += .*/gdk-pixbuf-query-loaders
+RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders = CSWlibgdk-pixbuf2-0-0
RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgio2-0-0
RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgmodule2-0-0
@@ -74,14 +71,14 @@
RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibintl8
RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibjpeg7
RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibz1
RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWtiff
-PACKAGES += CSWgdkpixbuf-dev
-CATALOGNAME_CSWgdkpixbuf-dev = gdkpixbuf_dev
-SPKG_DESC_CSWgdkpixbuf-dev = Developtment files $(DESCRIPTION)
-PKGFILES_CSWgdkpixbuf-dev = $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-dev = CSWgdkpixbuf
+PACKAGES += CSWlibgdk-pixbuf-dev
+SPKG_DESC_CSWlibgdk-pixbuf-dev = Developtment files $(DESCRIPTION)
+PKGFILES_CSWlibgdk-pixbuf-dev = $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev = CSWgdkpixbuf
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf-xlib2-0-0
BUILD_DEP_PKGS = CSWggettext-dev
BUILD_DEP_PKGS += CSWjbigkit
@@ -92,10 +89,7 @@
BUILD_DEP_PKGS += CSWlibpng-dev
BUILD_DEP_PKGS += CSWtiff
-# I don't want to do this, but currently I see no other way to get the 32/64
-# binaries into the package. The default only includes the 32bit binaries, but
-# not the 64bit ones. --raos
-ISAEXEC = 1
+ISAEXEC = 0
BUILD64 = 1
CONFIGURE_ARGS = $(DIRPATHS)
Copied: csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall
(from rev 16442, csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall)
===================================================================
--- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall
(rev 0)
+++ csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall
2011-12-09 17:58:48 UTC (rev 16447)
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# We will call gdk-pixbuf-query-loaders for all ISAs
+
+GDKPBQUERY=gdk-pixbuf-query-loaders
+GDKPBQUERY_OPTS="--update-cache"
+
+echo "** Updating GDK pixbuf loaders"
+
+# But first, do the obvious
+/usr/bin/printf "- Default ISA... "
+@prefix@/bin/${GDKPBQUERY} ${GDKPBQUERY_OPTS} >/dev/null 2>&1
+if [ $? -ne 0 ]
+then
+ echo "Error"
+else
+ echo "OK"
+fi
+
+# Now, do all other
+for i in @BUILD_ISAS@
+do
+ queryloader=@prefix@/bin/$i/gdk-pixbuf-query-loaders
+ if [ -x "${queryloader}" ]
+ then
+ /usr/bin/printf "- $i ISA... "
+ "${queryloader}" ${GDKPBQUERY_OPTS} >/dev/null 2>&1
+ if [ $? -ne 0 ]
+ then
+ echo "Error"
+ else
+ echo "OK"
+ fi
+ fi
+done
+
+echo "** Done updating GDK pixbuf loaders"
Deleted: csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall
===================================================================
--- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall
2011-12-09 16:09:08 UTC (rev 16446)
+++ csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall
2011-12-09 17:58:48 UTC (rev 16447)
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# We will call gdk-pixbuf-query-loaders for all ISAs
-
-GDKPBQUERY=gdk-pixbuf-query-loaders
-GDKPBQUERY_OPTS="--update-cache"
-
-echo "** Updating GDK pixbuf loaders"
-
-# But first, do the obvious
-/usr/bin/printf "- Default ISA... "
-@prefix@/bin/${GDKPBQUERY} ${GDKPBQUERY_OPTS} >/dev/null 2>&1
-if [ $? -ne 0 ]
-then
- echo "Error"
-else
- echo "OK"
-fi
-
-# Now, do all other
-for i in @BUILD_ISAS@
-do
- queryloader=@prefix@/bin/$i/gdk-pixbuf-query-loaders
- if [ -x "${queryloader}" ]
- then
- /usr/bin/printf "- $i ISA... "
- "${queryloader}" ${GDKPBQUERY_OPTS} >/dev/null 2>&1
- if [ $? -ne 0 ]
- then
- echo "Error"
- else
- echo "OK"
- fi
- fi
-done
-
-echo "** Done updating GDK pixbuf loaders"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
