[packages/crossmingw32-jasper] - updated to 2.0.12 - removed obsolete libname,nocxx patches
qboosh
qboosh at pld-linux.org
Tue Apr 11 17:37:22 CEST 2017
commit b7a5aaf30a3f93862f2a6d09c43b60b225a9c29a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Apr 11 17:37:29 2017 +0200
- updated to 2.0.12
- removed obsolete libname,nocxx patches
crossmingw32-jasper-libname.patch | 24 ------------------------
crossmingw32-jasper.spec | 14 +++++---------
jasper-nocxx.patch | 10 ----------
3 files changed, 5 insertions(+), 43 deletions(-)
---
diff --git a/crossmingw32-jasper.spec b/crossmingw32-jasper.spec
index 2d98ebc..e67ada2 100644
--- 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/crossmingw32-jasper-libname.patch b/crossmingw32-jasper-libname.patch
deleted file mode 100644
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/jasper-nocxx.patch b/jasper-nocxx.patch
deleted file mode 100644
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/")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-jasper.git/commitdiff/b7a5aaf30a3f93862f2a6d09c43b60b225a9c29a
More information about the pld-cvs-commit
mailing list