- Merge fix

.gitignore

@@ -1,3 +1,5 @@
 /qtwebchannel-opensource-src-5.5.0.tar.xz
 /qtwebchannel-opensource-src-5.5.1-rc1.tar.xz
 /qtwebchannel-opensource-src-5.6.0-beta.tar.gz
+/qtwebchannel-opensource-src-5.5.1.tar.xz
+/qtwebchannel-opensource-src-5.6.0-beta1.tar.xz

qt5-qtwebchannel.spec

@@ -14,11 +14,11 @@ Release: 0.2%{?dist}
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url: http://qt.io
 Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.gz
-
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: pkgconfig(Qt5Core)
 BuildRequires: pkgconfig(Qt5Quick)
 BuildRequires: qt5-qdoc
+# Qt5WebSockets package is optional and only needed for some examples
 BuildRequires: pkgconfig(Qt5WebSockets)
 
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
@@ -40,6 +40,7 @@ Requires: qt5-qtbase-devel%{?_isa}
 Summary: API documentation for %{name}
 License: GFDL
 Requires: %{name} = %{version}-%{release}
+BuildRequires: qt5-qdoc
 BuildRequires: qt5-qhelpgenerator
 BuildArch: noarch
 %description doc
@@ -56,6 +57,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %prep
 %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
 
+
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
@@ -125,6 +127,9 @@ popd
 * Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.2
 - Official beta release
 
+* Sun Dec 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.2
+- restore bootstrap macro support
+
 * Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1
 - Start to implement 5.6.0 beta
 

sources

@@ -1 +1,5 @@
+<<<<<<< HEAD
 dbd637b0e90d3fea56141e3d277071ed  qtwebchannel-opensource-src-5.6.0-beta.tar.gz
+=======
+e8da7c6f669054e8828947a9af924ae1  qtwebchannel-opensource-src-5.6.0-beta1.tar.xz
+>>>>>>> 7d85456e17a9edac864567ac1629384b20ddb440