Hello community, here is the log from the commit of package qupzilla for openSUSE:Factory checked in at 2015-11-04 15:33:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qupzilla (Old) and /work/SRC/openSUSE:Factory/.qupzilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qupzilla" Changes: -------- --- /work/SRC/openSUSE:Factory/qupzilla/qupzilla.changes 2015-10-12 10:02:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qupzilla.new/qupzilla.changes 2015-11-04 15:33:44.000000000 +0100 @@ -1,0 +2,29 @@ +Mon Nov 2 14:21:56 UTC 2015 - [email protected] + +- Fix source url to the right location + +------------------------------------------------------------------- +Sat Oct 31 10:21:56 UTC 2015 - [email protected] + +- Update to 1.8.8: + * Add interface for extensions to show action in Tools menu. + * Add option to use TabManager as main tabbar replacement. + * Fix build with Qt 5.5.1. + * Fix crash when unloading plugin with visible sidebar. + * Fix possible crash when accessing last active window. + * Fix sometimes incorrectly loading background non-restored tab. + * Fix showing speed dials in bookmarks icon. + * Fix showing messages in statusbar in RTL mode. + * Fix crash when application style is externally changed. + * Fix labels colour in access keys navigation with dark style. + * Fix position of autoscroll indicator with site notification + visible. +- Remove qupzilla-qt5* packages and build with Qt5 in + openSUSE Leap 42.1 and newer. +- Instead of removing BUILDTIME, fix it up. +- Install qupzilla-gnome-keyring when gnome-keyring is installed. +- Try not to mention WebKit in description, QupZilla will move to + QtWebEngine. +- Generate icon cache. + +------------------------------------------------------------------- Old: ---- QupZilla-1.8.7.tar.xz pre_checkin.sh qupzilla-qt5.changes qupzilla-qt5.spec New: ---- QupZilla-1.8.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qupzilla.spec ++++++ --- /var/tmp/diff_new_pack.3C10x9/_old 2015-11-04 15:33:47.000000000 +0100 +++ /var/tmp/diff_new_pack.3C10x9/_new 2015-11-04 15:33:47.000000000 +0100 @@ -2,7 +2,7 @@ # spec file for package qupzilla # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2012-2015 Mariusz Fik <[email protected]> +# Copyright (c) 2015 Mariusz Fik <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,37 +17,35 @@ # -%bcond_with qt5 Name: qupzilla -Version: 1.8.7 +Version: 1.8.8 Release: 0 -Summary: A very fast open source browser based on WebKit core +Summary: Cross-platform Qt web browser License: GPL-3.0+ Group: Productivity/Networking/Web/Browsers Url: http://qupzilla.com/ -Source0: https://github.com/QupZilla/qupzilla/releases/download/v%{version}/QupZilla-%{version}.tar.xz -# Search engine favicons -Source1: obs.png -Source2: opensusesoftware.png -# DB shipping openSUSE project bookmark icon -Source3: browsedata.db +Source: https://github.com/QupZilla/%{name}/releases/download/v%{version}/QupZilla-%{version}.tar.xz +Source1: %{name}.changes +# Search engine favicons. +Source2: obs.png +Source3: opensusesoftware.png +# DB shipping openSUSE project bookmark icon. +Source4: browsedata.db # PATCH-FEATURE-OPENSUSE qupzilla-defaults.patch -Patch0: qupzilla-defaults.patch +Patch0: %{name}-defaults.patch BuildRequires: fdupes -%if %{with qt5} -%if 0%{?suse_version} > 1310 +BuildRequires: hicolor-icon-theme +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gnome-keyring-1) +BuildRequires: pkgconfig(hunspell) +BuildRequires: pkgconfig(openssl) +# qupzilla-qt5 was last seen in openSUSE Leap 42.1. +Provides: %{name}-qt5 = %{version} +Obsoletes: %{name}-qt5 < %{version} +%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) BuildRequires: kwallet-devel BuildRequires: libQt5Gui-private-headers-devel -%else -BuildRequires: libqt5-qtbase-private-headers-devel -%endif BuildRequires: libqt5-qttools-devel -%else -BuildRequires: libkde4-devel -%endif -BuildRequires: pkgconfig(gnome-keyring-1) -BuildRequires: pkgconfig(hunspell) -%if %{with qt5} BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -60,137 +58,130 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) %else +BuildRequires: libkde4-devel BuildRequires: pkgconfig(QtCore) >= 4.7 BuildRequires: pkgconfig(QtGui) >= 4.7 BuildRequires: pkgconfig(QtNetwork) >= 4.7 BuildRequires: pkgconfig(QtWebKit) %endif -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(openssl) -%if %{with qt5} -Conflicts: qupzilla -%endif %description -QupZilla is modern web browser based on WebKit core and Qt Framework. -WebKit guarante fast browsing and Qt availability on all major platforms. +QupZilla is a modern web browser based on Qt Framework. + +%package gnome-keyring +Summary: GNOME keyring plugin for QupZilla +Group: Productivity/Networking/Web/Browsers +Requires: %{name} = %{version} +Supplements: packageand(%{name}:gnome-keyring) +# qupzilla-qt5-gnome-keyring was last seen in openSUSE Leap 42.1. +Provides: %{name}-qt5-gnome-keyring = %{version} +Obsoletes: %{name}-qt5-gnome-keyring < %{version} + +%description gnome-keyring +Plugin for QupZilla browser that allows to store passwords in +GNOME Keyring. -%if 0%{?suse_version} > 1310 || !0%{with qt5} %package kwallet -Summary: Kwallet plugin for qupzilla +Summary: Kwallet plugin for QupZilla Group: Productivity/Networking/Web/Browsers Requires: %{name} = %{version} -%if %{with qt5} +# qupzilla-qt5-kwallet was last seen in openSUSE Leap 42.1. +Provides: %{name}-qt5-kwallet = %{version} +Obsoletes: %{name}-qt5-kwallet < %{version} +%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) Requires: kwalletd5 -Supplements: packageand(%{name};plasma5-workspace) +Supplements: packageand(%{name}:plasma5-workspace) %else Requires: kdebase4-runtime -Supplements: packageand(%{name};kdebase4-workspace) -%endif -%if %{with qt5} -Conflicts: qupzilla-kwallet +Supplements: packageand(%{name}:kdebase4-workspace) %endif %description kwallet -Kwallet plugin for QupZilla browser which allows to store passwords in kwallet. - -%package gnome-keyring -Summary: Gnome keyring plugin for qupzilla -Group: Productivity/Networking/Web/Browsers -Requires: %{name} = %{version} -%if %{with qt5} -Conflicts: qupzilla-gnome-keyring -%endif - -%description gnome-keyring -Gnome keyring plugin for QupZilla browser which allows to store passwords in -gnome keyring. -%endif +Plugin for QupZilla browser that allows to store passwords in +KWallet. %prep %setup -q -n QupZilla-%{version} -# Remove BUILDTIME usage from build. -sed -i '/BUILDTIME;^/d' src/lib/app/qzcommon.h -sed -i '/BUILDTIME = /d' src/lib/app/qzcommon.cpp -sed -i '/Qz::BUILDTIME/d' src/lib/other/aboutdialog.cpp -sed -i '/Qz::BUILDTIME/d' src/lib/app/commandlineoptions.cpp -sed -i '/Qz::BUILDTIME/d' src/lib/app/qzcommon.cpp -sed -i '/Qz::BUILDTIME/d' src/lib/network/schemehandlers/qupzillaschemehandler.cpp -%if %{with qt5} -# Adjust KWallet include for KF5 library -sed -i 's|<KDE/KWallet/Wallet>|<KWallet>|g' src/plugins/KWalletPasswords/kwalletpasswordbackend.h -%endif -# QupZilla defaults +# Remove __DATE__ and __TIME__. +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" +DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" +TIME="\"$(date -d "${modified}" "+%%R")\"" +find . -type f -regex '.*\.\(h\|c\|cpp\)' | xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" + +# QupZilla defaults. %patch0 -p1 -# openSUSE icons -cp {%{SOURCE1},%{SOURCE2}} src/lib/data/icons/sites/ -cp %{SOURCE3} src/lib/data/data/ +# openSUSE icons. +cp -f %{SOURCE2} %{SOURCE3} src/lib/data/icons/sites/ +cp -f %{SOURCE4} src/lib/data/data/ %build export USE_WEBGL=true -%if 0%{?suse_version} > 1310 || !0%{with qt5} -# Enable better KDE integration, it is also needed for KWallet plugin. -export KDE_INTEGRATION=true # Enable GNOME Keyring support. export GNOME_INTEGRATION=true -%endif +# Enable better KDE integration, it is also needed for KWallet plugin. +export KDE_INTEGRATION=true # Set proper LIBPATH. export USE_LIBPATH=%{_libdir} -%if !0%{with qt5} +%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) +%qmake5 \ + CONFIG-=gdb_dwarf_index +%else # Debug config is needed for -debuginfo and -debugsource packages. %{_libdir}/qt4/bin/qmake \ QMAKE_CFLAGS="%{optflags}" \ QMAKE_CXXFLAGS="%{optflags}" \ CONFIG+=debug \ CONFIG-=gdb_dwarf_index -%else -%qmake5 CONFIG-=gdb_dwarf_index %endif make %{?_smp_mflags} %install +%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) +%qmake5_install +%else make INSTALL_ROOT=%{buildroot} install -# FIXME: split library into separate package and build also -devel with libqupzilla.so ??? +%endif + +# FIXME: Split library into a separate package and also create qupzilla-devel with libqupzilla.so ??? rm -vf %{buildroot}%{_libdir}/libQupZilla.so -# We don't need a test plugin which does nothing. -rm -vf %{buildroot}%{_libdir}/qupzilla/libTestPlugin.so -# End -%suse_update_desktop_file qupzilla -%fdupes -s %{buildroot}%{_datadir} +# We don't need a test plugin that does nothing. +rm -vf %{buildroot}%{_libdir}/%{name}/libTestPlugin.so -%post -p /sbin/ldconfig +%suse_update_desktop_file %{name} +%fdupes %{buildroot}%{_datadir}/ -%postun -p /sbin/ldconfig +%post +%desktop_database_post +%icon_theme_cache_post +/sbin/ldconfig + +%postun +%desktop_database_postun +%icon_theme_cache_postun +/sbin/ldconfig %files %defattr(-,root,root) -%doc AUTHORS COPYRIGHT FAQ GPLv3 -%{_bindir}/qupzilla +%doc AUTHORS CHANGELOG COPYRIGHT FAQ GPLv3 +%{_bindir}/%{name} %{_libdir}/libQupZilla.so.* -%dir %{_libdir}/qupzilla/ -%{_libdir}/qupzilla/libAccessKeysNavigation.so -%{_libdir}/qupzilla/libAutoScroll.so -%{_libdir}/qupzilla/libMouseGestures.so -%{_libdir}/qupzilla/libGreaseMonkey.so -%{_libdir}/qupzilla/libFlashCookieManager.so -%{_libdir}/qupzilla/libPIM.so -%{_libdir}/qupzilla/libStatusBarIcons.so -%{_libdir}/qupzilla/libTabManager.so -%{_datadir}/appdata/ -%{_datadir}/applications/qupzilla.desktop -%{_datadir}/pixmaps/qupzilla.png -%{_datadir}/icons/hicolor/ -%{_datadir}/qupzilla/ +%{_libdir}/%{name}/ +%exclude %{_libdir}/%{name}/libKWalletPasswords.so +%exclude %{_libdir}/%{name}/libGnomeKeyringPasswords.so +%{_datadir}/%{name}/ +%dir %{_datadir}/appdata/ +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/pixmaps/%{name}.png %{_datadir}/bash-completion/ -%if 0%{?suse_version} > 1310 || !0%{with qt5} -%files kwallet +%files gnome-keyring %defattr(-,root,root) -%{_libdir}/qupzilla/libKWalletPasswords.so +%{_libdir}/%{name}/libGnomeKeyringPasswords.so -%files gnome-keyring +%files kwallet %defattr(-,root,root) -%{_libdir}/qupzilla/libGnomeKeyringPasswords.so -%endif +%{_libdir}/%{name}/libKWalletPasswords.so %changelog ++++++ QupZilla-1.8.7.tar.xz -> QupZilla-1.8.8.tar.xz ++++++ ++++ 2855 lines of diff (skipped)
