From 3d52be6ebdb48bd89646e2c2600e233c382be2f16e80ff6e4d1f0c9485af47e5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 2 Dec 2009 10:10:41 +0000 Subject: [PATCH] Accepting request 25160 from home:kfreitag:branches:graphics Copy from home:kfreitag:branches:graphics/ocrad via accept of submit request 25160 revision 3. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/25160 OBS-URL: https://build.opensuse.org/package/show/graphics/ocrad?expand=0&rev=4 --- ocrad-0.18.tar.bz2 | 3 ++ ocrad-0.20.tar.bz2 | 3 -- ocrad-build-with-optflags.patch | 14 -------- ocrad.changes | 44 ++---------------------- ocrad.spec | 59 ++++++++++++++++++--------------- ready | 0 6 files changed, 37 insertions(+), 86 deletions(-) create mode 100644 ocrad-0.18.tar.bz2 delete mode 100644 ocrad-0.20.tar.bz2 delete mode 100644 ocrad-build-with-optflags.patch create mode 100644 ready diff --git a/ocrad-0.18.tar.bz2 b/ocrad-0.18.tar.bz2 new file mode 100644 index 0000000..e41a5c2 --- /dev/null +++ b/ocrad-0.18.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22054c5cc32e23ef19258c63fd329d0eee9dac97a746f840bac46514a86a5816 +size 82409 diff --git a/ocrad-0.20.tar.bz2 b/ocrad-0.20.tar.bz2 deleted file mode 100644 index e9acb9d..0000000 --- a/ocrad-0.20.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a47cbeed943d3296289082caba21c28ccc2673ee394c12c8e38f525868e3636 -size 89099 diff --git a/ocrad-build-with-optflags.patch b/ocrad-build-with-optflags.patch deleted file mode 100644 index 5526890..0000000 --- a/ocrad-build-with-optflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up ./configure.old ./configure ---- ./configure.old 2010-09-06 17:43:43.074186313 +0000 -+++ ./configure 2010-09-06 17:44:31.969195119 +0000 -@@ -29,10 +29,6 @@ infodir='$(datadir)/info' - libdir='${exec_prefix}/lib' - mandir='$(datadir)/man' - sysconfdir='$(prefix)/etc' --CXX= --CPPFLAGS= --CXXFLAGS='-Wall -W -O2' --LDFLAGS= - - # Loop over all args - while [ -n "$1" ] ; do diff --git a/ocrad.changes b/ocrad.changes index 77b6c4b..4eee2e8 100644 --- a/ocrad.changes +++ b/ocrad.changes @@ -1,49 +1,9 @@ -------------------------------------------------------------------- -Mon Sep 6 17:57:38 UTC 2010 - masterpatricko@gmail.com - -- Update to 0.20 - * ocradlib.h: Added new function OCRAD_scale. - * ocradlib.h: Added new function OCRAD_result_chars_total. - * ocradlib.h: Added new function OCRAD_result_chars_block. - * ocradlib.h: Added new function OCRAD_result_chars_line. -- add ocrad-build-with-optflags.patch - -------------------------------------------------------------------- -Wed Aug 4 12:41:27 UTC 2010 - coolo@novell.com - -- put devel files in -devel subpackage - -------------------------------------------------------------------- -Wed Apr 7 12:15:49 UTC 2010 - freitag@novell.com - -- update to version 0.19 - * Version 0.19 released. - * Added library interface (ocradlib.h). - * Option `--crop' replaced with similar but different option - `--cut', which can accept coordinates taken from the ORF file. - * Recognition of files with a single character and without white - space at the edges has been fixed. - * testsuite/check.sh: Added new tests for the library interface - and for single character images. - * New files ocradlib.h, ocradlib.cc, ocrcheck.cc. - * Makefile.in: Added "--name" option to help2man invocation. - ------------------------------------------------------------------- Wed Nov 11 21:49:07 UTC 2009 - freitag@novell.com - update to version 0.18 - * Added a layout analyser able to process arbitrary pages. - * Added new option `--quiet'. - * The `--layout' option no more accepts an argument. - * The `--crop' option now accepts negative coordinates. - * New recognized letter; 'a' with ring above. - * Fixed recognition on files with a single big character. - * Fixed bug that didn't write maxval when saving pgm or ppm. - * Fixed some includes that prevented compilation with GCC 4.3.0. - * "make install-info" should now work on Debian and OS X. - * Arg_parser updated to 1.2. - * Verbosity control of messages has been modified. -- add info files post and postun scripts + add info files post and postun scripts + stripped binary ocrad ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/ocrad.spec b/ocrad.spec index fb5e63e..1d47c93 100644 --- a/ocrad.spec +++ b/ocrad.spec @@ -1,7 +1,7 @@ # -# spec file for package ocrad (Version 0.20) +# spec file for package ocrad (Version 0.17) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,15 +22,17 @@ Name: ocrad BuildRequires: gcc-c++ Url: https://savannah.gnu.org/projects/ocrad/ Summary: GNU Ocrad--Optical Character Recognition Program -Version: 0.20 -Release: 1 +Version: 0.18 +Release: 68 Group: Productivity/Graphics/Other -License: GPLv2+ +#Requires: +#Provides: +License: GPL v2 or later +# URL: Source0: ocrad-%{version}.tar.bz2 +# Patch: ocrad-%{version}-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %install_info_prereq - -Patch0: ocrad-build-with-optflags.patch +PreReq: %install_info_prereq %description GNU Ocrad is an OCR (Optical Character Recognition) program implemented @@ -42,26 +44,32 @@ back-end to other programs. gocr is another interesting command line OCR tool. Both can be plugged into Kooka, the KDE scan and OCR program. -%package devel -License: GPLv2+ -Summary: Development files for GNU ocrad -Group: Development/Libraries/C and C++ -%description devel -Development files for GNU ocrad - useful for programs implementing OCR +Authors: +-------- + Antonio Diaz Diaz + +%define INSTALL install -m755 -s +%define INSTALL_SCRIPT install -m755 +%define INSTALL_DIR install -d -m755 +%define INSTALL_DATA install -m644 %prep -%setup -%patch0 +%setup -n ocrad-%{version} +# %patch -p1 %build -%configure -%{__make} %{?_smp_mflags} VERBOSE=1 +./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man +make CXXFLAGS='${RPM_OPT_FLAGS}' %install -%makeinstall install-man -%{__rm} -f $RPM_BUILD_ROOT%{_libexecdir}/libocrad.a +if [ ! "x" = "x$RPM_BUILD_ROOT" ] ; then + rm -fr $RPM_BUILD_ROOT + %{INSTALL_DIR} $RPM_BUILD_ROOT +fi +make install DESTDIR=$RPM_BUILD_ROOT +make install-man DESTDIR=$RPM_BUILD_ROOT %post %install_info --info-dir=%_infodir %_infodir/%name.info.gz @@ -70,17 +78,14 @@ Development files for GNU ocrad - useful for programs implementing OCR %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %clean -%{__rm} -fr $RPM_BUILD_ROOT +rm -fr $RPM_BUILD_ROOT %files %defattr(-, root, root) -%{_bindir}/ocrad -%{_infodir}/ocrad* +/usr/bin/ocrad +/usr/share/info/ocrad* %doc %{_mandir}/man1/* %doc AUTHORS COPYING ChangeLog INSTALL README NEWS TODO - -%files devel -%defattr(-, root, root) -%{_includedir}/ocradlib.h +# spec file ends here %changelog diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4