From 6909c240b41d1dbe70d9c8ca0749147c7135cad0102cfc3a998b0f3cbb260a95 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 24 Jul 2013 11:45:29 +0000
Subject: [PATCH] Accepting request 184174 from home:toganm:branches:graphics

- Update to 0.22
 * Scaling and smoothing are now made before thresholding.
 * Improvements in character recognition.
 * ocradlib.h: Added new function OCRAD_set_utf8_format.
 * Small improvements have been made in manual and man page.
 * Changed quote characters in messages as advised by GNU
- Spec file changes:
 * rebased ocrad-build-with-optflags.patch

OBS-URL: https://build.opensuse.org/request/show/184174
OBS-URL: https://build.opensuse.org/package/show/graphics/ocrad?expand=0&rev=17
---
 ocrad-0.21.tar.bz2              |  3 ---
 ocrad-0.22.tar.bz2              |  3 +++
 ocrad-build-with-optflags.patch | 17 ++++++++---------
 ocrad.changes                   | 12 ++++++++++++
 ocrad.spec                      | 23 +++++++++++------------
 5 files changed, 34 insertions(+), 24 deletions(-)
 delete mode 100644 ocrad-0.21.tar.bz2
 create mode 100644 ocrad-0.22.tar.bz2

diff --git a/ocrad-0.21.tar.bz2 b/ocrad-0.21.tar.bz2
deleted file mode 100644
index c177077..0000000
--- a/ocrad-0.21.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c5cdf555e523430cb7c3da4817c049f808606c0581173790d8277ab95375503
-size 89706
diff --git a/ocrad-0.22.tar.bz2 b/ocrad-0.22.tar.bz2
new file mode 100644
index 0000000..6ac90ee
--- /dev/null
+++ b/ocrad-0.22.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:885a0aa03059c1aeda222ca6fc65b7ddcfc70395b39c9cd68524d25f315ce587
+size 93045
diff --git a/ocrad-build-with-optflags.patch b/ocrad-build-with-optflags.patch
index 5526890..ccc7e23 100644
--- a/ocrad-build-with-optflags.patch
+++ b/ocrad-build-with-optflags.patch
@@ -1,14 +1,13 @@
-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'
+--- configure.orig	2013-07-24 08:20:58.611942166 +0000
++++ configure	2013-07-24 08:23:38.298054685 +0000
+@@ -24,10 +24,6 @@
+ infodir='$(datarootdir)/info'
  libdir='${exec_prefix}/lib'
- mandir='$(datadir)/man'
- sysconfdir='$(prefix)/etc'
--CXX=
+ mandir='$(datarootdir)/man'
+-CXX=g++
 -CPPFLAGS=
 -CXXFLAGS='-Wall -W -O2'
 -LDFLAGS=
  
- # Loop over all args
- while [ -n "$1" ] ; do
+ # checking whether we are using GNU C++.
+ ${CXX} --version > /dev/null 2>&1
diff --git a/ocrad.changes b/ocrad.changes
index c1af846..2e8bf18 100644
--- a/ocrad.changes
+++ b/ocrad.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jul 24 08:27:47 UTC 2013 - toganm@opensuse.org
+
+- Update to 0.22
+ * Scaling and smoothing are now made before thresholding.
+ * Improvements in character recognition.
+ * ocradlib.h: Added new function OCRAD_set_utf8_format.
+ * Small improvements have been made in manual and man page.
+ * Changed quote characters in messages as advised by GNU
+- Spec file changes:
+ * rebased ocrad-build-with-optflags.patch
+
 -------------------------------------------------------------------
 Fri Feb 18 20:37:28 UTC 2011 - asterios.dramis@gmail.com
 
diff --git a/ocrad.spec b/ocrad.spec
index e7defdd..3b87965 100644
--- a/ocrad.spec
+++ b/ocrad.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package ocrad (Version 0.21)
+# spec file for package ocrad
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -15,17 +15,16 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 Name:           ocrad
-Version:        0.21
-Release:        1
+Version:        0.22
+Release:        0
 Summary:        Optical Character Recognition Program
-
-License:        GPLv3+
-Url:            https://savannah.gnu.org/projects/ocrad/
+License:        GPL-3.0+
 Group:          Productivity/Graphics/Other
-Source0:        %{name}-%{version}.tar.bz2
+
+Url:            https://savannah.gnu.org/projects/ocrad/
+Source0:        %{name}-%{version}.tar.bz2 
 # PATCH-FIX-OPENSUSE ocrad-build-with-optflags.patch masterpatricko@gmail.com -- Make the package compile with optflags
 Patch0:         ocrad-build-with-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -54,7 +53,7 @@ Development files for GNU ocrad - useful for programs implementing OCR.
 
 %prep
 %setup -q
-%patch0
+%patch0 
 
 %build
 %configure
@@ -62,7 +61,7 @@ Development files for GNU ocrad - useful for programs implementing OCR.
 
 %install
 %make_install install-man
-%{__rm} -f %{buildroot}%{_libexecdir}/libocrad.a
+%{__rm} -f %{buildroot}%{_libdir}/libocrad.a
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -75,7 +74,7 @@ Development files for GNU ocrad - useful for programs implementing OCR.
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README 
 %{_bindir}/ocrad
 %doc %{_infodir}/ocrad*
 %doc %{_mandir}/man1/ocrad*