Update to 7.0
This commit is contained in:
sagitter
parent
3db2256db0
commit
7d2914d540
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,3 +7,4 @@
|
||||
/engauge6-6.1.tar.gz
|
||||
/engauge6-6.2.tar.gz
|
||||
/engauge6-b6ad5b0cd3be30c52f17bf8917fe39fb28a60549.zip
|
||||
/engauge-digitizer-7.0.tar.gz
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> -->
|
||||
<application>
|
||||
<component type="desktop">
|
||||
<id type="desktop">engauge-digitizer.desktop</id>
|
||||
<metadata_license>CC0</metadata_license>
|
||||
<project_license>GPL-2.0+</project_license>
|
||||
@ -53,4 +53,4 @@
|
||||
</screenshots>
|
||||
<url type="homepage">http://digitizer.sourceforge.net/</url>
|
||||
<updatecontact>zbyszek@in.waw.pl</updatecontact>
|
||||
</application>
|
||||
</component>
|
||||
|
||||
@ -6,21 +6,17 @@
|
||||
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
|
||||
%endif
|
||||
|
||||
%global checkout b6ad5b0cd3be30c52f17bf8917fe39fb28a60549
|
||||
%global date 20160204
|
||||
#%%global checkout b6ad5b0cd3be30c52f17bf8917fe39fb28a60549
|
||||
#%%global date 20160204
|
||||
|
||||
Name: engauge-digitizer
|
||||
Summary: Convert graphs or map files into numbers
|
||||
Version: 6.2
|
||||
Release: 4.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
|
||||
Version: 7.0
|
||||
Release: 1%{?dist}
|
||||
Group: Applications/Engineering
|
||||
License: GPLv2+
|
||||
URL: https://github.com/markummitchell/engauge6
|
||||
Source0: https://github.com/markummitchell/engauge6/archive/%{checkout}.zip#/engauge6-%{checkout}.zip
|
||||
|
||||
##Patch the test build script to use qmake-qt5 and default Fedora
|
||||
##optimization flags for compilers
|
||||
Patch0: %{name}_fix_test_script.patch
|
||||
Source0: https://github.com/markummitchell/engauge-digitizer/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
|
||||
Epoch: 1
|
||||
Provides: %{name} = 1:%{version}-%{release}
|
||||
@ -53,7 +49,7 @@ BuildRequires: openjpeg2-devel
|
||||
%endif
|
||||
|
||||
%description
|
||||
Engauge6 is rewritten with Qt5.
|
||||
Engauge 7 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
|
||||
@ -63,7 +59,7 @@ The process starts with an image file containing a graph or map.
|
||||
The final result is digitized data that can be used by other tools
|
||||
such as Gnumeric.
|
||||
|
||||
New features already added to Engauge6:
|
||||
New features already added to Engauge:
|
||||
|
||||
- Older Engauge files (before version 6) can be loaded
|
||||
- Undo/redo of all operations means recovering from mistakes and experimenting
|
||||
@ -88,6 +84,9 @@ New features already added to Engauge6:
|
||||
for identifying problems and improving user support
|
||||
- Test suite for regression testing minimizes code breakage
|
||||
as new features are added
|
||||
- Multiple coordinate systems in the same image can be digitized in advanced mode
|
||||
- Axes with only one known coordinate (floating axes) can be digitized in advanced mode
|
||||
- File import by pasting
|
||||
|
||||
%package samples
|
||||
Summary: Sample files for %{name}
|
||||
@ -141,12 +140,7 @@ BuildArch: noarch
|
||||
HTML documentation of %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n engauge6-%{checkout}
|
||||
|
||||
##Patch the test build script to use qmake-qt5 and default Fedora
|
||||
##optimization flags for compilers
|
||||
%patch0 -p0
|
||||
sed -e 's|RPM_OPT_FLAGS|"%{optflags}"|g' -i src/build_and_run_all_tests
|
||||
%setup -q -n %{name}-%{version}
|
||||
|
||||
##Active support to jpeg2000
|
||||
##jpeg2000 libraries not available on EPEL
|
||||
@ -246,10 +240,6 @@ sed -e \
|
||||
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
|
||||
%endif
|
||||
|
||||
##Tests
|
||||
#pushd src
|
||||
#xvfb-run -s "-screen 0 640x480x24" -a sh -x ./build_and_run_all_tests
|
||||
|
||||
%post
|
||||
/usr/bin/update-desktop-database &> /dev/null || :
|
||||
|
||||
@ -282,6 +272,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Sun Mar 06 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:7.0-1
|
||||
- Update to 7.0
|
||||
|
||||
* Thu Feb 04 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:6.2-4.20160204gitb6ad5b
|
||||
- Update to commit #b6ad5b
|
||||
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
--- src/build_and_run_all_tests.orig 2015-09-28 04:36:59.000000000 +0200
|
||||
+++ src/build_and_run_all_tests 2015-09-28 11:08:36.319383842 +0200
|
||||
@@ -34,7 +34,7 @@
|
||||
echo "Rebuilding..."
|
||||
|
||||
# Make sure correct qt installation is being used, by looking for '5.' in the version number
|
||||
-VERSION5=`qmake -v | grep '5\.'`
|
||||
+VERSION5=`qmake-qt5 -v | grep '5\.'`
|
||||
if [ -z "$VERSION5" ]
|
||||
then
|
||||
echo "Need Qt5";
|
||||
@@ -47,7 +47,9 @@
|
||||
for t in "${tests[@]}"
|
||||
do
|
||||
sed "s/TEST/$t/g" engauge_test_template.pro >engauge_test.pro
|
||||
- qmake engauge_test.pro
|
||||
+ qmake-qt5 -makefile engauge_test.pro \
|
||||
+ QMAKE_CFLAGS=RPM_OPT_FLAGS \
|
||||
+ QMAKE_CXXFLAGS=$RPM_OPT_FLAGS
|
||||
make all 2>>$LOGFILE >/dev/null
|
||||
../bin/$t
|
||||
if [ $argcount -ne 1 ]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user