- updated to 2.0.12

- removed obsolete libname,nocxx patches

diff --git a/crossmingw32-jasper-libname.patch b/crossmingw32-jasper-libname.patch
deleted file mode 100644 (file)
index 48fc581..0000000
--- a/crossmingw32-jasper-libname.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-#--- jasper-2.0.10/src/libjasper/CMakeLists.txt.orig   2016-12-30 17:53:52.000000000 +0100
-#+++ jasper-2.0.10/src/libjasper/CMakeLists.txt        2017-01-25 21:32:51.810752523 +0100
-#@@ -118,7 +118,7 @@
-#      set(libjasper_type STATIC)
-# endif()
-# 
-#-add_library(libjasper ${libjasper_type}
-#+add_library(jasper ${libjasper_type}
-#      ${libjasper_headers}
-#      ${libjasper_base_sources}
-#      ${libjasper_bmp_sources}
---- jasper-2.0.10/src/libjasper/CMakeLists.txt.orig    2017-01-25 21:36:26.414083407 +0100
-+++ jasper-2.0.10/src/libjasper/CMakeLists.txt 2017-01-25 21:36:35.714083301 +0100
-@@ -142,9 +142,7 @@
-       "${CMAKE_CURRENT_SOURCE_DIR}/include"
- )
- 
--if (UNIX)
--      set_target_properties(libjasper PROPERTIES OUTPUT_NAME jasper)
--endif()
-+set_target_properties(libjasper PROPERTIES OUTPUT_NAME jasper)
- set_target_properties(libjasper PROPERTIES LINKER_LANGUAGE C)
- 
- if (UNIX)

diff --git a/crossmingw32-jasper.spec b/crossmingw32-jasper.spec
index 2d98ebca4d55fbe642345dddc24a0cea13e7f468..e67ada2b5fc842da2297aeea820bf7cc662bbd6e 100644 (file)
--- a/crossmingw32-jasper.spec
+++ b/crossmingw32-jasper.spec
@@ -1,16 +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.10
-Release:       2
+Version:       2.0.12
+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: 06882adcf92524eb493f3cf0d3f62c9a
-Patch0:                %{name}-libname.patch
-Patch1:                jasper-nocxx.patch
-Patch2:                jasper-nodocs.patch
+# Source0-md5: b839a8bf418a64aa2d06413b23dd5ab3
+Patch0:                jasper-nodocs.patch
 URL:           http://www.ece.uvic.ca/~frodo/jasper/
 BuildRequires: cmake >= 2.8.11
 BuildRequires: crossmingw32-gcc
@@ -74,8 +72,6 @@ Biblioteka DLL JasPer dla Windows.
 %prep
 %setup -q -n jasper-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 # there is upstream directory named "build", use different name
@@ -100,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll

diff --git a/jasper-nocxx.patch b/jasper-nocxx.patch
deleted file mode 100644 (file)
index 1f4c7d0..0000000
--- a/jasper-nocxx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- jasper-2.0.10/CMakeLists.txt.orig  2016-12-30 17:53:52.000000000 +0100
-+++ jasper-2.0.10/CMakeLists.txt       2017-01-28 10:34:17.024052784 +0100
-@@ -1,6 +1,6 @@
- cmake_minimum_required (VERSION 2.8.11)
- 
--project(JasPer)
-+project(JasPer C)
- 
- set(CMAKE_MODULE_PATH
-   ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/cmake/modules/")