jgrulich pushed to qt5-qtimageformats (epel7). "Merge branch 'f20' into f21"

[notifications at fedoraproject.org]

From d37dd49815a35c829983c3a9128e9c3011243857 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 27 Feb 2015 10:46:57 -0600
Subject: rebuild (gcc5)


diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index 1d11374..2ced58d 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -13,7 +13,7 @@
 Summary: Qt5 - QtImageFormats component
 Name:    qt5-%{qt_module}
 Version: 5.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -116,6 +116,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Fri Feb 27 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.4.1-2
+- rebuild (gcc5)
+
 * Tue Feb 24 2015 Jan Grulich <jgrulich at redhat.com> 5.4.1-1
 - 5.4.1
 
-- 
cgit v0.10.2


From a3dc47198db737efd6e565894fb247307c16fff7 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Sat, 2 May 2015 17:13:19 +0200
Subject: Rebuilt for GCC 5 C++11 ABI change


diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index 2ced58d..eac7d95 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -13,7 +13,7 @@
 Summary: Qt5 - QtImageFormats component
 Name:    qt5-%{qt_module}
 Version: 5.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -116,6 +116,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 5.4.1-3
+- Rebuilt for GCC 5 C++11 ABI change
+
 * Fri Feb 27 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.4.1-2
 - rebuild (gcc5)
 
-- 
cgit v0.10.2


From b24dee85a9a3b3b87011c65d02851ea64981fa48 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 23 May 2015 09:22:44 -0500
Subject: Provides: qt5-qtimageformat-devel

and drop unused %package devel stanza

diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index eac7d95..64ad7c7 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -13,7 +13,7 @@
 Summary: Qt5 - QtImageFormats component
 Name:    qt5-%{qt_module}
 Version: 5.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -36,6 +36,7 @@ Provides: bundled(libwebp)
 
 # prior -devel subpkg contained only runtime cmake bits
 Obsoletes: qt5-qtimageformats-devel < 5.4.0
+Provides:  qt5-qtimageformats-devel = %{version}-%{release}
 
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
 
@@ -46,13 +47,6 @@ ref. Reading and Writing Image Files. The Qt Image Formats add-on module
 provides optional support for other image file formats, including:
 MNG, TGA, TIFF, WBMP.
 
-%package devel
-Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: qt5-qtbase-devel%{?_isa}
-%description devel
-%{summary}.
-
 %if 0%{?docs}
 %package doc
 Summary: API documentation for %{name}
@@ -116,6 +110,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Sat May 23 2015 Rex Dieter <rdieter at fedoraproject.org> 5.4.1-4
+- Provides: qt5-qtimageformat-devel
+
 * Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 5.4.1-3
 - Rebuilt for GCC 5 C++11 ABI change
 
-- 
cgit v0.10.2


From 2ec09e004671b20996618478a42c1e6838fdc0f8 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich at redhat.com>
Date: Wed, 3 Jun 2015 12:54:38 +0200
Subject: Update to 5.4.2


diff --git a/.gitignore b/.gitignore
index b589bbf..71867ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /qtimageformats-opensource-src-5.4.0.tar.xz
 /qtimageformats-opensource-src-5.4.1.tar.xz
+/qtimageformats-opensource-src-5.4.2.tar.xz
diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index 64ad7c7..2851886 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -12,8 +12,8 @@
 
 Summary: Qt5 - QtImageFormats component
 Name:    qt5-%{qt_module}
-Version: 5.4.1
-Release: 4%{?dist}
+Version: 5.4.2
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -110,6 +110,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Wed Jun 03 2015 Jan Grulich <jgrulich at redhat.com> 5.4.2-1
+- 5.4.2
+
 * Sat May 23 2015 Rex Dieter <rdieter at fedoraproject.org> 5.4.1-4
 - Provides: qt5-qtimageformat-devel
 
diff --git a/sources b/sources
index e8db05d..81269d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1436680e00ea3e211fd0abdb7c18014a  qtimageformats-opensource-src-5.4.1.tar.xz
+b09f8aa0b04c96fddbdff623e7b4c17a  qtimageformats-opensource-src-5.4.2.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qt5-qtimageformats.git/commit/?h=epel7&id=6e726a95a8b054740a994cd5682c15d1ce5313c2