Hello community, here is the log from the commit of package gocr for openSUSE:Factory checked in at 2012-10-04 19:39:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gocr (Old) and /work/SRC/openSUSE:Factory/.gocr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gocr", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gocr/gocr.changes 2011-09-23 02:01:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gocr.new/gocr.changes 2012-10-04 19:39:07.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Sep 28 19:22:26 UTC 2012 - [email protected] + +- Added "CPPFLAGS=-I%{_includedir}/netpbm" to fix compilation with netpbm + support in Factory (the netpbm headers where moved from /usr/include to + /usr/include/netpbm). +- Removed "make doc" (doesn't do anything). +- Use desktop-file-install to install the desktop file in openSUSE > 12.1 + (added desktop-file-utils as build requirement for this). +- Spec file cleanup. +- Removed no-build-date.patch and added a fix inside the spec file for the + rpmlint warning "file-contains-current-date". +- Update gocr.desktop to be xdg compatible (added "Scanning" category). + +------------------------------------------------------------------- Old: ---- gocr-0.49.tar.bz2 no-build-date.patch New: ---- gocr-0.49.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gocr.spec ++++++ --- /var/tmp/diff_new_pack.zpMbn8/_old 2012-10-04 19:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.zpMbn8/_new 2012-10-04 19:39:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gocr # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,31 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: gocr Version: 0.49 -Release: 1 +Release: 0 Summary: Optical Character Recognition Program - License: GPL-2.0+ -Url: http://jocr.sourceforge.net/ Group: Productivity/Graphics/Other -Source0: %{name}-%{version}.tar.bz2 +Url: http://jocr.sourceforge.net/ +Source0: http://www-e.uni-magdeburg.de/jschulen/ocr/%{name}-%{version}.tar.gz Source1: gocr.desktop -# PATCH-FIX-OPENSUSE no-build-date.patch [email protected] -- Fix rpmlint warning "file-contains-current-date" (/usr/bin/gocr) -Patch0: no-build-date.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -BuildRequires: libnetpbm-devel -BuildRequires: transfig -%if 0%{?suse_version} +%if 0%{?suse_version} > 1210 +BuildRequires: desktop-file-utils +%else BuildRequires: update-desktop-files %endif +BuildRequires: libnetpbm-devel +BuildRequires: transfig Requires: jpeg Requires: netpbm Requires: transfig +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GOCR is an optical character recognition program. It reads images in @@ -47,11 +43,10 @@ and translate barcodes. %package gui -License: GPL-2.0+ Summary: Optical Character Recognition Program - Basic Graphical Interface Group: Productivity/Graphics/Other -Requires: tk Requires: %{name} = %{version} +Requires: tk Supplements: packageand(gocr:tk) %description gui @@ -63,38 +58,46 @@ %prep %setup -q -%patch0 -rm -rf */CVS -rm examples/.#Makefile.1.22 + +# Fix rpmlint warning "hidden-file-or-dir" +rm -f examples/.#Makefile.1.22 + +# Fix rpmlint warning "doc-file-dependency" +chmod 644 examples/score + +# Remove build time references so build-compare can do its work (fix rpmlint warning "file-contains-current-date") +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/gocr.c %build +# configure does not check if netpbm headers are installed in /usr/include/netpbm +export CPPFLAGS=-I%{_includedir}/netpbm %configure make %{?_smp_mflags} make %{?_smp_mflags} examples -make %{?_smp_mflags} doc %install %make_install -test -x %{buildroot}%{_mandir}/man1/gocr.1 && chmod a-x %{buildroot}%{_mandir}/man1/gocr.1 -# Fix doc files path +# Fix rpmlint warning "spurious-executable-perm" +chmod 644 %{buildroot}%{_mandir}/man1/gocr.1 + +# Fix doc files path in manpage perl -pi -e "s|/usr/share/doc/gocr-\\\fBX.XX\\\fR/|/usr/share/doc/packages/gocr/|" %{buildroot}%{_mandir}/man1/gocr.1 -%if 0%{?suse_version} -%suse_update_desktop_file -i %{name} Graphics OCR +# Install desktop file +%if 0%{?suse_version} > 1210 +desktop-file-install %{SOURCE1} +%else +%suse_update_desktop_file -i %{name} %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc AUTHORS BUGS CREDITS HISTORY README TODO gpl.html -%doc doc/examples.txt -%doc doc/gocr.html -%doc doc/unicode.txt +%doc doc/{examples.txt,gocr.html,unicode.txt} %doc examples/ -%doc %{_mandir}/man?/gocr.* +%doc %{_mandir}/man1/gocr.1%{ext_man} %{_bindir}/gocr %files gui ++++++ gocr.desktop ++++++ --- /var/tmp/diff_new_pack.zpMbn8/_old 2012-10-04 19:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.zpMbn8/_new 2012-10-04 19:39:08.000000000 +0200 @@ -6,4 +6,4 @@ #Icon= Terminal=false Type=Application -Categories=Graphics;OCR; +Categories=Graphics;Scanning;OCR; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
