From cfbd0a89f404740809075201995431006e1aac48c0cf3071c1705a00fb8dcde6 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sun, 17 May 2015 11:06:35 +0000 Subject: [PATCH] Accepting request 307566 from home:DarkSS - Updated to 0.1.1: https://github.com/zealdocs/zeal/releases - Added %desktop_database_post(un) & %icon_theme_cache_post(un). - Added zeal-no-date-and-time.diff vs. file-contains-current-date. - Qt >= 5.2.0 became required so oS <= 13.1 became unsupported. OBS-URL: https://build.opensuse.org/request/show/307566 OBS-URL: https://build.opensuse.org/package/show/devel:tools/zeal?expand=0&rev=4 --- 20141123.tar.gz | 3 --- v0.1.1.tar.gz | 3 +++ zeal-no-date-and-time.diff | 11 +++++++++ zeal.changes | 31 ++++++++++++++++++++++++ zeal.spec | 49 +++++++++++++++++--------------------- 5 files changed, 67 insertions(+), 30 deletions(-) delete mode 100644 20141123.tar.gz create mode 100644 v0.1.1.tar.gz create mode 100644 zeal-no-date-and-time.diff diff --git a/20141123.tar.gz b/20141123.tar.gz deleted file mode 100644 index 48d147c..0000000 --- a/20141123.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbe2e1d7dfaaad9a399eb78932464d4bd3d1da80cd0751fca897264437b6dd5d -size 1063661 diff --git a/v0.1.1.tar.gz b/v0.1.1.tar.gz new file mode 100644 index 0000000..75516c1 --- /dev/null +++ b/v0.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4e959f9bc66a6e350ee8a33d34695379633432d103db9776c0c7a76cbc5a9d6 +size 914203 diff --git a/zeal-no-date-and-time.diff b/zeal-no-date-and-time.diff new file mode 100644 index 0000000..b78ad2c --- /dev/null +++ b/zeal-no-date-and-time.diff @@ -0,0 +1,11 @@ +--- src/ui/aboutdialog.cpp.orig 2015-04-20 02:08:52.000000000 +0300 ++++ src/ui/aboutdialog.cpp 2015-05-17 12:38:56.587979680 +0300 +@@ -11,7 +11,7 @@ + + const QString buildInfo + = QString(tr("Version: %1
Built: %2")) +- .arg(QCoreApplication::applicationVersion(), QString("%1 %2").arg(__DATE__, __TIME__)); ++ .arg(QCoreApplication::applicationVersion(), QString("%1").arg("via openSUSE Build Service")); + + ui->buildInfoLabel->setText(buildInfo); + ui->buttonBox->setFocus(Qt::OtherFocusReason); diff --git a/zeal.changes b/zeal.changes index 1097708..36200e1 100644 --- a/zeal.changes +++ b/zeal.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Sun May 17 09:31:15 UTC 2015 - dap.darkness@gmail.com + +- Updated to 0.1.1: + * Display a message box about in case old docset storage is found + * Follow a new versioning scheme. (#203) + * Added support for Dash protocols dash: and dash-plugin: + on Linux and Windows. (#247) + * Revamped settings dialogue with more intuitive options. + * Added a build option for portable mode ( qmake + CONFIG+=portable ). In this case settings are stored in + zeal.ini next to the Zeal executable, and docset storage path + defaults to docsets subdirectory. Changing docset storage + path via the settings dialogue has only temporary effect, and + it is not saved on application exit. It is still possible to + set a permanent custom path by manually editing zeal.ini . + * Zeal now relies on its own server for obtaining docset list, + rather than parsing Dash website. + * Now the docset list is cached for 24 hours, + but can be manually reloaded. (#287) + * Implemented version check function + ( Help -> Check for Update... ). (#282) + * Improved display of docset download/unpack progress. (#252) + * Now the main window of the running Zeal instance is brought up + on attempt to start the app again. (#187) + * Provided MSI installer for Windows users. (#279) + * bugfixes, see more at https://github.com/zealdocs/zeal/releases +- Added %desktop_database_post(un) & %icon_theme_cache_post(un). +- Added zeal-no-date-and-time.diff vs. file-contains-current-date. +- Qt >= 5.2.0 became required so oS <= 13.1 became unsupported. + ------------------------------------------------------------------- Thu Jan 8 20:24:24 UTC 2015 - dap.darkness@gmail.com diff --git a/zeal.spec b/zeal.spec index 60eb15e..18cfb83 100644 --- a/zeal.spec +++ b/zeal.spec @@ -1,7 +1,7 @@ # # spec file for package zeal # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,37 +16,27 @@ # -%define gittag 20141123 - Name: zeal Summary: Offline API documentation browser -Version: 0.0+git.2014.11.23 +Version: 0.1.1 Release: 0 License: GPL-3.0 URL: http://zealdocs.org Group: Development/Tools/Other -Source0: https://github.com/jkozera/zeal/archive/%{gittag}.tar.gz +Source0: https://github.com/zealdocs/zeal/archive/v%{version}.tar.gz +# PATCH-FIX-OPENSUSE vs. file-contains-current-date WARNING: +Patch0: zeal-no-date-and-time.diff BuildRequires: fdupes -%if 0%{?suse_version} > 1310 -BuildRequires: libQt5Gui-private-headers-devel -%else -BuildRequires: libqt5-qtbase-private-headers-devel -%endif +BuildRequires: libQt5Gui-private-headers-devel >= 5.2.0 BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5WebKitWidgets) -BuildRequires: pkgconfig(Qt5Xml) -%if 0%{?suse_version} > 1310 +BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 +BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 BuildRequires: pkgconfig(appindicator-0.1) -%endif -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(xcb-keysyms) -%if 0%{?suse_version} >= 1320 -Requires: libQt5Sql5-sqlite -%else -Requires: libqt5-sql-sqlite -%endif +Requires: libQt5Sql5-sqlite >= 5.2.0 %description Zeal is a simple offline API documentation browser inspired by Dash @@ -59,13 +49,11 @@ Zeal is a simple offline API documentation browser inspired by Dash Editor plugins for details. %prep -%setup -q -n %{name}-%{gittag}/%{name} +%setup -q +%patch0 %build qmake-qt5 \ -%if 0%{?suse_version} <= 1310 - "CONFIG+=no_libappindicator" \ -%endif QMAKE_STRIP="" \ QMAKE_CFLAGS+="%{optflags}" \ QMAKE_CXXFLAGS+="%{optflags}" @@ -77,12 +65,19 @@ make V=1 INSTALL_ROOT=%{buildroot} install %suse_update_desktop_file -r %{name} Office Viewer %fdupes -s %{buildroot}%{_datadir} +%post +%desktop_database_post +%icon_theme_cache_post + +%postun +%desktop_database_postun +%icon_theme_cache_postun + %files %defattr(-,root,root,-) -%doc ../COPYING ../README.md +%doc COPYING README.md %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}* -%{_datadir}/pixmaps/%{name} %changelog