rpm/engauge-digitizer
SHA256
1
0
Fork 0
forked from pool/engauge-digitizer
Code Pull Requests Activity

Accepting request 582038 from home:elvigia:branches:science

Browse Source 
- Reenable jpeg2000 support.
- Fix build requires, remove unused libjpeg-devel, libpng-devel

OBS-URL: https://build.opensuse.org/request/show/582038
OBS-URL: https://build.opensuse.org/package/show/science/engauge-digitizer?expand=0&rev=42
This commit is contained in:
Atri Bhattacharya
2018-03-06 14:53:17 +00:00
committed by Git OBS Bridge
parent 550b167782
commit b2203959ec
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engauge-digitizer.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 2 18:21:57 UTC 2018 - crrodriguez@opensuse.org
- Reenable jpeg2000 support.
- Fix build requires, remove unused libjpeg-devel, libpng-devel
-------------------------------------------------------------------
Tue Oct 10 13:01:04 UTC 2017 - badshah400@gmail.com

12
engauge-digitizer.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package engauge-digitizer
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@ Name: engauge-digitizer
Version: 10.4
Release: 0
Summary: Ditigize old graphs into numbers again
License: GPL-2.0+
License: GPL-2.0-or-later
Group: Productivity/Scientific/Other
Url: http://markummitchell.github.io/engauge-digitizer/
Source0: https://github.com/markummitchell/%{name}/archive/v%{version}.tar.gz
@@ -30,7 +30,6 @@ BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: icns-utils
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig
BuildRequires: texlive-epstopdf-bin
BuildRequires: texlive-latex-bin
@@ -48,7 +47,6 @@ BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(fftw3)
BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(libpng12)
BuildRequires: pkgconfig(log4cpp)
BuildRequires: pkgconfig(poppler-qt5)
BuildRequires: tex(8r.enc)
@@ -96,9 +94,7 @@ This package contains the documentation for Engauge Digitizer.
%build
# ADD JPEG2000 SUPPORT
export JPEG2000_INCLUDE=%{_includedir}/openjpeg-2.1
export JPEG2000_LIB=%{_libdir}
export OPENJPEG_INCLUDE=%{_includedir}/openjpeg-2.1
export OPENJPEG_INCLUDE=$(pkg-config --cflags-only-I libopenjp2 | sed -e 's@-I@@g')
export OPENJPEG_LIB=%{_libdir}
export POPPLER_INCLUDE=%{_includedir}/poppler/qt5
export POPPLER_LIB=%{_libdir}
@@ -107,7 +103,7 @@ qmake-qt5 engauge.pro \
"DEFINES+=HELPDIR=%{_docdir}/%{name}/help" \
QMAKE_CFLAGS="%optflags -fno-strict-aliasing" \
QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" \
CONFIG+=pdf
CONFIG+="pdf jpeg2000"
make %{?_smp_mflags}
#HELP files