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.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
-make CXXFLAGS='${RPM_OPT_FLAGS}'
+%configure
+%{__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
-/usr/share/info/ocrad*
+%{_bindir}/ocrad
+%{_infodir}/ocrad*
 %doc %{_mandir}/man1/*
 %doc AUTHORS COPYING ChangeLog INSTALL README NEWS TODO
 
 %files devel
 %defattr(-, root, root)
-/usr/include/ocradlib.h
-/%_libdir/libocrad.a
+%{_includedir}/ocradlib.h
 
 %changelog