From 58bf7bcf7b34aac4a3c858d1cff407649e3f86db Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Apr 03 2010 23:47:51 +0000 Subject: - New upstream 65 release --- diff --git a/.cvsignore b/.cvsignore index bf4327b..0d3f8f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Record-64.tar.bz2 +record-65.xo diff --git a/import.log b/import.log deleted file mode 100644 index 5da09f3..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -sugar-record-64-3_fc11:HEAD:sugar-record-64-3.fc11.src.rpm:1250808373 diff --git a/sources b/sources index 1776174..7caa624 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef704d31ddc12eec4fe693822aa32283 Record-64.tar.bz2 +d57bfdaec508197de64bfb7b9b832d30 record-65.xo diff --git a/sugar-record-build-binary-properly.patch b/sugar-record-build-binary-properly.patch deleted file mode 100644 index 0cb8942..0000000 --- a/sugar-record-build-binary-properly.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur a/camerac/Makefile b/camerac/Makefile ---- a/camerac/Makefile 2009-06-01 14:50:42.000000000 +0200 -+++ b/camerac/Makefile 2010-02-18 18:06:06.000000000 +0100 -@@ -20,17 +20,12 @@ - INCLUDES=-I. -I/usr/include/${PYTHON} ${GLIB_INCLUDES} ${PYGTK_INCLUDES} ${CAIRO_INCLUDES} ${PYCAIRO_INCLUDES} ${GTK_INCLUDES} - OPTFLAGS=-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables - CFLAGS=-g -fPIC -DPIC $(OPTFLAGS) $(INCLUDES) --LDFLAGS=-shared -nostdlib -Wl,--export-dynamic -pthread ${GLIB_LIBS} ${PYGTK_LIBS} ${CAIRO_LIBS} ${PYCAIRO_LIBS} ${GTK_LIBS} $(PYTHON_LIBS) -+LDFLAGS=-shared -Wl,--export-dynamic -pthread ${GLIB_LIBS} ${PYGTK_LIBS} ${CAIRO_LIBS} ${PYCAIRO_LIBS} ${GTK_LIBS} $(PYTHON_LIBS) - - ARCH = $(shell arch | grep 64 >/dev/null && echo linux64 || echo linux32) - LIB_DIR = $(ARCH)_$(PYVER) - - all: camera.so -- rm -rf $(LIB_DIR) -- mkdir $(LIB_DIR) -- strip -s $^ -- mv $^ $(LIB_DIR)/ -- touch $(LIB_DIR)/__init__.py - - camera.so: camera.o - $(CXX) $(LDFLAGS) -o $@ $^ diff --git a/sugar-record-no-bundled-libs.patch b/sugar-record-no-bundled-libs.patch deleted file mode 100644 index b20b579..0000000 --- a/sugar-record-no-bundled-libs.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur a/record.py b/record.py ---- a/record.py 2009-04-29 14:55:40.000000000 +0200 -+++ b/record.py 2010-02-21 19:50:17.000000000 +0100 -@@ -36,7 +36,7 @@ - from sugar.presence import presenceservice - from sugar.presence.tubeconn import TubeConnection - from sugar import util --import port.json -+import json - - from model import Model - from ui import UI -@@ -104,7 +104,7 @@ - - for i in dom.documentElement.getElementsByTagName('ui'): - for ui_el in i.childNodes: -- self.ui.deserialize(port.json.loads(ui_el.data)) -+ self.ui.deserialize(json.loads(ui_el.data)) - - - def write_file(self, file): -@@ -114,7 +114,7 @@ - - dom = serialize.saveMediaHash(self.m.mediaHashs) - -- ui_data = port.json.dumps(self.ui.serialize()) -+ ui_data = json.dumps(self.ui.serialize()) - ui_el = dom.createElement('ui') - ui_el.appendChild(dom.createTextNode(ui_data)) - dom.documentElement.appendChild(ui_el) diff --git a/sugar-record-no-strange-init-logic.patch b/sugar-record-no-strange-init-logic.patch deleted file mode 100644 index e86674a..0000000 --- a/sugar-record-no-strange-init-logic.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ur a/camerac/__init__.py b/camerac/__init__.py ---- a/camerac/__init__.py 2009-04-28 07:19:47.000000000 +0200 -+++ b/camerac/__init__.py 2010-02-18 18:07:43.000000000 +0100 -@@ -2,20 +2,4 @@ - import sys - import logging - --_sys_path = sys.path --_root_path = os.path.dirname(__file__) -- --for i in os.listdir(_root_path): -- path = os.path.join(_root_path, i) -- if (os.path.isdir(path)): -- sys.path = _sys_path + [os.path.join('.', path)] -- try: -- from camera import * -- logging.debug('use %s blobs' % path) -- _sys_path = None -- break -- except Exception, e: -- logging.debug('skip %s blobs: %s' % (path, e)) -- --if _sys_path: -- raise('cannot find proper binary blobs') -+from camera import * diff --git a/sugar-record.spec b/sugar-record.spec index 71dbba7..511dd26 100644 --- a/sugar-record.spec +++ b/sugar-record.spec @@ -2,19 +2,17 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: sugar-record -Version: 64 -Release: 6%{?dist} +Version: 65 +Release: 1%{?dist} Summary: Recording tool for Sugar Group: Sugar/Activities License: MIT URL: http://wiki.laptop.org/go/Record -Source0: http://download.sugarlabs.org/sources/honey/Record/Record-%{version}.tar.bz2 -Patch0: sugar-record-build-binary-properly.patch -Patch1: sugar-record-no-bundled-libs.patch -Patch2: sugar-record-no-strange-init-logic.patch +Source0: http://activities.sugarlabs.org/downloads/file/26860/record-65.xo BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch BuildRequires: gettext BuildRequires: python-devel BuildRequires: sugar-toolkit @@ -28,7 +26,6 @@ BuildRequires: gtk2-devel Requires: sugar Requires: gstreamer-plugins-good - %description Record is the basic rich-media capture activity for the laptop. It lets you capture still images, video, and/or audio. It has a simple @@ -36,45 +33,35 @@ interface and works in both laptop and ebook mode. An interface for sharing pictures among multi XOs during a picture-taking session is a hallmark of the Record activity - %prep -%setup -q -n Record-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n Record.activity # removed stuff that's not needed rm -rf gst/ rm -rf port/ - %build -make %{?_smp_mflags} -C camerac %{__python} setup.py build - %install -rm -rf %{bildroot} -mkdir -p %{buildroot}%{python_sitearch}/camerac/ -install -Dm 0755 camerac/camera.so %{buildroot}%{python_sitearch}/camerac/ -install -Dm 0644 camerac/__init__.py %{buildroot}%{python_sitearch}/camerac/ -%{__python} setup.py install --prefix=%{buildroot}%{_prefix} -rm -rf %{buildroot}%{sugaractivitydir}Record.activity/{COPYING,NEWS,camerac} -%find_lang org.laptop.RecordActivity +rm -rf %{buildroot} +python ./setup.py install --prefix=%{buildroot}/%{_prefix} -%clean -rm -rf %{buildroot} +%find_lang org.laptop.RecordActivity +%clean +#rm -rf %{buildroot} %files -f org.laptop.RecordActivity.lang %defattr(-,root,root,-) %doc COPYING NEWS %{sugaractivitydir}/Record.activity/ -%{python_sitearch}/camerac - %changelog +* Sat Apr 3 2010 Peter Robinson - 65-1 +- New upstream 65 release + * Sun Feb 21 2010 Sebastian Dziallas - 64-6 - Enable use of system library