diff --git a/.gitignore b/.gitignore index 89638e8..8bf6d08 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /engauge-digitizer-10.4.tar.gz /engauge-digitizer-10.6.tar.gz /engauge-digitizer-10.7.tar.gz +/engauge-digitizer-10.9.tar.gz diff --git a/engauge-digitizer.spec b/engauge-digitizer.spec index 992c969..1192dd0 100644 --- a/engauge-digitizer.spec +++ b/engauge-digitizer.spec @@ -4,18 +4,13 @@ Name: engauge-digitizer Summary: Convert graphs or map files into numbers -Version: 10.7 -Release: 2%{?dist} +Version: 10.9 +Release: 1%{?dist} License: GPLv2+ URL: http://markummitchell.github.io/%{name}/ Source0: https://github.com/markummitchell/engauge-digitizer/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Epoch: 1 -##Excluding this arch because of missing BR packages (log4cpp) -%if 0%{?rhel} < 7 -ExcludeArch: ppc64 -%endif - ## Proposed in https://bugzilla.redhat.com/show_bug.cgi?id=1182409 Source1: %{name}.appdata.xml Source2: %{name}.svg @@ -23,20 +18,24 @@ Source3: %{name}-with-name.svg ## Main building BuildRequires: gcc, gcc-c++ -BuildRequires: qt5-qtbase-devel, qt5-qttools-devel BuildRequires: fftw-devel, log4cpp-devel, desktop-file-utils +BuildRequires: qt5-qtbase-devel, qt5-qttools-devel +%{?fedora:BuildRequires: pkgconf-pkg-config} +%{?rhel:BuildRequires: pkgconfig} -##Xvfb is needed to run a virtual X server used by tests +## Xvfb is needed to run a virtual X server used by tests BuildRequires: xorg-x11-server-Xvfb -##Doxygen for documentation +## Doxygen for documentation BuildRequires: doxygen %if 0%{?fedora} BuildRequires: libappstream-glib BuildRequires: openjpeg2-devel +BuildRequires: poppler-qt5-devel %endif +## Unavailable on epel6 Requires: qgnomeplatform%{?_isa} %description @@ -120,50 +119,57 @@ These files are listed below, with comments: Summary: HTML documentation of %{name} Group: Applications/Engineering BuildArch: noarch +BuildRequires: texlive-epstopdf, ghostscript %description doc HTML documentation of %{name}. %prep %setup -q -n %{name}-%{version} -##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 engauge.pro -sed -e 's|INCLUDEPATH += Jpeg2000|INCLUDEPATH += src/Jpeg2000|g' -i engauge.pro -%endif - -##Remove default -O1 optimization +## Remove default -O1 optimization sed -e 's|-O1||g' -i engauge.pro -##Remove spurious executable permissions +## Set fftw library link-path +sed -e 's|-L/$$(FFTW_HOME)/lib|-L$$(FFTW_HOME)/%{_libdir}|g' -i engauge.pro + +## Remove post-link task +sed --in-place '/QMAKE_POST_LINK/d' engauge.pro + +## Remove rpath link +sed --in-place '/QMAKE_LFLAGS/d' 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 -%if 0%{?fedora} -export JPEG2000_INCLUDE=%{_includedir}/openjpeg-2.1 -export JPEG2000_LIB=%{_libdir} -%endif export ENGAUGE_RELEASE=1 ## Flags set by hand for EPEL6 -%{qmake_qt5} engauge.pro \ +%if 0%{?fedora} +##'pkg-config cflags' provides strange backslashes at the output's end of line +export OPENJPEG_INCLUDE=%{_includedir}/openjpeg-`pkg-config --modversion libopenjp2 | sed 's/..$//'` +export OPENJPEG_LIB=%{_libdir} +export POPPLER_INCLUDE="%{_includedir}/poppler/qt5 -I%{_includedir}/poppler" +export POPPLER_LIB=%{_libdir} +%{qmake_qt5} engauge.pro "CONFIG+=pdf jpeg2000" QT_SELECT=qt5 \ +%else +%{qmake_qt5} engauge.pro "CONFIG+=log4cpp_null" QT_SELECT=qt5 \ +%endif QMAKE_CFLAGS_RELEASE="$RPM_OPT_FLAGS -pie -Wl,-z,now" \ QMAKE_CXXFLAGS_RELEASE="$RPM_OPT_FLAGS -pie -Wl,-z,now" \ QMAKE_LFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,now" \ DEFINES+=HELPDIR=%{_datadir}/doc/%{name}/help %make_build -##Build HELP files +## Build HELP files pushd help qcollectiongenerator-qt5 engauge.qhcp -o engauge.qhc -mv engauge.qch ../bin/documentation -mv engauge.qhc ../bin/documentation -rm -f build +rm -f build build.* +rm -rf .gitignore popd -##Build HTML/Latex documentation files +## Build HTML/Latex documentation files pushd src doxygen popd @@ -173,7 +179,7 @@ mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/samples mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/img mkdir -p %{buildroot}%{_datadir}/applications mkdir -p %{buildroot}%{_datadir}/pixmaps -mkdir -p %{buildroot}%{_datadir}/metainfo +mkdir -p %{buildroot}%{_metainfodir} mkdir -p %{buildroot}%{_bindir} install -p -m 755 bin/engauge %{buildroot}%{_bindir} @@ -186,10 +192,10 @@ install -p -m 644 src/img/* %{buildroot}%{_datadir}/%{name}-%{version}/img install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/ %if 0%{?fedora} -install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/ +install -p -m 644 %{SOURCE1} %{buildroot}%{_metainfodir}/ %endif -##Make a .desktop file +## Make a .desktop file mkdir -p %{buildroot}%{_datadir}/applications cat > %{buildroot}%{_datadir}/applications/%{name}.desktop < - 1:10.9-1 +- Update to 10.9 + * Thu Jul 12 2018 Fedora Release Engineering - 1:10.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 7e90821..af4a850 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (engauge-digitizer-10.7.tar.gz) = f9760212572e8b466b52eee82937e8da44ea54b62e4fa011aaedbacb310f39eeec31fbd54bd7b6fefd3885b1ccc5aa89dc41fd6fd6c0360fbc69914942b7bb21 +SHA512 (engauge-digitizer-10.9.tar.gz) = d38f59ea182852a0f4de7a14ccf238fcd92bc0af0484f4b017fe0a4d82ed7ab9672dc3ea1aa59d59a227fb6567c51017798182223389d4d18f206fbea4046852