update:mono,xsp,python-imaging

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3807 ec354946-7b23-47d6-9f5a-488ba84defc7

m/mono/mono-vl.spec

@@ -1,8 +1,8 @@
 Summary: .NET runtime environment
 Summary(ja): .NET ランタイム環境
 Name: mono
-Version: 2.10.1
+Version: 2.10.2
-Release: 3%{?_dist_release}
+Release: 1%{?_dist_release}
 Group: Development/Languages
 License: GPL, LGPL, MIT X11
 URL: http://www.mono-project.com/
@@ -22,6 +22,9 @@ Obsoletes: %{name}-jscript < 2.8
 Obsoletes: %{name}-data-sybase < 2.8
 Obsoletes: %{name}-data-firebird < 2.8
 Obsoletes: bytefx-data-mysql < 2.8
+Distribution: Vine Linux
+Vendor: Project Vine
+Packager: owa
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -196,7 +199,7 @@ monodoc is the documentation package for the mono .NET environment
 
 %prep
 %setup -q
-%patch1 -p1
+##%patch1 -p1
 
 ## These are only needed if there are patches to the runtime
 #rm -f libgc/libtool.m4
@@ -276,19 +279,12 @@ install monodir %{buildroot}%{_bindir}
 %{_bindir}/mono
 %{_bindir}/monodir
 %{_bindir}/mono-api-*
-##{_bindir}/mono-configuration-crypto
 %{_bindir}/mono-heapviz
-##ifnarch ppc
-##{_bindir}/mono-sgen
-##endif
 %{_bindir}/peverify
 %{_bindir}/mprof-report
 %{_bindir}/mono-test-install
 %{_libdir}/libMonoPosixHelper.so
 %{_libdir}/libmono-2.0.so.*
-##ifnarch ppc
-##{_libdir}/libmonosgen-2.0.so.*
-##endif
 %{_libdir}/libmono-profiler-aot.so.*
 %{_libdir}/libmono-profiler-cov.so.*
 %{_libdir}/libmono-profiler-iomap.so.*
@@ -358,7 +354,6 @@ install monodir %{buildroot}%{_bindir}
 %gac_and_2dll Mono.CompilerServices.SymbolWriter 4.0 2.0
 %gac_and_2dll Mono.Posix 4.0 2.0
 %gac_and_2dll Mono.Security 4.0 2.0
-##gac_and_1dll Mono.Security.Win32 4.0
 %gac_and_2dll Mono.CSharp 4.0 2.0
 %gac_and_1dll Mono.CodeContracts 4.0
 %gac_and_2dll Mono.Debugger.Soft 4.0 2.0
@@ -414,7 +409,6 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/resgen.1.gz
 %{_mandir}/man1/mono-api-info.1.gz
 %{_mandir}/man1/mono-cil-strip.1.gz
-##{_mandir}/man1/mono-configuration-crypto.1.gz
 %{_mandir}/man5/mono-config.5.gz
 
 %files devel
@@ -430,9 +424,6 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/libmono-profiler-aot.so
 %{_libdir}/libmono-profiler-cov.so
 %{_libdir}/libmono-profiler-iomap.so
-##ifnarch ppc
-##{_libdir}/libmonosgen-2.0.so
-##endif
 %{_libdir}/libMonoSupportW.so
 %{_libdir}/libikvm-native.so
 %{mono_dir}/4.0/mkbundle.exe*
@@ -461,6 +452,7 @@ install monodir %{buildroot}%{_bindir}
 %bin_and_exe secutil 4.0/secutil
 %bin_and_exe signcode 4.0/signcode
 %{mono_dir}/xbuild
+%{mono_dir}/xbuild-frameworks
 %{mono_dir}/4.0/xbuild.*
 %{mono_dir}/3.5/xbuild.*
 %{mono_dir}/2.0/xbuild.*
@@ -496,9 +488,6 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/mono-2.pc
 %{_libdir}/pkgconfig/mono-lineeditor.pc
 %{_libdir}/pkgconfig/mono-options.pc
-##ifnarch ppc
-##{_libdir}/pkgconfig/monosgen-2.pc
-##endif
 %{_libdir}/pkgconfig/wcf.pc
 %{_includedir}/mono-2.0
 %{_mandir}/man1/al.1.gz
@@ -626,7 +615,6 @@ install monodir %{buildroot}%{_bindir}
 %gac_and_2dll System.DirectoryServices 4.0 2.0
 %gac_and_2dll System.EnterpriseServices 4.0 2.0
 %gac_and_2dll System.Transactions 4.0 2.0
-##{mono_dir}/gac/System.Data.Services.Client
 %{_mandir}/man1/sqlsharp.1.gz
 
 %files data-sqlite
@@ -663,6 +651,10 @@ install monodir %{buildroot}%{_bindir}
 
 
 %changelog
+* Sat May 07 2011 Shu KONNO <owa@bg.wakwak.com> 2.10.2-1
+- updated mono to 2.10.2
+- dropt Patch1: mono-2.10.1-ppc-len.patch (fixed in the upstream)
+
 * Sun Apr 24 2011 Shu KONNO <owa@bg.wakwak.com> 2.10.1-3
 - added '--with-sgen=no' to all arch
 - dropt %%{mono_dir}/2.0/{mcs.exe,mscorlib.dll}.so

p/python-imaging/python-imaging-vl.spec

@@ -1,14 +1,9 @@
-%define pyver %(python -c 'import sys;print(sys.version[0:3])')
-%define pysite %{_libdir}/python%{pyver}/site-packages
-%define pyinc %{_includedir}/python%{pyver}
 Summary: The Python Imaging Library
 Summary(ja): Python イメージ処理ライブラリ
 Name: python-imaging
 Version: 1.1.7
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: Distributable
-Distribution: Vine Linux
-Vendor: Project Vine
 Group: Development/Languages
 URL: http://www.pythonware.com/products/pil
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
@@ -16,6 +11,7 @@ Patch0: Imaging-1.1.7-setup.lib64.patch
 BuildRequires: python-devel >= 2.6
 BuildRequires: libjpeg-devel libpng-devel zlib-devel freetype2-devel
 BuildRequires: xorg-x11-devel
+BuildRequires: sane-devel
 Requires: python >= 2.6
 Requires: libjpeg >= 6a
 Requires: libpng >= 1.0.12
@@ -26,6 +22,9 @@ Obsoletes: Imaging < %{version}
 Obsoletes: python-PIL < %{version}
 Obsoletes: python-Imaging <= %{version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Distribution: Vine Linux
+Vendor: Project Vine
+Packager: owa
 
 %description
 The Python Imaging Library (PIL) adds image processing capabilities
@@ -37,28 +36,33 @@ Python Imaging Library (PIL) は Python 環境にイメージ処理能力を加
 このライブラリには広範なファイル型式への対応, 効果的な内部表現, そして
 真にパワフルなイメージ処理能力が備わっています.
 
+
 %prep
 %setup -q -n Imaging-%{version}
 %ifarch x86_64
 %patch0 -p1 -b .lib64~
 %endif
 
+
 %build
 python setup.py build_ext -i
 python selftest.py
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-#python setup.py install --root=$RPM_BUILD_ROOT
+python setup.py install --root=$RPM_BUILD_ROOT
+
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/python%{pyver}/PIL
+cp -p libImaging/*.h $RPM_BUILD_ROOT%{_includedir}/python%{pyver}/PIL/
 
-mkdir -p $RPM_BUILD_ROOT%{pysite}/PIL
+mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/Sane
-mkdir -p $RPM_BUILD_ROOT%{pysite}/Sane
+pushd Sane
-cp PIL.pth $RPM_BUILD_ROOT%{pysite}/
+python setup.py install --root=$RPM_BUILD_ROOT --install-lib=%{python_sitearch}/Sane
-cp PIL/* $RPM_BUILD_ROOT%{pysite}/PIL/
+install -m644 demo_numarray.py $RPM_BUILD_ROOT%{python_sitearch}/Sane
-cp Sane/*[^\.c$] $RPM_BUILD_ROOT%{pysite}/Sane/
+install -m644 CHANGES README sanedoc.txt $RPM_BUILD_ROOT%{python_sitearch}/Sane
+popd
 
-mkdir -p $RPM_BUILD_ROOT%{pyinc}/PIL
-cp -p libImaging/*.h $RPM_BUILD_ROOT%{pyinc}/PIL/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,10 +71,22 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc BUILDME CHANGES CONTENTS README
 %doc Docs
-%{pysite}/*
+%dir %{python_sitearch}/PIL
-%{pyinc}/*
+%dir %{python_sitearch}/Sane
+%{_bindir}/pil*.py
+%{_includedir}/python%{pyver}/PIL/*.h
+%{python_sitearch}/PIL.pth
+%{python_sitearch}/PIL/*
+%{python_sitearch}/Sane/*
+
 
 %changelog
+* Sat May 07 2011 Shu KONNO <owa@bg.wakwak.com> 1.1.7-2
+- install PIL with setup.py
+- install Sane with setup.py
+- install %{_bindir}/pil*.py
+- added BR: sane-devel
+
 * Thu Feb 03 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.1.7-1
 - new upstream release
 - recreated Patch0

x/xsp/xsp-vl.spec

@@ -5,8 +5,8 @@ Name: xsp
 URL: http://go-mono.com/
 License: GNU General Public License (GPL)
 Group: Applications/Internet
-Version: 2.10
+Version: 2.10.2
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 Source: http://mono.ximian.com/monobuild/preview/sources/xsp/xsp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
@@ -19,6 +19,10 @@ BuildRequires: sqlite
 # Since this package is currently noarch, and mod_mono's name is different
 # on different distros, we can't use this... yet
 #Requires: mod_mono >= %{version}
+Distribution: Vine Linux
+Vendor: Project Vine
+Packager: owa
+
 
 %description
 The XSP server is a small Web server that hosts the Mono System.Web
@@ -80,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May 07 2011 Shu KONNO <owa@bg.wakwak.com> 2.10.2-1
+- updated xsp to 2.10.2
+
 * Mon Apr 25 2011 Shu KONNO <owa@bg.wakwak.com> 2.10-2
 - rebuilt with mono-2.10.1-3