rdieter pushed to qt5-qtimageformats (el6). "Merge branch 'master' into f21"

Sat Apr 11 12:09:36 UTC 2015

>From af9cce110a87cd35d6aae568fdc439509b4a5042 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 24 Jul 2014 07:02:13 -0500
Subject: no webp on (ep)el6

diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index 23996b8..df079c1 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -5,6 +5,11 @@
 # where qt5-qttools builds are not yet available
 %define docs 1
 
+# where to enable webp support
+%if 0%{?fedora} || 0%{?rhel} > 6
+%global webp 1
+%endif
+
 Summary: Qt5 - QtImageFormats component
 Name:    qt5-%{qt_module}
 Version: 5.3.1
@@ -24,7 +29,9 @@ BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: libmng-devel
 BuildRequires: libtiff-devel
 BuildRequires: jasper-devel
+%if 0%{?webp}
 BuildRequires: libwebp-devel
+%endif
 
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
 
@@ -87,7 +94,9 @@ make install_docs INSTALL_ROOT=%{buildroot}
 %{_qt5_plugindir}/imageformats/libqdds.so
 %{_qt5_plugindir}/imageformats/libqicns.so
 %{_qt5_plugindir}/imageformats/libqjp2.so
+%if 0%{?webp}
 %{_qt5_plugindir}/imageformats/libqwebp.so
+%endif
 
 %files devel
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_*Plugin.cmake
-- 
cgit v0.10.2


>From 8c0e270693c1679f25ab0edf539a49d86534177b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 24 Jul 2014 07:15:28 -0500
Subject: fix build (on el6, using bundled libwebp)


diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index df079c1..2f4ab08 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -31,6 +31,8 @@ BuildRequires: libtiff-devel
 BuildRequires: jasper-devel
 %if 0%{?webp}
 BuildRequires: libwebp-devel
+%else
+Provides: bundled(libwebp)
 %endif
 
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@@ -64,7 +66,9 @@ BuildArch: noarch
 %prep
 %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
 %patch0 -p1
-rm -r src/3rdparty
+%if ! 0%{?webp}
+rm -rv src/3rdparty
+%endif
 
 
 %build
@@ -94,9 +98,7 @@ make install_docs INSTALL_ROOT=%{buildroot}
 %{_qt5_plugindir}/imageformats/libqdds.so
 %{_qt5_plugindir}/imageformats/libqicns.so
 %{_qt5_plugindir}/imageformats/libqjp2.so
-%if 0%{?webp}
 %{_qt5_plugindir}/imageformats/libqwebp.so
-%endif
 
 %files devel
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_*Plugin.cmake
-- 
cgit v0.10.2


>From 72e6a4bc9a968392845416b29f0a087754d0065a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 24 Jul 2014 07:27:39 -0500
Subject: fix logic on removing bundled code


diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index 2f4ab08..d447ff7 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -66,7 +66,7 @@ BuildArch: noarch
 %prep
 %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
 %patch0 -p1
-%if ! 0%{?webp}
+%if 0%{?webp}
 rm -rv src/3rdparty
 %endif
 
-- 
cgit v0.10.2


>From c5615d9e797827ccda15a549c9b36209dfda07dc Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sun, 17 Aug 2014 22:49:27 +0000
Subject: - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild


diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index d447ff7..ae157e2 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -13,7 +13,7 @@
 Summary: Qt5 - QtImageFormats component
 Name:    qt5-%{qt_module}
 Version: 5.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -111,6 +111,9 @@ make install_docs INSTALL_ROOT=%{buildroot}
 
 
 %changelog
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Tue Jun 17 2014 Jan Grulich <jgrulich at redhat.com> - 5.3.1-1
 - 5.3.1
 
-- 
cgit v0.10.2


>From ba2fc5012f64a5f14502fa682c1a8cb24cdc8fd9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 17 Sep 2014 06:25:05 -0500
Subject: 5.3.2


diff --git a/.gitignore b/.gitignore
index 4cbdb88..d9cb6cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/qtimageformats-opensource-src-5.2.0.tar.xz
-/qtimageformats-opensource-src-5.2.1.tar.xz
-/qtimageformats-opensource-src-5.3.0.tar.xz
-/qtimageformats-opensource-src-5.3.1.tar.xz
+/qtimageformats-opensource-src-5.3.2.tar.xz
diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index ae157e2..d650f7d 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -12,8 +12,8 @@
 
 Summary: Qt5 - QtImageFormats component
 Name:    qt5-%{qt_module}
-Version: 5.3.1
-Release: 2%{?dist}
+Version: 5.3.2
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -111,6 +111,9 @@ make install_docs INSTALL_ROOT=%{buildroot}
 
 
 %changelog
+* Wed Sep 17 2014 Rex Dieter <rdieter at fedoraproject.org> - 5.3.2-1
+- 5.3.2
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 1e06882..303dc90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8bf9b65e5a586091d0ce9f9107367f4a  qtimageformats-opensource-src-5.3.1.tar.xz
+255bb7f28c667ab91303e6af271753b5  qtimageformats-opensource-src-5.3.2.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qt5-qtimageformats.git/commit/?h=el6&id=30d17e8511d15799cf3857df7a2b245cfd82e9bd
