[csw-devel] SF.net SVN: gar:[8497] csw/mgar/pkg/libsoup/trunk

hson at users.sourceforge.net hson at users.sourceforge.net
Thu Feb 11 16:02:45 CET 2010 

Revision: 8497
          http://gar.svn.sourceforge.net/gar/?rev=8497&view=rev
Author:   hson
Date:     2010-02-11 15:02:45 +0000 (Thu, 11 Feb 2010)

Log Message:
-----------
Add empty libsoup2 package for compat
Include old libraries for compat
Ready for release

Modified Paths:
--------------
    csw/mgar/pkg/libsoup/trunk/Makefile
    csw/mgar/pkg/libsoup/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libsoup/trunk/files/old_libs_i386.tar.bz2
    csw/mgar/pkg/libsoup/trunk/files/old_libs_sparc.tar.bz2

Modified: csw/mgar/pkg/libsoup/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsoup/trunk/Makefile	2010-02-11 14:02:58 UTC (rev 8496)
+++ csw/mgar/pkg/libsoup/trunk/Makefile	2010-02-11 15:02:45 UTC (rev 8497)
@@ -1,6 +1,6 @@
 GARNAME = libsoup
 GARVERSION = 2.26.3
-CATEGORIES = lib
+CATEGORIES = gnome
   
  
 DESCRIPTION = HTTP client/server library for GNOME
@@ -8,31 +8,48 @@
 endef
 MASTER_SITES = $(GNOME_MIRROR)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
+DISTFILES += old_libs_i386.tar.bz2
+DISTFILES += old_libs_sparc.tar.bz2
 
-
-PACKAGES = CSWlibsoup CSWlibsoupdevel CSWlibsoupdoc
+PACKAGES = CSWlibsoup CSWlibsoupdevel CSWlibsoupdoc CSWlibsoup2
 CATALOGNAME_CSWlibsoup = libsoup
+CATALOGNAME_CSWlibsoup2 = libsoup2
 CATALOGNAME_CSWlibsoupdevel = libsoup_devel
 CATALOGNAME_CSWlibsoupdoc = libsoup_doc
 
 SPKG_DESC_CSWlibsoup += HTTP client/server library for GNOME
+# For compat with old packages
+SPKG_DESC_CSWlibsoup2 += HTTP client/server library for GNOME - dummy package
 SPKG_DESC_CSWlibsoupdevel += HTTP client/server library for GNOME - developer package
 SPKG_DESC_CSWlibsoupdoc += HTTP client/server library for GNOME - documentation
 
 RUNTIME_DEP_PKGS_CSWlibsoup += CSWgconf2 CSWgcrypt CSWggettextrt CSWglib2
 RUNTIME_DEP_PKGS_CSWlibsoup += CSWgnutls CSWgpgerr CSWlibproxy CSWlibxml2
 RUNTIME_DEP_PKGS_CSWlibsoup += CSWsqlite3rt
+# Required for old libraries
+RUNTIME_DEP_PKGS_CSWlibsoup += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibsoup += CSWsunmath
+RUNTIME_DEP_PKGS_CSWlibsoup += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWlibsoup
 RUNTIME_DEP_PKGS_CSWlibsoupdevel += CSWlibsoup
 RUNTIME_DEP_PKGS_CSWlibsoupdoc += 
 
 BUILD_DEP_PKGS += CSWlibproxy
 
+PKGFILES_CSWlibsoup2 = non-existing
 PKGFILES_CSWlibsoupdevel = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibsoupdoc = $(sharedstatedir)/gtk-doc/.*
 
 ARCHALL_CSWlibsoupdoc = 1
+ARCHALL_CSWlibsoup2 = 1
 
-# We define upstream file regex so we can be notifed of new upstream software release
+# libgnutls.so.11 no longer exists, but in case someone still use libsoup-2.0.so
+# and still have libgnutls.so.11 we override checkpkg
+CHECKPKG_OVERRIDES += CSWlibsoup|orphan-soname|libgnutls.so.11
+CHECKPKG_OVERRIDES += CSWlibsoup|symbol-not-found|libsoup-2.0.so.0.0.0
+# Possible bug in checkpkg
+CHECKPKG_OVERRIDES += CSWlibsoup|symbol-not-found|libsoup-gnome-2.4.so.1.2.0
+
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 EXTRA_INC = /opt/csw/X11/include
@@ -41,6 +58,7 @@
 EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-libgcrypt-prefix=$(prefix)
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
@@ -54,3 +72,20 @@
 TEST_TARGET = 
 
 include gar/category.mk
+
+# Include old libraries package for compatibility
+post-install-isa-sparcv8:
+	@(bzip2 -dc $(DOWNLOADDIR)/old_libs_sparc.tar.bz2 | (cd $(INSTALLISADIR)$(libdir);tar xf -))
+	( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.0.so.0 ] ; then ln -s libsoup-2.0.so.0.0.0 $(INSTALLISADIR)$(libdir)/libsoup-2.0.so.0 ; fi )
+	( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.0.so ] ; then ln -s libsoup-2.0.so.0.0.0 $(INSTALLISADIR)$(libdir)/libsoup-2.0.so ; fi )
+	( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.2.so.8 ] ; then ln -s libsoup-2.2.so.8.4.0 $(INSTALLISADIR)$(libdir)/libsoup-2.2.so.8 ; fi )
+	( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.2.so ] ; then ln -s libsoup-2.2.so.8.4.0 $(INSTALLISADIR)$(libdir)/libsoup-2.2.so ; fi )
+	$(MAKECOOKIE)
+
+post-install-isa-i386:
+	@(bzip2 -dc $(DOWNLOADDIR)/old_libs_i386.tar.bz2 | (cd $(INSTALLISADIR)$(libdir);tar xf -))
+	( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.0.so.0 ] ; then ln -s libsoup-2.0.so.0.0.0 $(INSTALLISADIR)$(libdir)/libsoup-2.0.so.0 ; fi )
+	( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.0.so ] ; then ln -s libsoup-2.0.so.0.0.0 $(INSTALLISADIR)$(libdir)/libsoup-2.0.so ; fi )
+	( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.2.so.8 ] ; then ln -s libsoup-2.2.so.8.4.0 $(INSTALLISADIR)$(libdir)/libsoup-2.2.so.8 ; fi )
+	( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.2.so ] ; then ln -s libsoup-2.2.so.8.4.0 $(INSTALLISADIR)$(libdir)/libsoup-2.2.so ; fi )
+	$(MAKECOOKIE)

Modified: csw/mgar/pkg/libsoup/trunk/checksums
===================================================================
--- csw/mgar/pkg/libsoup/trunk/checksums	2010-02-11 14:02:58 UTC (rev 8496)
+++ csw/mgar/pkg/libsoup/trunk/checksums	2010-02-11 15:02:45 UTC (rev 8497)
@@ -1 +1,3 @@
 19f15636380a9a08a0f071cc53069b80  libsoup-2.26.3.tar.bz2
+7664d9f4057e9d7ce89d3dd7d7466061  old_libs_i386.tar.bz2
+8bdff7a9f5b23bd63ffcf6fef24734e5  old_libs_sparc.tar.bz2

Added: csw/mgar/pkg/libsoup/trunk/files/old_libs_i386.tar.bz2
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/libsoup/trunk/files/old_libs_i386.tar.bz2
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/libsoup/trunk/files/old_libs_sparc.tar.bz2
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/libsoup/trunk/files/old_libs_sparc.tar.bz2
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


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