From 635362fd04f85cb54cbfee3fad17c5b5e45fb0db Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Apr 30 2015 23:39:59 +0000 Subject: Update to 3.1 --- diff --git a/.gitignore b/.gitignore index 0cb571e..cea1c75 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /gimagereader-2.93.tar.xz /gimagereader-3.0.tar.xz /gimagereader-3.0.1.tar.xz +/gimagereader-3.1.tar.xz diff --git a/gimagereader.spec b/gimagereader.spec index 45cd04e..b6b1215 100644 --- a/gimagereader.spec +++ b/gimagereader.spec @@ -1,5 +1,5 @@ Name: gimagereader -Version: 3.0.1 +Version: 3.1 Release: 1%{?dist} Summary: A front-end to tesseract-ocr @@ -17,9 +17,10 @@ BuildRequires: sane-backends-devel BuildRequires: intltool BuildRequires: desktop-file-utils BuildRequires: libappstream-glib -BuildRequires: qt4-devel -BuildRequires: qtspell-qt4-devel -BuildRequires: poppler-qt-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qtspell-qt5-devel +BuildRequires: poppler-qt5-devel +BuildRequires: gtksourceviewmm3-devel Requires: hicolor-icon-theme @@ -88,7 +89,7 @@ make %{?_smp_mflags} mkdir build_qt ( cd build_qt -%cmake -DINTERFACE_TYPE=qt4 -DENABLE_VERSIONCHECK=0 -DMANUAL_DIR="%{_defaultdocdir}/%{name}-common" .. +%cmake -DINTERFACE_TYPE=qt5 -DENABLE_VERSIONCHECK=0 -DMANUAL_DIR="%{_defaultdocdir}/%{name}-common" .. make %{?_smp_mflags} ) @@ -97,9 +98,9 @@ make %{?_smp_mflags} %make_install -C build_gtk %make_install -C build_qt %{_bindir}/desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-gtk.desktop -%{_bindir}/desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt4.desktop -%{_bindir}/appstream-util validate %{buildroot}%{_datadir}/appdata/%{name}-gtk.appdata.xml || : -%{_bindir}/appstream-util validate %{buildroot}%{_datadir}/appdata/%{name}-qt4.appdata.xml || : +%{_bindir}/desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt5.desktop +%{_bindir}/appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}-gtk.appdata.xml +%{_bindir}/appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}-qt5.appdata.xml %find_lang %{name} @@ -143,7 +144,7 @@ fi %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/256x256/apps/%{name}.png -%doc %{_defaultdocdir}/%{name}-common/manual.html +%doc %{_defaultdocdir}/%{name}-common/manual*.html %files gtk %{_bindir}/%{name}-gtk @@ -152,11 +153,14 @@ fi %{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml %files qt -%{_bindir}/%{name}-qt4 -%{_datadir}/appdata/%{name}-qt4.appdata.xml -%{_datadir}/applications/%{name}-qt4.desktop +%{_bindir}/%{name}-qt5 +%{_datadir}/appdata/%{name}-qt5.appdata.xml +%{_datadir}/applications/%{name}-qt5.desktop %changelog +* Fri May 01 2015 Sandro Mani - 3.1-1 +- Update to 3.1 + * Sun Jan 04 2015 Sandro Mani - 3.0.1-1 - Update to 3.0.1. diff --git a/sources b/sources index 844c267..be99714 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1214e7541674f7ba443a237014562199 gimagereader-3.0.1.tar.xz +885b2c81e218ad3e9a2e0b2f2acda5ff gimagereader-3.1.tar.xz