From 5af5dcb822761c4629813ced8af04ad754d9195f Mon Sep 17 00:00:00 2001
From: sagitter <sagitter(a)fedoraproject.org>
Date: Sat, 31 Oct 2015 23:56:58 +0100
Subject: Update to 6.1
---
.gitignore | 1 +
engauge-digitizer.spec | 24 ++++++++++++++----------
sources | 2 +-
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4dd0e06..97b85bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/engauge6-4b8703274398b3ccf4a2998131294fdcda2ff087.zip
/engauge6-77e64e19a4b81e5c8c28a4c51724b7dc328f14c6.zip
/engauge6-6.0.tar.gz
+/engauge6-6.1.tar.gz
diff --git a/engauge-digitizer.spec b/engauge-digitizer.spec
index 554e0ff..9113a2e 100644
--- a/engauge-digitizer.spec
+++ b/engauge-digitizer.spec
@@ -4,12 +4,12 @@
Name: engauge-digitizer
Summary: Convert graphs or map files into numbers
-Version: 6.0
+Version: 6.1
Release: 1%{?dist}
Group: Applications/Engineering
License: GPLv2+
URL:
http://digitizer.sourceforge.net/
-Source0:
https://github.com/markummitchell/engauge6/archive/v%{version}.tar.gz#/en...
+Source0:
https://github.com/markummitchell/engauge6/archive/v%{version}.tar.gz#/en...
##Patch the test build script to use qmake-qt5 and default Fedora
##optimization flags for compilers
@@ -41,7 +41,7 @@ BuildRequires: openjpeg2-devel
%endif
%description
-Engauge6 is rewrited with Qt5.
+Engauge6 is rewritten with Qt5.
This digitizing software converts an image file
showing a graph or map, into numbers.
The image file can come from a scanner, digital camera
@@ -53,6 +53,7 @@ such as Gnumeric.
New features already added to Engauge6:
+- Older Engauge files (before version 6) can be loaded
- Undo/redo of all operations means recovering from mistakes and experimenting
with options is painless
- Wizard provides an interactive tutorial to explain the basic steps
@@ -138,11 +139,12 @@ sed -e 's|RPM_OPT_FLAGS|"%{optflags}"|g' -i
src/build_and_run_all_tests
##Active support to jpeg2000
##jpeg2000 libraries not available on EPEL
%if 0%{?fedora}
-sed -e 's|CONFIG = qt warn_on thread debug|CONFIG = qt warn_on thread jpeg2000
debug|g' -i src/engauge.pro
+sed -e 's|CONFIG = qt warn_on thread debug|CONFIG = qt warn_on thread jpeg2000
debug|g' -i engauge.pro
+sed -e 's|INCLUDEPATH += Jpeg2000|INCLUDEPATH += src/Jpeg2000|g' -i engauge.pro
%endif
##Remove default -O1 optimization
-sed -e 's|-O1||g' -i src/engauge.pro
+sed -e 's|-O1||g' -i engauge.pro
##Remove spurious executable permissions
for i in `find src -type f \( -name "*.cpp" -o -name "*.h" \)`; do
@@ -150,7 +152,6 @@ chmod a-x $i
done
%build
-pushd src
%if 0%{?fedora}
export JPEG2000_INCLUDE=%{_includedir}/openjpeg-2.1
export JPEG2000_LIB=%{_libdir}
@@ -158,9 +159,10 @@ export JPEG2000_LIB=%{_libdir}
export ENGAUGE_RELEASE=1
qmake-qt5 -makefile engauge.pro \
QMAKE_CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -Wl,-z,now" \
- QMAKE_CXXFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -Wl,-z,now"
+ QMAKE_CXXFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -Wl,-z,now" \
+ QMAKE_LFLAGS="$RPM_LD_FLAGS -Wl,-z,now" \
+ DEFINES+=HELPDIR=%{_datadir}/doc/%{name}/help
make %{?_smp_mflags}
-popd
##Build HELP files
pushd help
@@ -175,7 +177,6 @@ pushd src
doxygen
popd
-
%install
mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/samples
mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/img
@@ -201,7 +202,7 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata
mkdir -p %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF
[Desktop Entry]
-Name=Engauge Digitizer 6
+Name=Engauge Digitizer 6.1
Type=Application
Comment=Extract data from graphs
TryExec=engauge
@@ -268,6 +269,9 @@ xvfb-run -s "-screen 0 640x480x24" -a sh -x
./build_and_run_all_tests
%license LICENSE
%changelog
+* Sat Oct 31 2015 Antonio Trande <sagitter(a)fedoraproject.org> - 1:6.1-1
+- Update to 6.1
+
* Sat Oct 24 2015 Antonio Trande <sagitter(a)fedoraproject.org> - 1:6.0-1
- First release
- Build release version
diff --git a/sources b/sources
index 8b16e44..4bb3f67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a65aa8cb3bd57272fed670a1f65f4e3 engauge6-6.0.tar.gz
+981d827aa2a0c977137fa2b6ebb3ff21 engauge6-6.1.tar.gz
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/engauge-digitizer.git/commit/?h=master...