[csw-devel] SF.net SVN: gar:[18403] csw/mgar/pkg/cups/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Thu Jun 14 14:04:13 CEST 2012
Revision: 18403
http://gar.svn.sourceforge.net/gar/?rev=18403&view=rev
Author: cgrzemba
Date: 2012-06-14 12:04:13 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
cups/trunk: add patch for use Posix SH
Modified Paths:
--------------
csw/mgar/pkg/cups/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch
Modified: csw/mgar/pkg/cups/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cups/trunk/Makefile 2012-06-14 10:21:52 UTC (rev 18402)
+++ csw/mgar/pkg/cups/trunk/Makefile 2012-06-14 12:04:13 UTC (rev 18403)
@@ -51,6 +51,7 @@
DISTFILES += CSWcupsclient.README
PATCHFILES += 0001-cswcups-for-the-service-name.patch
+PATCHFILES += 0002-use-posix-shell-in-install.sh.patch
# PATCHFILES = 0001-cswcups-for-service-name.patch
# PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch
# PATCHFILES += 0003-Reference-counting-for-printers-only.patch
@@ -66,7 +67,7 @@
LICENSE = LICENSE.txt
GARCOMPILER ?= SOS12U3 # SOS12U3
-PACKAGING_PLATFORMS = solaris10-i368 solaris10-sparc
+PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
BUILD_DEP_PKGS = CSWggettext-dev
BUILD_DEP_PKGS += CSWlibjpeg-dev
@@ -231,7 +232,6 @@
RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibk5crypto3
RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibkrb5-3
RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibz1
-OBSOLETED_BY_CSWlibcups2 += CSWlibcups
PACKAGES += CSWlibcupscgi1
SPKG_DESC_CSWlibcupscgi1 = CUPS libraries, libcupscgi.so.1
@@ -244,7 +244,6 @@
RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibk5crypto3
RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibkrb5-3
RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibz1
-OBSOLETED_BY_CSWlibcupscgi1 += CSWlibcups
PACKAGES += CSWlibcupsdriver1
SPKG_DESC_CSWlibcupsdriver1 = CUPS libraries, libcupsdriver.so.1
@@ -257,7 +256,6 @@
RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibkrb5-3
RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibgnutls26
RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibk5crypto3
-OBSOLETED_BY_CSWlibcupsdriver1 += CSWlibcups
PACKAGES += CSWlibcupsimage2
SPKG_DESC_CSWlibcupsimage2 = CUPS libraries, libcupsimage.so.2
@@ -273,7 +271,6 @@
RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibpng12-0
RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibtiff3
-OBSOLETED_BY_CSWlibcupsimage2 += CSWlibcups
PACKAGES += CSWlibcupsmime1
SPKG_DESC_CSWlibcupsmime1 = CUPS libraries, libcupsmime.so.1
@@ -286,7 +283,6 @@
RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibk5crypto3
RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibkrb5-3
RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibz1
-OBSOLETED_BY_CSWlibcupsmime1 += CSWlibcups
PACKAGES += CSWlibcupsppdc1
SPKG_DESC_CSWlibcupsppdc1 = CUPS libraries, libcupsppdc.so.1
@@ -299,7 +295,6 @@
RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibkrb5-3
RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgnutls26
RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibk5crypto3
-OBSOLETED_BY_CSWlibcupsppdc1 += CSWlibcups
# For some reason -norunpath is not used here, investigate later
CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry
Added: csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch
===================================================================
--- csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch (rev 0)
+++ csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch 2012-06-14 12:04:13 UTC (rev 18403)
@@ -0,0 +1,22 @@
+From c41d2095c743121b31801bfe675a8fe415714022 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Thu, 14 Jun 2012 11:46:25 +0200
+Subject: [PATCH] use posix shell in install.sh
+
+---
+ install-sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/install-sh b/install-sh
+index baa6e08..5bf1d50 100755
+--- a/install-sh
++++ b/install-sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/xpg4/bin/sh
+ #
+ # "$Id: install-sh 10317 2012-03-01 00:05:55Z mike $"
+ #
+--
+1.7.10.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list