Accepting request 47319 from home:MasterPatricko:branches:graphics

OBS-URL: https://build.opensuse.org/request/show/47319
OBS-URL: https://build.opensuse.org/package/show/graphics/ocrad?expand=0&rev=13

ocrad-0.19.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df363be3d940ace0646bc65d827b4ef84d9ac80311f369aa24d517c4feccbe95
-size 88420

ocrad-0.20.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a47cbeed943d3296289082caba21c28ccc2673ee394c12c8e38f525868e3636
+size 89099

ocrad-build-with-optflags.patch

@@ -0,0 +1,14 @@
+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

ocrad.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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
 

ocrad.spec

@@ -22,16 +22,16 @@ Name:           ocrad
 BuildRequires:  gcc-c++
 Url:            https://savannah.gnu.org/projects/ocrad/
 Summary:        GNU Ocrad--Optical Character Recognition Program
-Version:        0.19
+Version:        0.20
 Release:        1
 Group:          Productivity/Graphics/Other
 License:        GPLv2+
-# 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
+
 %description
 GNU Ocrad is an OCR (Optical Character Recognition) program implemented
 as a filter and based on a feature extraction method. It reads a bitmap
@@ -51,14 +51,16 @@ Development files for GNU ocrad - useful for programs implementing OCR
 
 
 %prep
-%setup -n ocrad-%{version}
+%setup
+%patch0
 
 %build
-%configure --libdir=%_libdir
+%configure
-make CXXFLAGS='${RPM_OPT_FLAGS}'
+%{__make} %{?_smp_mflags} VERBOSE=1
 
 %install
-make install install-man DESTDIR=$RPM_BUILD_ROOT
+%makeinstall install-man
+%{__rm} -f $RPM_BUILD_ROOT%{_libexecdir}/libocrad.a
 
 %post 
 %install_info --info-dir=%_infodir %_infodir/%name.info.gz
@@ -67,18 +69,17 @@ make install install-man DESTDIR=$RPM_BUILD_ROOT
 %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)
-/usr/bin/ocrad
+%{_bindir}/ocrad
-/usr/share/info/ocrad*
+%{_infodir}/ocrad*
 %doc %{_mandir}/man1/*
 %doc AUTHORS COPYING ChangeLog INSTALL README NEWS TODO
 
 %files devel
 %defattr(-, root, root)
-/usr/include/ocradlib.h
+%{_includedir}/ocradlib.h
-/%_libdir/libocrad.a
 
 %changelog