Menu
▾
▴
[Pkgbuild-sfe-commits] SF.net SVN: pkgbuild:[2336] spec-files-extra/trunk
|
From: <yi...@us...> - 2010-02-03 17:17:41
|
Revision: 2336
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=2336&view=rev
Author: yippi
Date: 2010-02-03 17:17:35 +0000 (Wed, 03 Feb 2010)
Log Message:
-----------
2010-02-03 Brian Cameron <bri...@su...>
* SFEsugar-bounce.spec, SFEsugar-colors.spec,
patches/sugar-bounce-01-makefile.diff,
patches/sugar-color-01-makefile.diff: Fix so they build correctly.
* SFEsugar-datastore, SFEzeitgeist.spec, SFEgnome-zeitgeist.spec,
SFEsugar.spec, SFEsugar-base.spec, SFEsugar-toolkit.spec,
SFEmoovida.spec, SFEmoovida-plugins.spec, SFEstorm.spec: Fix
spelling.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEgnome-zeitgeist.spec
spec-files-extra/trunk/SFEmoovida-plugins.spec
spec-files-extra/trunk/SFEmoovida.spec
spec-files-extra/trunk/SFEstorm.spec
spec-files-extra/trunk/SFEsugar-base.spec
spec-files-extra/trunk/SFEsugar-bounce.spec
spec-files-extra/trunk/SFEsugar-colors.spec
spec-files-extra/trunk/SFEsugar-datastore.spec
spec-files-extra/trunk/SFEsugar-toolkit.spec
spec-files-extra/trunk/SFEsugar.spec
spec-files-extra/trunk/SFEzeitgeist.spec
Added Paths:
-----------
spec-files-extra/trunk/patches/sugar-bounce-01-makefile.diff
spec-files-extra/trunk/patches/sugar-color-01-makefile.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/ChangeLog 2010-02-03 17:17:35 UTC (rev 2336)
@@ -1,5 +1,15 @@
2010-02-03 Brian Cameron <bri...@su...>
+ * SFEsugar-bounce.spec, SFEsugar-colors.spec,
+ patches/sugar-bounce-01-makefile.diff,
+ patches/sugar-color-01-makefile.diff: Fix so they build correctly.
+ * SFEsugar-datastore, SFEzeitgeist.spec, SFEgnome-zeitgeist.spec,
+ SFEsugar.spec, SFEsugar-base.spec, SFEsugar-toolkit.spec,
+ SFEmoovida.spec, SFEmoovida-plugins.spec, SFEstorm.spec: Fix
+ spelling.
+
+2010-02-03 Brian Cameron <bri...@su...>
+
* SFEsugar-base.spec: Minor fix to packaging.
* SFEsugar-readetexts.spec, SFEsugar-xoeditor.spec,
SFEsugar-typingturtle.spec, SFEsugar-turtleart.spec,
Modified: spec-files-extra/trunk/SFEgnome-zeitgeist.spec
===================================================================
--- spec-files-extra/trunk/SFEgnome-zeitgeist.spec 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/SFEgnome-zeitgeist.spec 2010-02-03 17:17:35 UTC (rev 2336)
@@ -51,7 +51,7 @@
find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.pyo" -exec rm -f {} ';'
-# move to verndor-packages
+# move to vendor-packages
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
$RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
Modified: spec-files-extra/trunk/SFEmoovida-plugins.spec
===================================================================
--- spec-files-extra/trunk/SFEmoovida-plugins.spec 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/SFEmoovida-plugins.spec 2010-02-03 17:17:35 UTC (rev 2336)
@@ -90,7 +90,7 @@
%moovida_plugins_good.install -d %name-%version
%moovida_plugins_bad.install -d %name-%version
-# move to verndor-packages
+# move to vendor-packages
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
$RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
Modified: spec-files-extra/trunk/SFEmoovida.spec
===================================================================
--- spec-files-extra/trunk/SFEmoovida.spec 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/SFEmoovida.spec 2010-02-03 17:17:35 UTC (rev 2336)
@@ -87,7 +87,7 @@
export PYTHONPATH=%{_builddir}/%name-%version/elisa-%{elisa.version}:$PYTHONPATH
mv $RPM_BUILD_ROOT%{_bindir}/elisa $RPM_BUILD_ROOT%{_bindir}/moovida
-# move to verndor-packages
+# move to vendor-packages
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
$RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
Modified: spec-files-extra/trunk/SFEstorm.spec
===================================================================
--- spec-files-extra/trunk/SFEstorm.spec 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/SFEstorm.spec 2010-02-03 17:17:35 UTC (rev 2336)
@@ -27,7 +27,7 @@
rm -rf $RPM_BUILD_ROOT
python%{pythonver} setup.py install --root=%{buildroot}
-# move to verndor-packages
+# move to vendor-packages
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
$RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
Modified: spec-files-extra/trunk/SFEsugar-base.spec
===================================================================
--- spec-files-extra/trunk/SFEsugar-base.spec 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/SFEsugar-base.spec 2010-02-03 17:17:35 UTC (rev 2336)
@@ -45,7 +45,7 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# move to verndor-packages
+# move to vendor-packages
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
$RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
Modified: spec-files-extra/trunk/SFEsugar-bounce.spec
===================================================================
--- spec-files-extra/trunk/SFEsugar-bounce.spec 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/SFEsugar-bounce.spec 2010-02-03 17:17:35 UTC (rev 2336)
@@ -12,6 +12,7 @@
URL: http://www.sugarlabs.org/
Version: 7
Source: http://download.sugarlabs.org/sources/honey/Bounce/Bounce-%{version}.tar.bz2
+Patch1: sugar-bounce-01-makefile.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -31,15 +32,21 @@
%prep
%setup -q -n Bounce-%version
+%patch1 -p1
%build
-export PYTHON=/usr/bin/python%{pythonver}
-python%{pythonver} setup.py build
+make
%install
rm -rf $RPM_BUILD_ROOT
-python%{pythonver} setup.py install --prefix=$RPM_BUILD_ROOT/usr
+make install DESTDIR=$RPM_BUILD_ROOT
+# move to vendor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
+ $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages
+
%if %build_l10n
%else
# REMOVE l10n FILES
@@ -62,6 +69,8 @@
%files
%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/python%{pythonver}/vendor-packages/pongc
%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/sugar
Modified: spec-files-extra/trunk/SFEsugar-colors.spec
===================================================================
--- spec-files-extra/trunk/SFEsugar-colors.spec 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/SFEsugar-colors.spec 2010-02-03 17:17:35 UTC (rev 2336)
@@ -3,15 +3,18 @@
#
# includes module(s): sugar-colors
#
+%include Solaris.inc
+%define cc_is_gcc 1
%define pythonver 2.6
+%include base.inc
-%include Solaris.inc
Name: SFEsugar-colors
Summary: Sugar Colors
URL: http://www.sugarlabs.org/
Version: 15
Source: http://download.sugarlabs.org/sources/honey/Colors/Colors!-%{version}.tar.bz2
+Patch1: sugar-color-01-makefile.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -29,15 +32,25 @@
%prep
%setup -q -n Colors!-%version
+%patch1 -p1
%build
+export CC=gcc
+export CXX=g++
+export CXXFLAGS="%gcc_cxx_optflags"
export PYTHON=/usr/bin/python%{pythonver}
-python%{pythonver} setup.py build
+make
%install
rm -rf $RPM_BUILD_ROOT
-python%{pythonver} setup.py install --prefix=$RPM_BUILD_ROOT/usr
+make install DESTDIR=$RPM_BUILD_ROOT
+# move to vendor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
+ $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages
+
%if %build_l10n
%else
# REMOVE l10n FILES
@@ -60,6 +73,8 @@
%files
%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/python%{pythonver}/vendor-packages/colorsc
%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/sugar
Modified: spec-files-extra/trunk/SFEsugar-datastore.spec
===================================================================
--- spec-files-extra/trunk/SFEsugar-datastore.spec 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/SFEsugar-datastore.spec 2010-02-03 17:17:35 UTC (rev 2336)
@@ -37,7 +37,7 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# move to verndor-packages
+# move to vendor-packages
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
$RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
Modified: spec-files-extra/trunk/SFEsugar-toolkit.spec
===================================================================
--- spec-files-extra/trunk/SFEsugar-toolkit.spec 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/SFEsugar-toolkit.spec 2010-02-03 17:17:35 UTC (rev 2336)
@@ -52,7 +52,7 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# move to verndor-packages
+# move to vendor-packages
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
$RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
Modified: spec-files-extra/trunk/SFEsugar.spec
===================================================================
--- spec-files-extra/trunk/SFEsugar.spec 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/SFEsugar.spec 2010-02-03 17:17:35 UTC (rev 2336)
@@ -60,7 +60,7 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# move to verndor-packages
+# move to vendor-packages
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
$RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
Modified: spec-files-extra/trunk/SFEzeitgeist.spec
===================================================================
--- spec-files-extra/trunk/SFEzeitgeist.spec 2010-02-03 16:43:17 UTC (rev 2335)
+++ spec-files-extra/trunk/SFEzeitgeist.spec 2010-02-03 17:17:35 UTC (rev 2336)
@@ -50,7 +50,7 @@
find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.pyo" -exec rm -f {} ';'
-# move to verndor-packages
+# move to vendor-packages
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
$RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
Added: spec-files-extra/trunk/patches/sugar-bounce-01-makefile.diff
===================================================================
--- spec-files-extra/trunk/patches/sugar-bounce-01-makefile.diff (rev 0)
+++ spec-files-extra/trunk/patches/sugar-bounce-01-makefile.diff 2010-02-03 17:17:35 UTC (rev 2336)
@@ -0,0 +1,19 @@
+--- Bounce-7/Makefile-orig 2010-02-03 11:02:49.131012147 -0600
++++ Bounce-7/Makefile 2010-02-03 11:03:18.047001248 -0600
+@@ -1,12 +1,13 @@
+-pythondir = $(shell python -c "from distutils import sysconfig; print sysconfig.get_python_lib()")
++SHELL=/bin/bash
++pythondir = $(shell python2.6 -c "from distutils import sysconfig; print sysconfig.get_python_lib()")
+
+ all clean:
+ $(MAKE) -C pongc $@
+
+ install: all
+- ./setup.py fix_manifest
++ python2.6 ./setup.py fix_manifest
+ sed -i /^pongc/d MANIFEST
+- ./setup.py install --prefix=$(DESTDIR)/usr
++ python2.6 ./setup.py install --prefix=$(DESTDIR)/usr
+ for i in __init__.py _pongc.so pongc.py; do \
+ install -m 644 -D pongc/$$i $(DESTDIR)/$(pythondir)/pongc/$$i; \
+ done
Added: spec-files-extra/trunk/patches/sugar-color-01-makefile.diff
===================================================================
--- spec-files-extra/trunk/patches/sugar-color-01-makefile.diff (rev 0)
+++ spec-files-extra/trunk/patches/sugar-color-01-makefile.diff 2010-02-03 17:17:35 UTC (rev 2336)
@@ -0,0 +1,20 @@
+--- Colors!-15/Makefile-orig 2010-02-03 11:07:07.554219658 -0600
++++ Colors!-15/Makefile 2010-02-03 11:07:29.896797223 -0600
+@@ -1,12 +1,14 @@
+-pythondir = $(shell python -c "from distutils import sysconfig; print sysconfig.get_python_lib()")
++SHELL=/bin/bash
++
++pythondir = $(shell python2.6 -c "from distutils import sysconfig; print sysconfig.get_python_lib()")
+
+ all clean:
+ $(MAKE) -C colorsc $@
+
+ install: all
+- ./setup.py fix_manifest
++ python2.6 ./setup.py fix_manifest
+ sed -i /^colorsc/d MANIFEST
+- ./setup.py install --prefix=$(DESTDIR)/usr
++ python2.6 ./setup.py install --prefix=$(DESTDIR)/usr
+ for i in __init__.py _colorsc.so colorsc.py; do \
+ install -m 644 -D colorsc/$$i $(DESTDIR)/$(pythondir)/colorsc/$$i; \
+ done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|