Update to 2.1.0

This commit is contained in:
Sandro Mani 2014-05-27 14:51:45 +02:00
parent 2294462cb6
commit 8fa9a2c560
4 changed files with 15 additions and 16 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/openjpeg-2.0.0-svn20140403.tar.gz
/openjpeg-2.0.0.tar.gz
/openjpeg-2.1.0.tar.gz

View File

@ -7,8 +7,8 @@
#global optional_components 1
Name: openjpeg2
Version: 2.0.0
Release: 5%{?dist}
Version: 2.1.0
Release: 1%{?dist}
Summary: C-Library for JPEG 2000
# windirent.h is MIT, the rest is BSD
@ -29,9 +29,7 @@ Source1: data.tar.xz
%endif
# Remove bundled libraries
Patch0: openjpeg2_remove-thirdparty.patch
# Add pkg-config support
Patch1: openjpeg2_pkgconfig.patch
Patch0: openjpeg2_remove-thirdparty.patch
BuildRequires: cmake
BuildRequires: zlib-devel
@ -208,7 +206,6 @@ OpenJPEG2 JP3D module command line tools
%prep
%setup -q -n %{upname}-%{version} %{?runcheck:-a 1}
%patch0 -p1
%patch1 -p1
# Remove all third party libraries just to be sure
rm -rf thirdparty
@ -272,12 +269,12 @@ make test -C %{_target_platform}
%{_mandir}/man3/libopenjp2.3*
%files devel
%dir %{_includedir}/openjpeg-2.0/
%{_includedir}/openjpeg-2.0/openjpeg.h
%{_includedir}/openjpeg-2.0/opj_config.h
%{_includedir}/openjpeg-2.0/opj_stdint.h
%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
%{_libdir}/libopenjp2.so
%{_libdir}/openjpeg-2.0/
%{_libdir}/openjpeg-2.1/
%{_libdir}/pkgconfig/libopenjp2.pc
%files devel-docs
@ -337,6 +334,7 @@ make test -C %{_target_platform}
%changelog
* Tue May 27 2014 Sandro Mani <manisandro@gmail.com> - 2.1.0-1
* Wed Apr 16 2014 Sandro Mani <manisandro@gmail.com> - 2.0.0-5
- Switch to official 2.0 release and backport pkg-config patch

View File

@ -1,7 +1,7 @@
diff -rupN openjpeg-2.0.0/CMakeLists.txt openjpeg-2.0.0-new/CMakeLists.txt
--- openjpeg-2.0.0/CMakeLists.txt 2014-04-03 14:12:58.000000000 +0200
+++ openjpeg-2.0.0-new/CMakeLists.txt 2014-04-09 00:31:52.738863206 +0200
@@ -244,7 +244,6 @@ if(BUILD_CODEC OR BUILD_MJ2)
diff -rupN openjpeg-2.1.0/CMakeLists.txt openjpeg-2.1.0-new/CMakeLists.txt
--- openjpeg-2.1.0/CMakeLists.txt 2014-04-29 09:15:05.000000000 +0200
+++ openjpeg-2.1.0-new/CMakeLists.txt 2014-05-23 13:12:19.513936024 +0200
@@ -249,7 +249,6 @@ if(BUILD_CODEC OR BUILD_MJ2)
# OFF: It will only build 3rd party libs if they are not found on the system
# ON: 3rd party libs will ALWAYS be build, and used
option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)

View File

@ -1 +1 @@
d9be274bddc0f47f268e484bdcaaa6c5 openjpeg-2.0.0.tar.gz
f6419fcc233df84f9a81eb36633c6db6 openjpeg-2.1.0.tar.gz