Build first release

.gitignore

@@ -3,3 +3,4 @@
 /engauge6-a251020d73afdd675d8c15f167b20c7eafd9cb2a.zip
 /engauge6-4b8703274398b3ccf4a2998131294fdcda2ff087.zip
 /engauge6-77e64e19a4b81e5c8c28a4c51724b7dc328f14c6.zip
+/engauge6-6.0.tar.gz

engauge-digitizer.appdata.xml

@@ -14,7 +14,8 @@
       can be read on the screen and written or copied to a
       spreadsheet. 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.
+      used by other tools such as spreadsheet and numerical computation
+      programs.
     </p>
     <p>
       Here are some real-life examples:
@@ -26,22 +27,17 @@
       </li>
       <li>
         You are a graduate student gathering historical data from
-        charts for your thesis
+        charts for your project
       </li>
       <li>
         You are a webmaster with visitor statistics charts and you
         want to do statistical analyses
       </li>
-      <li>
-        You made a bike trip and want to know how much distance you
-        covered by tracing a map
-      </li>
     </ul>
   </description>
   <screenshots>
-    <screenshot type="default">http://in.waw.pl/~zbyszek/fedora/engauge-screenshots/engauge-screenshot-points-save-as.png</screenshot>
+    <screenshot type="default">https://sagitter.fedorapeople.org/engauge-screenshots/engauge-screenshot-map-points.png</screenshot>
-    <screenshot>http://in.waw.pl/~zbyszek/fedora/engauge-screenshots/engauge-screenshot-axis-point.png</screenshot>
+    <screenshot>https://sagitter.fedorapeople.org/engauge-screenshots/engauge-screenshot-points-save-as.png</screenshot>
-    <screenshot>http://in.waw.pl/~zbyszek/fedora/engauge-screenshots/engauge-screenshot-map-points.png</screenshot>
   </screenshots>
   <url type="homepage">http://digitizer.sourceforge.net/</url>
   <updatecontact>zbyszek@in.waw.pl</updatecontact>

engauge-digitizer.spec

@@ -1,14 +1,15 @@
-%global  checkout   77e64e19a4b81e5c8c28a4c51724b7dc328f14c6
+%if 0%{?fedora} <= 22
-%global  date       20151011
+%global _hardened_build 1
+%endif
 
 Name:    engauge-digitizer
 Summary: Convert graphs or map files into numbers
-Version: 6
+Version: 6.0
-Release: 0.4.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
+Release: 1%{?dist}
 Group:   Applications/Engineering
 License: GPLv2+
 URL:     http://digitizer.sourceforge.net/
-Source0: https://github.com/markummitchell/engauge6/archive/%{checkout}.zip#/engauge6-%{checkout}.zip
+Source0: https://github.com/markummitchell/engauge6/archive/v%{version}.tar.gz#/engauge6-6.0.tar.gz
 
 ##Patch the test build script to use qmake-qt5 and default Fedora
 ##optimization flags for compilers
@@ -36,6 +37,7 @@ BuildRequires: doxygen
 
 %if 0%{?fedora}
 BuildRequires: libappstream-glib
+BuildRequires: openjpeg2-devel
 %endif
 
 %description
@@ -113,8 +115,10 @@ These files are listed below, with comments:
 - testcase.png - Same as testcase.jpg but in png format
 - testcoords.jpg - Advanced graph used by developers to check the affine
   transformations in Engauge
-- testcoords.sxd - Open Office document used to create testcoords.jpg (not an image!)
+- testcoords.sxd - Open Office document used to create testcoords.jpg
-- usgs.png - Fictional map loosely based on U.S. Geological Survey topographic maps
+  (not an image!)
+- usgs.png - Fictional map loosely based on U.S. Geological Survey
+  topographic maps
 
 %package doc
 Summary: HTML documentation of %{name}
@@ -124,18 +128,37 @@ BuildArch: noarch
 HTML documentation of %{name}.
 
 %prep
-%setup -q -n engauge6-%{checkout}
+%setup -q -n engauge6-%{version}
 
 ##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
 
+##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
+%endif
+
+##Remove default -O1 optimization
+sed -e 's|-O1||g' -i src/engauge.pro
+
+##Remove spurious executable permissions
+for i in `find src -type f \( -name "*.cpp" -o -name "*.h" \)`; do
+chmod a-x $i
+done
+
 %build
 pushd src
+%if 0%{?fedora}
+export JPEG2000_INCLUDE=%{_includedir}/openjpeg-2.1
+export JPEG2000_LIB=%{_libdir}
+%endif
+export ENGAUGE_RELEASE=1
 qmake-qt5 -makefile engauge.pro \
- QMAKE_CFLAGS="$RPM_OPT_FLAGS" \
+ QMAKE_CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -Wl,-z,now" \
- QMAKE_CXXFLAGS="$RPM_OPT_FLAGS"
+ QMAKE_CXXFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -Wl,-z,now"
 make %{?_smp_mflags}
 popd
 
@@ -164,10 +187,7 @@ mkdir -p %{buildroot}%{_bindir}
 install -p -m 755 bin/engauge %{buildroot}%{_bindir}
 
 pushd samples
-install -p -m 644 gridlines.gif gridlines_log.gif gridlines_log.src inverse.jpg inverse.png \
+install -p -m 644 *.gif *.jp* *.png *.bmp %{buildroot}%{_datadir}/%{name}-%{version}/samples
- linlog.jpg linlog.png loglin.png loglog.png normdist.jpg normdist.png pointmatch.jpg \
- pointplot.bmp polarcircles.jpg polarplot.jpg polarplot.png testcase.jpg testcase.png \
- testcoords.jpg testcoords.sxd usgs.png %{buildroot}%{_datadir}/%{name}-%{version}/samples
 popd
 
 install -p -m 644 src/img/* %{buildroot}%{_datadir}/%{name}-%{version}/img
@@ -211,7 +231,6 @@ sed -e \
 %if 0%{?fedora}
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
 %endif
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 ##Tests
 pushd src
@@ -249,6 +268,11 @@ xvfb-run -s "-screen 0 640x480x24" -a  sh -x ./build_and_run_all_tests
 %license LICENSE
 
 %changelog
+* Sat Oct 24 2015 Antonio Trande <sagitter@fedoraproject.org> - 1:6.0-1
+- First release
+- Build release version
+- Activated jpeg200 support
+
 * Wed Oct 14 2015 Antonio Trande <sagitter@fedoraproject.org> - 1:6-0.4.20151011git77e64e
 - Commit #77e64e
 - Old Transpose tool obsoleted

sources

@@ -1 +1 @@
-b51cbd6dd52abf6d81b5ceb3fe6dfb33  engauge6-77e64e19a4b81e5c8c28a4c51724b7dc328f14c6.zip
+4a65aa8cb3bd57272fed670a1f65f4e3  engauge6-6.0.tar.gz