|
|
@@ -6,8 +6,10 @@
|
|
|
|
|
|
#global optional_components 1
|
|
|
|
|
|
+%global minor_version 2.3
|
|
|
+
|
|
|
Name: openjpeg2
|
|
|
-Version: 2.1.2
|
|
|
+Version: 2.3.0
|
|
|
Release: 1%{?_dist_release}
|
|
|
Summary: C-Library for JPEG 2000
|
|
|
Summary(ja): JPEG 2000 用の C ライブラリ
|
|
|
@@ -32,10 +34,6 @@ Source1: data.tar.xz
|
|
|
|
|
|
# Remove bundled libraries
|
|
|
Patch0: openjpeg2_remove-thirdparty.patch
|
|
|
-# Fix CVE-2016-9572 and CVE-2016-9573
|
|
|
-Patch1: 7b28bd2b723df6be09fe7791eba33147c1c47d0d.patch
|
|
|
-# Fix CVE-2016-9580 and CVE-2016-9581
|
|
|
-Patch2: cadff5fb6e73398de26a92e96d3d7cac893af255.patch
|
|
|
|
|
|
BuildRequires: cmake
|
|
|
BuildRequires: zlib-devel
|
|
|
@@ -219,8 +217,6 @@ OpenJPEG2 JP3D module command line tools
|
|
|
%setup -q -n %{upname}-%{version} %{?runcheck:-a 1}
|
|
|
|
|
|
%patch0 -p1
|
|
|
-%patch1 -p1
|
|
|
-%patch2 -p1
|
|
|
|
|
|
# Remove all third party libraries just to be sure
|
|
|
rm -rf thirdparty
|
|
|
@@ -279,17 +275,17 @@ make test -C %{_target_platform}
|
|
|
|
|
|
|
|
|
%files
|
|
|
-%doc AUTHORS LICENSE NEWS README THANKS
|
|
|
+%doc AUTHORS* CHANGELOG* LICENSE NEWS* README* THANKS*
|
|
|
%{_libdir}/libopenjp2.so.*
|
|
|
%{_mandir}/man3/libopenjp2.3*
|
|
|
|
|
|
%files devel
|
|
|
-%dir %{_includedir}/openjpeg-2.1/
|
|
|
-%{_includedir}/openjpeg-2.1/openjpeg.h
|
|
|
-%{_includedir}/openjpeg-2.1/opj_config.h
|
|
|
-%{_includedir}/openjpeg-2.1/opj_stdint.h
|
|
|
+%dir %{_includedir}/openjpeg-%{minor_version}/
|
|
|
+%{_includedir}/openjpeg-%{minor_version}/openjpeg.h
|
|
|
+%{_includedir}/openjpeg-%{minor_version}/opj_config.h
|
|
|
+%{_includedir}/openjpeg-%{minor_version}/opj_stdint.h
|
|
|
%{_libdir}/libopenjp2.so
|
|
|
-%{_libdir}/openjpeg-2.1/
|
|
|
+%{_libdir}/openjpeg-%{minor_version}/
|
|
|
%{_libdir}/pkgconfig/libopenjp2.pc
|
|
|
|
|
|
%files devel-docs
|
|
|
@@ -349,6 +345,10 @@ make test -C %{_target_platform}
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Dec 15 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.0-1
|
|
|
+- new upstream release.
|
|
|
+- dropped %%patch1 and 2: fixed in upstream.
|
|
|
+
|
|
|
* Mon Mar 20 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.2-1
|
|
|
- new upstream release.
|
|
|
|
tomop