rpms/zinnia/F-11 import.log, NONE, 1.1 zinnia-0.05-bindings.patch, NONE, 1.1 zinnia.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thu Mar 11 01:41:55 UTC 2010

Author: liangsuilong

Update of /cvs/pkgs/rpms/zinnia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2769/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zinnia-0.05-bindings.patch zinnia.spec 
Log Message:
import Liang's update

--- NEW FILE import.log ---
zinnia-0_05-4_fc12:F-11:zinnia-0.05-4.fc12.src.rpm:1268271731

zinnia-0.05-bindings.patch:
 perl/Makefile.PL       |    4 ++--
 perl/zinnia_wrap.cxx   |    1 +
 python/zinnia_wrap.cxx |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE zinnia-0.05-bindings.patch ---
diff -p -up zinnia-0.05/perl/Makefile.PL.bindings zinnia-0.05/perl/Makefile.PL
--- zinnia-0.05/perl/Makefile.PL.bindings	2008-09-13 18:59:36.000000000 +0200
+++ zinnia-0.05/perl/Makefile.PL	2009-11-19 14:17:39.000000000 +0100
@@ -3,8 +3,8 @@ WriteMakefile(
     'NAME'		=> 'zinnia',
     'CC'                => 'c++',
     'LD'                => 'c++',
-    'INC'               => '',
-    'LIBS'              => '-lzinnia',
+    'INC'               => '-I../',
+    'LIBS'              => '-L../.libs -lzinnia',
 #    'VERSION'	        => '0.1',
     'OBJECT'            => 'zinnia_wrap.o' 
 );
diff -p -up zinnia-0.05/perl/zinnia_wrap.cxx.bindings zinnia-0.05/perl/zinnia_wrap.cxx
--- zinnia-0.05/perl/zinnia_wrap.cxx.bindings	2009-05-31 06:39:39.000000000 +0200
+++ zinnia-0.05/perl/zinnia_wrap.cxx	2009-11-19 14:18:46.000000000 +0100
@@ -11,6 +11,7 @@
 #define SWIGPERL
 #define SWIG_CASTRANK_MODE
 
+#include <cstring>
 
 #ifdef __cplusplus
 /* SwigValueWrapper is described in swig.swg */
diff -p -up zinnia-0.05/python/zinnia_wrap.cxx.bindings zinnia-0.05/python/zinnia_wrap.cxx
--- zinnia-0.05/python/zinnia_wrap.cxx.bindings	2009-05-31 06:39:41.000000000 +0200
+++ zinnia-0.05/python/zinnia_wrap.cxx	2009-11-19 14:19:10.000000000 +0100
@@ -11,6 +11,7 @@
 #define SWIGPYTHON
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
 
+#include <cstring>
 
 #ifdef __cplusplus
 /* SwigValueWrapper is described in swig.swg */


--- NEW FILE zinnia.spec ---
%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif

Name:		zinnia
Version:	0.05
Release:	4%{?dist}
Summary:	Online handwriting recognition system with machine learning

Group:		System Environment/Libraries
License:	BSD
URL:		http://zinnia.sourceforge.net/
Source0:	http://downloads.sourceforge.net/zinnia/%{name}-%{version}.tar.gz
Patch0:		zinnia-0.05-bindings.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	db4-devel, python2-devel
BuildRequires:	perl(ExtUtils::MakeMaker)

%description
Zinnia provides a simple, customizable, and portable dynamic OCR
system for hand-written input, based on Support Vector Machines.

Zinnia simply receives user pen strokes as coordinate data and outputs
the best matching characters sorted by SVM confidence. To maintain
portability, it has no rendering functionality. In addition to
recognition, Zinnia provides a training module capable of creating
highly efficient handwriting recognition models.

This package contains the shared libraries.

%package        devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%package 	utils
Summary:	Utils for the zinnia library
Group:		Applications/System
Requires:	%{name} = %{version}-%{release}

%description	utils
The %{name}-utils package provides utilities for zinnia library that 
use %{name}.

%package 	doc
Summary:	Documents for the zinnia library
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
BuildArch:	noarch

%description	doc
The %{name}-doc package provide documents for zinnia library that 
use %{name}.

%package  	perl
Summary:	Perl bindings for %name
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description 	perl
This package contains perl bindings for %{name}.

%package 	python
Summary:	Python bindings for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description 	python
This package contains python bindings for %{name}.

%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .bindings
find . -type f -name ChangeLog -size 0c -exec rm -f {} ';'
find . -type f -name "*.pyc" -exec rm -f {} ';'
pushd doc
iconv -f latin1 -t utf8 zinnia.css > zinnia.css.bak 
mv -f zinnia.css.bak zinnia.css
popd

%build
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}

pushd perl
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
popd

pushd python
CFLAGS="$RPM_OPT_FLAGS -I../" LDFLAGS="-L../.libs" python setup.py build
popd

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#install -d -m 0755 -p $RPM_BUILD_ROOT%{_docdir}/%{name}
#cp -pfr doc $RPM_BUILD_ROOT%{_docdir}/%{name}

pushd perl
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
popd

pushd python
python setup.py install --root $RPM_BUILD_ROOT
pushd

#remove something unnecessary
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name "*.bs" -size 0c -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'

#change the privilege of some files
chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/lib%{name}.so

%{_libdir}/pkgconfig/%{name}.pc

%files utils
%defattr(-,root,root,-)
%{_bindir}/zinnia
%{_bindir}/zinnia_convert
%{_bindir}/zinnia_learn

%files doc
%defattr(-,root,root,-)
%doc doc/*


%files	perl
%defattr(-,root,root,-)
%{perl_vendorarch}/auto/%{name}/
%{perl_vendorarch}/%{name}.pm

%files	python
%defattr(-,root,root,-)
%{python_sitearch}/_%{name}.so
%{python_sitearch}/%{name}*


%changelog
* Wed Mar 10 2010 Liang Suilong <liangsuilong at gmail.com> - 0.05-4
- Fix the bugs of SPEC file

* Fri Mar 04 2010 Liang Suilong <liangsuilong at gmail.com> - 0.05-3
- Fix something wrong of spec file

* Wed Mar 02 2010 Liang Suilong <liangsuilong at gmail.com> - 0.05-2
- Rename Subpackage for perl and python

* Tue Feb 02 2010 Liang Suilong <liangsuilong at gmail.com> - 0.05-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zinnia/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Mar 2010 22:29:24 -0000	1.1
+++ .cvsignore	11 Mar 2010 01:41:52 -0000	1.2
@@ -0,0 +1 @@
+zinnia-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zinnia/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Mar 2010 22:29:24 -0000	1.1
+++ sources	11 Mar 2010 01:41:53 -0000	1.2
@@ -0,0 +1 @@
+78462a619ad63772683666e3eefc092e  zinnia-0.05.tar.gz

