From: <yi...@us...> - 2008-04-29 20:27:39
|
Revision: 1071 http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1071&view=rev Author: yippi Date: 2008-04-29 13:27:43 -0700 (Tue, 29 Apr 2008) Log Message: ----------- 2008-04-28 Brian Cameron <bri...@su...> * SFEcodeina.spec, patches/codeina-02-nolsb.diff: Update patch based on comments from the codeina maintainer, and also update some comments. Modified Paths: -------------- spec-files-extra/trunk/ChangeLog spec-files-extra/trunk/SFEcodeina.spec spec-files-extra/trunk/patches/codeina-02-nolsb.diff Modified: spec-files-extra/trunk/ChangeLog =================================================================== --- spec-files-extra/trunk/ChangeLog 2008-04-29 17:04:02 UTC (rev 1070) +++ spec-files-extra/trunk/ChangeLog 2008-04-29 20:27:43 UTC (rev 1071) @@ -1,5 +1,11 @@ 2008-04-28 Brian Cameron <bri...@su...> + * SFEcodeina.spec, patches/codeina-02-nolsb.diff: Update patch + based on comments from the codeina maintainer, and also update + some comments. + +2008-04-28 Brian Cameron <bri...@su...> + * SFEgdata-python.spec: Add new spec file for Google Data python module. * SFEpyopenssl.spec: Fix comment. Modified: spec-files-extra/trunk/SFEcodeina.spec =================================================================== --- spec-files-extra/trunk/SFEcodeina.spec 2008-04-29 17:04:02 UTC (rev 1070) +++ spec-files-extra/trunk/SFEcodeina.spec 2008-04-29 20:27:43 UTC (rev 1071) @@ -22,6 +22,8 @@ # # svn co https://core.fluendo.com/gstreamer/svn/codeina/trunk/ codeina # +# bugdb: https://core.fluendo.com/gstreamer/trac/ +# %define pythonver 2.4 %include Solaris.inc @@ -34,7 +36,11 @@ # See instructions at the top of the spec-file. # Source0: http://fedoraproject.org/wiki/Multimedia/Codeina/codeina-%{version}.tar.bz2 +# According to the codeina developers, GTK+ mozembed crashes when using Python +# 2.4 on some distros. Hopefully this problem doesn't exist on Solaris. For +# now I will just patch the code to use our existing Python 2.4. Patch1: codeina-01-fixpython.diff +# This patch is reported upstream as bug #132. Patch2: codeina-02-nolsb.diff SUNW_BaseDir: %{_basedir} BuildRoot: %{_tmppath}/codeina-%{version}-build Modified: spec-files-extra/trunk/patches/codeina-02-nolsb.diff =================================================================== --- spec-files-extra/trunk/patches/codeina-02-nolsb.diff 2008-04-29 17:04:02 UTC (rev 1070) +++ spec-files-extra/trunk/patches/codeina-02-nolsb.diff 2008-04-29 20:27:43 UTC (rev 1071) @@ -1,12 +1,31 @@ ---- codeina-0.10.2.1/codeina/check.py-orig 2008-04-24 18:55:55.050009000 -0500 -+++ codeina-0.10.2.1/codeina/check.py 2008-04-24 19:02:27.626356000 -0500 -@@ -306,21 +306,25 @@ def find_system_details(): +--- codeina-0.10.2.1/codeina/check.py-orig 2008-04-29 12:42:00.538098000 -0500 ++++ codeina-0.10.2.1/codeina/check.py 2008-04-29 12:47:47.217251000 -0500 +@@ -297,8 +297,17 @@ def find_system_details(): + global GST_PLUGINS_BASE_VERSION + + u = os.uname() +- OS_NAME = u[0] +- ARCH_NAME = u[4] ++# OS_NAME = u[0] ++# ARCH_NAME = u[4] ++# os.uname() returns "SunOS" for OS_NAME and "i386pc" for ARCH_NAME ++# on my i386 box. ++# ++# However, to work with the Fluendo store we need ARCH_NAME to be ++# intel or sparc, and OS_NAME needs to be "solaris". So just ++# hardcode. ++# ++ OS_NAME = "solaris" ++ ARCH_NAME = "intel" + + # for now munge everything x86 to i386 + +@@ -306,21 +315,27 @@ def find_system_details(): ARCH_NAME = "i386" # Find distro name - DISTRO_NAME = _get_distro_id_from_lsb_release() + # DISTRO_NAME = _get_distro_id_from_lsb_release() -+ DISTRO_NAME = "solaris" - if not DISTRO_NAME: - DISTRO_NAME = _get_distro_id_from_release_file() @@ -28,6 +47,9 @@ + # if not DISTRO_VERSION: + # DISTRO_VERSION = 'any' + ++ # Just hack DISTRO_NAME to "solaris" and DISTRO_VERSION to "any". ++ # ++ DISTRO_NAME = 'solaris' + DISTRO_VERSION = 'any' - DISTRO_VERSION = _get_distro_version_from_lsb_release () This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |