commit flamerobin for openSUSE:Factory
Hello community, here is the log from the commit of package flamerobin for openSUSE:Factory checked in at 2016-09-30 15:34:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flamerobin (Old) and /work/SRC/openSUSE:Factory/.flamerobin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flamerobin" Changes: -------- --- /work/SRC/openSUSE:Factory/flamerobin/flamerobin.changes 2015-07-05 18:03:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.flamerobin.new/flamerobin.changes 2016-09-30 15:35:14.000000000 +0200 @@ -1,0 +2,32 @@ +Thu Sep 29 00:19:02 UTC 2016 - badshah400@gmail.com + +- Update to version 0.9.3.1: + + New templating system allows you to add you own SQL statement + templates to the menu + + BLOB editor + + Extended dialog with SQL statement history makes it easier to + search + + View dependencies are resolved properly for Firebird 2.5 + + Fixed statistics for UPDATE OR INSERT statements + + DataGrid: implemented Copy as IN list + + DataGrid: Fixed keyboard navigation + + Added new context menu options + + Fixed error messages when different character set is used in + statements + + Warn when closing SQL editor with active transactions + + Ability to refresh list of objects in the main tree + + Fixed bug with quoted identifier when altering column type + + Generate change script is now available for columns as well + + Fixed truncating of Unicode characters with Firebird 1.5 +- Update required version of wxwidgets to >= 3.0. +- Drop flamerobin-0.9.2-wxWindowListNode.patch; fixed upstream. +- Use github tagged tarball for source; update %setup accordingly. +- Add flamerobin-desktop-file.patch to remove hardcoded reference + to location of icon file. +- Extract hicolor icons of all possible sizes from bundled icns + file and install them to hicolor icon dir; adds BuildRequires + on icns-utils, hicolor-icon-theme; run + %icon_theme_cache_post(un) post(un) scriptlets. +- Sed to fix a trailing ';' issue in .desktop file. + +------------------------------------------------------------------- Old: ---- flamerobin-0.9.2-src.tar.gz flamerobin-0.9.2-wxWindowListNode.patch New: ---- 0.9.3.1.tar.gz flamerobin-desktop-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flamerobin.spec ++++++ --- /var/tmp/diff_new_pack.iKGkgc/_old 2016-09-30 15:35:15.000000000 +0200 +++ /var/tmp/diff_new_pack.iKGkgc/_new 2016-09-30 15:35:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package flamerobin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -19,19 +19,22 @@ %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires Name: flamerobin -Version: 0.9.2 +Version: 0.9.3.1 Release: 0 Summary: Graphical client for Firebird License: MIT and LGPL-2.1+ Group: Productivity/Databases/Tools Url: http://www.flamerobin.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz -Patch0: flamerobin-0.9.2-wxWindowListNode.patch +Source0: https://github.com/mariuz/flamerobin/archive/%{version}.tar.gz +# PATCH-FIX-UPSTREAM flamerobin-desktop-file.patch gh#mariuz/flamerobin#5 badshah400@gmail.com -- Unhardcode icon path in GNU/Linux laucher; patch taken from upstream git +Patch0: flamerobin-desktop-file.patch +BuildRequires: boost-devel BuildRequires: desktop-file-utils BuildRequires: gcc-c++ +BuildRequires: icns-utils BuildRequires: libfbclient2-devel >= 2.0.0.12748 BuildRequires: update-desktop-files -BuildRequires: wxWidgets-devel >= 2.8 +BuildRequires: wxWidgets-devel >= 3.0 Requires(post): update-desktop-files Requires(postun): update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,10 +44,13 @@ toolkit. %prep -%setup -q -n %{name}-%{version}-src -%patch0 +%setup -q +%patch0 -p1 %build +# FIX A TRAILING SEMICOLON ISSUE FOR KEYWORDS TAG IN .desktop FILE +sed -i "s/^Keywords=firebird/Keywords=firebird;/" res/%{name}.desktop + export CFLAGS="%{optflags} -fpermissive" export CXXFLAGS="$CFLAGS" %configure @@ -52,18 +58,26 @@ %install make DESTDIR=%{buildroot} install %{?_smp_mflags} -rm -f %{buildroot}/%{_datadir}/pixmaps/%{name}.png -cp -f ./res/%{name}.xpm %{buildroot}/%{_datadir}/%{name}/%{name}.xpm -sed "s@Categories=Development;Database;GTK@Categories=System;Database;@" -i %{buildroot}/%{_datadir}/applications/%{name}.desktop -sed "s@Icon=%{_datadir}/pixmaps/flamerobin.png@Icon=%{_datadir}/%{name}/%{name}.xpm@" -i %{buildroot}/%{_datadir}/applications/%{name}.desktop -mv %{buildroot}%{_datadir}/applications/%{name}.desktop $RPM_SOURCE_DIR/%{name}.desktop -%suse_update_desktop_file -i -n %{name} System Database + +%suse_update_desktop_file -r %{name} Office Database rm -rf %{buildroot}%{_datadir}/%{name}/docs +# INSTALL HICOLOR ICONS EXTRACTED FROM ICNS FILE +pushd res +icns2png -x -d 32 flamerobin.icns +for sz in 16 32 48 128 +do + install -Dm0644 flamerobin_${sz}x${sz}x32.png %{buildroot}%{_datadir}/icons/hicolor/${sz}x${sz}/apps/%{name}.png +done +popd +rm %{buildroot}%{_datadir}/pixmaps/*.png + %post +%icon_theme_cache_post %desktop_database_post %postun +%icon_theme_cache_postun %desktop_database_postun %files @@ -73,5 +87,6 @@ %{_bindir}/%{name} %{_datadir}/applications/* %{_datadir}/%{name} +%{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog ++++++ flamerobin-0.9.2-src.tar.gz -> 0.9.3.1.tar.gz ++++++ ++++ 128632 lines of diff (skipped) ++++++ flamerobin-desktop-file.patch ++++++
From d7c55b7dad45534e439e44b6a92a43d5bbe5b5b5 Mon Sep 17 00:00:00 2001 From: Vincent Bermel
Date: Mon, 9 May 2016 01:29:55 +0200 Subject: [PATCH] Unhardcode icon path in GNU/Linux laucher
--- res/flamerobin.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/flamerobin.desktop b/res/flamerobin.desktop index 082bdcc..8282d2e 100644 --- a/res/flamerobin.desktop +++ b/res/flamerobin.desktop @@ -3,7 +3,7 @@ Name=FlameRobin GenericName=Database administration tool Comment=Administration Tool for Firebird DBMS Exec=flamerobin -Icon=/usr/share/pixmaps/flamerobin.png +Icon=flamerobin Type=Application Terminal=false Categories=Development;Database;GTK
participants (1)
-
root@hilbert.suse.de