rdieter pushed to qt5-qtimageformats (el6). "Merge branch 'master' into f21"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 11 12:09:48 UTC 2015
>From 298f89ddf8f8e04895d36378a1f4697f1d22ce36 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 19 Oct 2014 16:58:35 -0500
Subject: 5.4.0-beta, Obsoletes: qt5-qtimageformats-devel
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/qtimageformats-opensource-src-5.2.1-libmng-test.patch b/qtimageformats-opensource-src-5.2.1-libmng-test.patch
deleted file mode 100644
index e035202..0000000
--- a/qtimageformats-opensource-src-5.2.1-libmng-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up qtimageformats-opensource-src-5.2.1/config.tests/libmng/libmng.cpp~ qtimageformats-opensource-src-5.2.1/config.tests/libmng/libmng.cpp
---- qtimageformats-opensource-src-5.2.1/config.tests/libmng/libmng.cpp~ 2014-02-01 22:38:05.000000000 +0200
-+++ qtimageformats-opensource-src-5.2.1/config.tests/libmng/libmng.cpp 2014-03-18 18:21:32.340722308 +0200
-@@ -39,6 +39,7 @@
- **
- ****************************************************************************/
-
-+#include <stdio.h>
- #include <libmng.h>
-
- int main(int, char **)
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
--
cgit v0.10.2
>From aea4545e6d63ad9d150ac5ac77f7b1494488d367 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 3 Nov 2014 18:43:55 -0600
Subject: out-of-tree build, use %qmake_qt5
diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index cfd890e..ab03c1a 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -15,7 +15,7 @@
Summary: Qt5 - QtImageFormats component
Name: qt5-%{qt_module}
Version: 5.4.0
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -77,20 +77,23 @@ rm -rv src/3rdparty
%build
-%{_qt5_qmake}
+mkdir %{_target_platform}
+pushd %{_target_platform}
+%{qmake_qt5} ..
make %{?_smp_mflags}
%if 0%{?docs}
make %{?_smp_mflags} docs
%endif
+popd
%install
-make install INSTALL_ROOT=%{buildroot}
+make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot}
+make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
%endif
@@ -115,6 +118,9 @@ make install_docs INSTALL_ROOT=%{buildroot}
%changelog
+* Mon Nov 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.2.beta
+- out-of-tree build, use %%qmake_qt5
+
* Sun Oct 19 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.1.beta
- 5.4.0-beta, Obsoletes: qt5-qtimageformats-devel
--
cgit v0.10.2
>From 0ca2bc97e9fc8cc601742bcc63db5ebaaf210350 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 28 Nov 2014 10:23:21 -0600
Subject: 5.4.0-rc
diff --git a/.gitignore b/.gitignore
index 3b17895..2a10433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/qtimageformats-opensource-src-5.3.2.tar.xz
-/qtimageformats-opensource-src-5.4.0-beta.tar.xz
+/qtimageformats-opensource-src-5.4.0-rc.tar.xz
diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index ab03c1a..86e504a 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -10,12 +10,12 @@
%global webp 1
%endif
-%define pre beta
+%define pre rc
Summary: Qt5 - QtImageFormats component
Name: qt5-%{qt_module}
Version: 5.4.0
-Release: 0.2.%{pre}%{?dist}
+Release: 0.3.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -118,6 +118,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
%changelog
+* Fri Nov 28 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.3.rc
+- 5.4.0-rc
+
* Mon Nov 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.2.beta
- out-of-tree build, use %%qmake_qt5
diff --git a/sources b/sources
index 69f218f..4148346 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-535a85323f3b15adc1370e614ccd7c16 qtimageformats-opensource-src-5.4.0-beta.tar.xz
+6e42c41a53b739d2a8e1b95e927b8e5a qtimageformats-opensource-src-5.4.0-rc.tar.xz
--
cgit v0.10.2
>From 9f21c2d37322cdf61bd783327fee4a4927b96b36 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 10 Dec 2014 07:37:35 -0600
Subject: 5.4.0 (final)
diff --git a/.gitignore b/.gitignore
index 2a10433..e00f0e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/qtimageformats-opensource-src-5.3.2.tar.xz
-/qtimageformats-opensource-src-5.4.0-rc.tar.xz
+/qtimageformats-opensource-src-5.4.0.tar.xz
diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index 86e504a..a4f4bea 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -10,12 +10,10 @@
%global webp 1
%endif
-%define pre rc
-
Summary: Qt5 - QtImageFormats component
Name: qt5-%{qt_module}
Version: 5.4.0
-Release: 0.3.%{pre}%{?dist}
+Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -118,6 +116,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
%changelog
+* Wed Dec 10 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-1
+- 5.4.0 (final)
+
* Fri Nov 28 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.3.rc
- 5.4.0-rc
diff --git a/sources b/sources
index 4148346..73d8f7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e42c41a53b739d2a8e1b95e927b8e5a qtimageformats-opensource-src-5.4.0-rc.tar.xz
+608dbe53d5d3a0872eb20025b681d1dc qtimageformats-opensource-src-5.4.0.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qt5-qtimageformats.git/commit/?h=el6&id=1fc7748f48fb81a10c51b8035fc8d1ae0ed41d5b
More information about the scm-commits
mailing list