[qupzilla] - New upstream qupzilla

Wed Mar 11 14:12:35 UTC 2015

commit e2748635c5e0b6ae01339476b511d912b11d6221
Author: Helio Chissini de Castro <helio at kde.org>
Date:   Wed Mar 11 11:11:11 2015 -0300

    - New upstream qupzilla

 .gitignore    |   1 +
 qupzilla.spec | 102 +++++++++++++++++++++++-----------------------------------
 sources       |   2 +-
 3 files changed, 42 insertions(+), 63 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 50ae203..c1ed3ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /v1.4.3.tar.gz
 /v1.4.4.tar.gz
 /QupZilla-1.6.3.tar.gz
+/QupZilla-1.8.6.tar.xz
diff --git a/qupzilla.spec b/qupzilla.spec
index a9dec38..d938b9e 100644
--- a/qupzilla.spec
+++ b/qupzilla.spec
@@ -1,20 +1,11 @@
-# Review request: https://bugzilla.redhat.com/show_bug.cgi?id=819184
-
-%global __provides_exclude_from %{_libdir}/%{name}/.*\.so$
-%global __provides_exclude_from %{_libdir}/libQupZilla.so.*
-%global __requires_exclude_from %{_libdir}/libQupZilla.so.*
-# Old version (Fedora <= 14 and RHEL 6)
-#%{?filter_setup:
-#%filter_provides_in %{_libdir}/%{name}/.*\.so$
-#%filter_from_provides /libQupZilla.so.*/d
-#%filter_from_requires /libQupZilla.so.*/d
-#%filter_setup
-#}
-
+%global _with_qt4 0
+%if 0%{?fedora} <= 20
+%global _with_qt4 1
+%endif
 
 Name:           qupzilla
-Version:        1.6.3
-Release:        3%{?dist}
+Version:        1.8.6
+Release:        1%{?dist}
 Summary:        Modern web browser
 
 Group:          Applications/Internet
@@ -22,16 +13,19 @@ Group:          Applications/Internet
 # Files in src/plugins/MouseGestures/3rdparty are BSD (2 clause)
 License:        GPLv3+ and BSD
 URL:            http://www.qupzilla.com/
-#VCS            git:git://github.com/QupZilla/qupzilla.git
-Source0:        http://qupzilla.com/uploads/QupZilla-%{version}.tar.gz
-Patch0:         QupZilla-1.6.3-kwallet-include.patch
+Source0:        https://github.com/QupZilla/qupzilla/releases/download/v1.8.6/QupZilla-1.8.6.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  qt4-devel >= 4.7
-BuildRequires:  qtwebkit-devel
+BuildRequires:  dbus-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  openssl-devel
+%if %{_with_qt4}
+BuildRequires:  qt4-devel >= 4.7
+BuildRequires:  qtwebkit-devel >= 2.2
 BuildRequires:  kdelibs4-devel
+%else
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtwebkit-devel
+%endif
 
 %description
 QupZilla is modern web browser based on WebKit core and Qt Framework. It is 
@@ -43,52 +37,31 @@ designed to be lightweight and fast and offers advanced functions such as
 - theming support, and
 - seamless integration into your desktop environment.
 
-
 %prep
 %setup -qn QupZilla-%{version}
 
-%patch0 -p1 -b .kwallet-include
-# remove BUILDTIME usage from build
-sed '/static const QString BUILDTIME/d' -i src/lib/app/qupzilla.h
-sed '/QupZilla::BUILDTIME/d' -i \
-    src/lib/app/commandlineoptions.cpp \
-    src/lib/app/qupzilla.cpp \
-    src/lib/network/schemehandlers/qupzillaschemehandler.cpp \
-    src/lib/other/aboutdialog.cpp
-
-# convert DOS line endings to Unix
-for file in COPYRIGHT README.md; do
-    sed "s|\r||g" $file > $file.new && \
-    touch -r $file $file.new && \
-    mv $file.new $file
-done
-
-
 %build
+mkdir -p %{_target_platform}
 
-# set proper paths
-export QUPZILLA_PREFIX="%{_prefix}/" # beware, trailing slash required!
+export QUPZILLA_PREFIX="%{_prefix}/"
 export USE_LIBPATH="%{_libdir}"
+export DISABLE_DBUS="false"
+export PORTABLE_BUILD="false"
+export GNOME_INTEGRATION="false"
 
-# enable better oxygen icons in Preferences
-# FIXME: "KDE=true" will probably add a dependency on nepomuk in the future,
-# not sure if we really want that
-export KDE="true"
-
-# enable WebGL
-export USE_WEBGL="true"
-
-# enable geolocalization 
-export USE_QTWEBKIT_2_2="true"
-
-# debug option is needed for -debuginfo
-qmake-qt4 CONFIG+=debug QMAKE_CXXFLAGS="%{optflags}" QMAKE_LFLAGS+="-Wl,--as-needed"
+pushd %{_target_platform}
+	%if %{_with_qt4}
+		%{qmake_qt4} ..
+	%else
+		%{qmake_qt5} .. 
+	%endif
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-make install INSTALL_ROOT=%{buildroot} INSTALL='install -p'
+make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 # translations
 %find_lang qt --with-qt
@@ -111,15 +84,10 @@ desktop-file-install \
 # remove useless plugin
 rm -f %{buildroot}%{_libdir}/qupzilla/libTestPlugin.so
 
-# as long as we have no -devel package, we remove this one, too
-rm -f %{buildroot}%{_libdir}/libQupZilla.so
-
-
 %post
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-
 %postun
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
@@ -133,7 +101,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f qt.lang
-%doc AUTHORS CHANGELOG COPYRIGHT FAQ GPLv3 README.md
+%doc AUTHORS CHANGELOG FAQ README.md
+%license COPYRIGHT GPLv3 
 %{_bindir}/%{name}
 %{_libdir}/libQupZilla.so.*
 %{_libdir}/%{name}/
@@ -144,9 +113,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/locale
 %{_datadir}/%{name}/themes
+%{_datadir}/appdata/qupzilla.appdata.xml
+# We don't have a devel package
+%exclude %{_libdir}/libQupZilla.so
 
 
 %changelog
+* Wed Mar 11 2015 Helio Chissini de Castro <helio at kde.org> - 1.8.6-1
+- New pustream version - Repackaged replacing invalid icons
+- Make Qt5 as default
+- Compile Qt4 only in Fedora 20 or less
+- Remove invalid flags
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 27060e2..2b53c62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e83d0571c070876a3cd0ec7c3f1ef9ff  QupZilla-1.6.3.tar.gz
+7218615c80b7e5d138c318661f554dd6  QupZilla-1.8.6.tar.xz
