- updated to 2.0.23

- removed obsolete nodocs patch, use new cmake option

diff --git a/crossmingw32-jasper.spec b/crossmingw32-jasper.spec
index 3e377978ccac9cfa11c80317abd370ffa1cedc03..495ea08b0ef1bd933385bef93b3a4caec2b9af5a 100644 (file)
--- a/crossmingw32-jasper.spec
+++ b/crossmingw32-jasper.spec
@@ -1,14 +1,14 @@
 Summary:       JasPer library for images manipulation - MinGW32 cross version
 Summary(pl.UTF-8):     Biblioteka JasPer do obróbki obrazów - wersja skrośna dla MinGW32
 Name:          crossmingw32-jasper
-Version:       2.0.14
+Version:       2.0.23
 Release:       1
 License:       BSD-like
 Group:         Development/Libraries
-#Source0Download: http://www.ece.uvic.ca/~frodo/jasper/#download
-Source0:       http://www.ece.uvic.ca/~frodo/jasper/software/jasper-%{version}.tar.gz
-# Source0-md5: 23561b51da8eb5d0dc85b91eff3d9a7f
-Patch0:                jasper-nodocs.patch
+# versions up to 2.0.14: http://www.ece.uvic.ca/~frodo/jasper/#download
+#Source0Download: https://github.com/mdadams/jasper/releases
+Source0:       https://github.com/mdadams/jasper/archive/version-%{version}/jasper-%{version}.tar.gz
+# Source0-md5: a58102279f9a09625321cf1cc5a46986
 URL:           http://www.ece.uvic.ca/~frodo/jasper/
 BuildRequires: cmake >= 2.8.11
 BuildRequires: crossmingw32-gcc
@@ -70,8 +70,7 @@ DLL JasPer library for Windows.
 Biblioteka DLL JasPer dla Windows.
 
 %prep
-%setup -q -n jasper-%{version}
-%patch0 -p1
+%setup -q -n jasper-version-%{version}
 
 %build
 # there is upstream directory named "build", use different name
@@ -82,8 +81,9 @@ cd builddir
        -DCMAKE_INSTALL_INCLUDEDIR:PATH=include \
        -DCMAKE_INSTALL_LIBDIR:PATH=lib \
        -DCMAKE_SYSTEM_NAME=Windows \
-       -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=FALSE \
-       -DJAS_ENABLE_OPENGL=FALSE \
+       -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF \
+       -DJAS_ENABLE_DOC=OFF \
+       -DJAS_ENABLE_OPENGL=OFF \
        -DJPEG_INCLUDE_DIR:PATH=%{_includedir} \
        -DJPEG_LIBRARY=%{_libdir}/libjpeg.dll.a
 
@@ -112,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog LICENSE README doc/jasper.pdf doc/jpeg2000.pdf
+%doc LICENSE README doc/jasper.pdf doc/jpeg2000.pdf
 %{_libdir}/libjasper.dll.a
 %{_includedir}/jasper
 %{_pkgconfigdir}/jasper.pc

diff --git a/jasper-nodocs.patch b/jasper-nodocs.patch
deleted file mode 100644 (file)
index 757d4c2..0000000
--- a/jasper-nodocs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- jasper-2.0.10/CMakeLists.txt.orig  2017-01-28 10:34:43.965367577 +0100
-+++ jasper-2.0.10/CMakeLists.txt       2017-01-28 10:38:07.115281724 +0100
-@@ -197,19 +197,10 @@
- # Perform plaform checks.
- ################################################################################
- 
--find_package(Doxygen)
--find_package(LATEX COMPONENTS PDFLATEX)
- find_program(BASH_PROGRAM bash)
- 
--# On some (or maybe all?) systems, LATEX_FOUND is not set by FindLATEX.
--# So, instead, rely on LATEX_PDFLATEX_FOUND.
--message("PDFLATEX_COMPILER: ${PDFLATEX_COMPILER}")
--if ((NOT LATEX_FOUND) AND PDFLATEX_COMPILER)
--      message(WARNING "Setting LATEX_FOUND to true.")
--      message(WARNING "Your version of CMake may be buggy.")
--      set(LATEX_FOUND true)
--endif()
--message("LATEX_FOUND ${LATEX_FOUND}")
-+set(DOXYGEN_FOUND false)
-+set(LATEX_FOUND false)
- 
- check_include_files(fcntl.h JAS_HAVE_FCNTL_H)
- check_include_files(io.h JAS_HAVE_IO_H)