[qt5-qtimageformats] 5.4.0-beta, Obsoletes: qt5-qtimageformats-devel

[Rex Dieter]

commit 298f89ddf8f8e04895d36378a1f4697f1d22ce36
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Oct 19 16:58:35 2014 -0500

    5.4.0-beta, Obsoletes: qt5-qtimageformats-devel

 .gitignore                                         |    1 +
 qt5-qtimageformats.spec                            |   25 ++++++++++++-------
 ...eformats-opensource-src-5.2.1-libmng-test.patch |   11 --------
 sources                                            |    2 +-
 4 files changed, 18 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d9cb6cf..3b17895 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qtimageformats-opensource-src-5.3.2.tar.xz
+/qtimageformats-opensource-src-5.4.0-beta.tar.xz
diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index d650f7d..cfd890e 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -10,20 +10,21 @@
 %global webp 1
 %endif
 
+%define pre beta
+
 Summary: Qt5 - QtImageFormats component
 Name:    qt5-%{qt_module}
-Version: 5.3.2
-Release: 1%{?dist}
+Version: 5.4.0
+Release: 0.1.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url: http://qt-project.org/
 %if 0%{?pre:1}
-Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
+Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
 %else
-Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
+Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 %endif
-Patch0: qtimageformats-opensource-src-5.2.1-libmng-test.patch
 
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: libmng-devel
@@ -35,6 +36,9 @@ BuildRequires: libwebp-devel
 Provides: bundled(libwebp)
 %endif
 
+# prior -devel subpkg contained only runtime cmake bits
+Obsoletes: qt5-qtimageformats-devel < 5.4.0
+
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
 
 %description
@@ -54,6 +58,7 @@ Requires: qt5-qtbase-devel%{?_isa}
 %if 0%{?docs}
 %package doc
 Summary: API documentation for %{name}
+License: GFDL
 Requires: %{name} = %{version}-%{release}
 # for qhelpgenerator
 BuildRequires: qt5-qttools-devel
@@ -65,7 +70,7 @@ BuildArch: noarch
 
 %prep
 %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
-%patch0 -p1
+
 %if 0%{?webp}
 rm -rv src/3rdparty
 %endif
@@ -90,7 +95,7 @@ make install_docs INSTALL_ROOT=%{buildroot}
 
 
 %files
-%doc LGPL_EXCEPTION.txt LICENSE.GPL LICENSE.LGPL
+%doc LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL*
 %{_qt5_plugindir}/imageformats/libqmng.so
 %{_qt5_plugindir}/imageformats/libqtga.so
 %{_qt5_plugindir}/imageformats/libqtiff.so
@@ -99,18 +104,20 @@ make install_docs INSTALL_ROOT=%{buildroot}
 %{_qt5_plugindir}/imageformats/libqicns.so
 %{_qt5_plugindir}/imageformats/libqjp2.so
 %{_qt5_plugindir}/imageformats/libqwebp.so
-
-%files devel
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_*Plugin.cmake
 
 %if 0%{?docs}
 %files doc
+%doc LICENSE.FDL
 %{_qt5_docdir}/qtimageformats.qch
 %{_qt5_docdir}/qtimageformats/
 %endif
 
 
 %changelog
+* Sun Oct 19 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.1.beta
+- 5.4.0-beta, Obsoletes: qt5-qtimageformats-devel
+
 * Wed Sep 17 2014 Rex Dieter <rdieter at fedoraproject.org> - 5.3.2-1
 - 5.3.2
 
diff --git a/sources b/sources
index 303dc90..69f218f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-255bb7f28c667ab91303e6af271753b5  qtimageformats-opensource-src-5.3.2.tar.xz
+535a85323f3b15adc1370e614ccd7c16  qtimageformats-opensource-src-5.4.0-beta.tar.xz