Hello community, here is the log from the commit of package git-cola for openSUSE:Factory checked in at 2016-11-28 15:07:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-cola (Old) and /work/SRC/openSUSE:Factory/.git-cola.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-cola" Changes: -------- --- /work/SRC/openSUSE:Factory/git-cola/git-cola.changes 2016-09-01 14:03:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git-cola.new/git-cola.changes 2016-11-28 15:07:35.000000000 +0100 @@ -1,0 +2,64 @@ +Thu Nov 24 19:48:03 UTC 2016 - [email protected] + +- improve appdata.patch install rules with upstream collaborators + +------------------------------------------------------------------- +Wed Nov 23 10:19:15 UTC 2016 - [email protected] + +- Update to 2.9 +- Usability, bells and whistles +* New Polish translation thanks to Łukasz Wojniłowicz + https://github.com/git-cola/git-cola/pull/598 +* The Bypass Commit Hooks feature now disables itself automatically when a new commit is created. The new behavior turns the option into a single-use flag, which helps prevent users from accidentally leaving it active longer than intended. + https://github.com/git-cola/git-cola/pull/595 +* git dag learned to launch an external diff viewer on selected commits. The standard Ctrl+D shortcut can be used to view diffs. + https://github.com/git-cola/git-cola/issues/468 +* git dag learned to launch directory diffs via git difftool –dir-diff. The Ctrl+Shift+D shortcut launches difftool in directory-diff mode. + https://github.com/git-cola/git-cola/issues/468 +* Items in the “Favorites” list can now be renamed, which makes it easier to differentiate between several checkouts of the same repository. + https://github.com/git-cola/git-cola/issues/599 + https://github.com/git-cola/git-cola/pull/601 +* The startup screen now includes a logo and git cola version information. + https://github.com/git-cola/git-cola/issues/526 +* The About page was revamped to contain multiple tabs. A new tab was added that provides details about git cola‘’s dependencies. New tabs were also added for giving credit to git cola‘s authors and translators. +* The About page can now be accessed via git cola about. +* The “Fast-forward only” and “No fast-forward” options supported by git pull are now accessible via git cola pull. +* Doing a forced push no longer requires selecting the remote branch. + https://github.com/git-cola/git-cola/pull/618 +* git cola push now has an option to suppress the prompt that is shown when pushing would create new remote branches. + https://github.com/git-cola/git-cola/issues/605 +* git dag now shows commit messages in a more readable color. + https://github.com/git-cola/git-cola/issues/574 +* git cola browse and the status widget learned to launch the OS-specified default action for a file. When used on directories via git cola browse, or when “Open Parent Directory” is used on files, the OS-specified file browser will typically be used. +git cola browse and the status widget learned to launch terminals. +- Fixes +* git cola browse was not updating when expanding items. + https://github.com/git-cola/git-cola/issues/588 +* Typofixes in comments, naming, and strings have been applied. + https://github.com/git-cola/git-cola/pull/593 +* The inotify and win32 filesystem monitoring no longer refreshes when updates are made to ignored files. + https://github.com/git-cola/git-cola/issues/517 + https://github.com/git-cola/git-cola/issues/516 +* The Refresh button on the actions panel no longer raises an exception when using PyQt5. + https://github.com/git-cola/git-cola/issues/604 +* Fixed a typo in the inotify backend that is triggered when files are removed. + https://github.com/git-cola/git-cola/issues/607 +* Fixed a typo when recovering from a failed attempt to open a repository. + https://github.com/git-cola/git-cola/issues/606 +* git dag now properly updates itself when launched from the menubar. + https://github.com/git-cola/git-cola/pull/613 +* If git-cola is invoked on Windows using start pythonw git-cola, a console window will briefly flash on the screen each time git cola invokes git. The console window is now suppressed. +* We now avoid some problematic Popen flags on Windows which were breaking the git rebase feature on Windows. +* The Save button in git dag‘s “Grab File...” feature now properly prompts for a filename when saving files. + https://github.com/git-cola/git-cola/pull/617 +- Development +* The qtpy symlink in the source tree has been removed to allow for easier development on Windows. + https://github.com/git-cola/git-cola/issues/626 + +------------------------------------------------------------------- +Sun Nov 20 19:49:55 UTC 2016 - [email protected] + +- install man pages +- add appdata.patch for en.opensuse.org/openSUSE:AppStore + +------------------------------------------------------------------- Old: ---- _service v2.8.tar.gz New: ---- appdata.patch v2.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-cola.spec ++++++ --- /var/tmp/diff_new_pack.Dy2HKy/_old 2016-11-28 15:07:36.000000000 +0100 +++ /var/tmp/diff_new_pack.Dy2HKy/_new 2016-11-28 15:07:36.000000000 +0100 @@ -18,9 +18,9 @@ Name: git-cola -Version: 2.8 +Version: 2.9 Release: 0 -Summary: Sleek and powerful git GUI +Summary: Sleek and powerful Git GUI License: GPL-2.0+ Group: Development/Tools/Version Control Url: http://git-cola.github.io/ @@ -28,9 +28,13 @@ %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} Source: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz +# PATCH-FEATURE-UPSTREAM https://github.com/git-cola/git-cola/pull/627 +Patch1: appdata.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: dos2unix BuildRequires: git-core BuildRequires: python +BuildRequires: python-Sphinx BuildRequires: python-devel BuildRequires: python-pyinotify BuildRequires: python-qt4 @@ -47,16 +51,21 @@ %endif %description -git-cola is a simple, powerful, and feature-rich GUI for git +git-cola is a simple, powerful, and feature-rich GUI for Git that provides an easy way to interact with Git repositories. %prep %setup -q +%patch1 -p1 %build +dos2unix extras/qtpy/qtpy/py3compat.py %install %makeinstall prefix=%{_prefix} DESTDIR=%{buildroot} + +make install-man prefix=%{_prefix} DESTDIR=%{buildroot} + %suse_update_desktop_file %{buildroot}%{_datadir}/applications/git-cola.desktop %suse_update_desktop_file %{buildroot}%{_datadir}/applications/git-dag.desktop %suse_update_desktop_file %{buildroot}%{_datadir}/applications/git-cola-folder-handler.desktop @@ -82,5 +91,9 @@ %if 0%{?sles_version} > 9 %{_datadir}/locale/zh_cn %endif +%dir %{_datadir}/appdata/ +%{_datadir}/appdata/git-cola.appdata.xml +%{_datadir}/appdata/git-dag.appdata.xml +%{_mandir}/man1/*.* %changelog ++++++ appdata.patch ++++++ >From 11abd56df43fe78c6a99e86aacb72aaeebdf9839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 20 Nov 2016 20:25:26 +0100 Subject: [PATCH] Add appdata.xml files. --- Makefile | 3 +++ share/appdata/git-cola.appdata.xml | 19 +++++++++++++++++++ share/appdata/git-dag.appdata.xml | 8 ++++++++ 3 files changed, 30 insertions(+) create mode 100644 share/appdata/git-cola.appdata.xml create mode 100644 share/appdata/git-dag.appdata.xml diff --git a/Makefile b/Makefile index bb929bb..4e83234 100644 --- a/Makefile +++ b/Makefile @@ -133,6 +133,8 @@ uninstall: $(RM) $(DESTDIR)$(prefix)/share/applications/git-cola.desktop $(RM) $(DESTDIR)$(prefix)/share/applications/git-cola-folder-handler.desktop $(RM) $(DESTDIR)$(prefix)/share/applications/git-dag.desktop + $(RM) $(DESTDIR)$(prefix)/share/appdata/git-dag.appdata.xml + $(RM) $(DESTDIR)$(prefix)/share/appdata/git-cola.appdata.xml $(RM) $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps/git-cola.svg $(RM_R) $(DESTDIR)$(prefix)/share/git-cola $(RM_R) $(DESTDIR)$(prefix)/share/doc/git-cola @@ -142,6 +144,7 @@ uninstall: -$(RMDIR) $(DESTDIR)$(prefix)/share/locale 2>/dev/null -$(RMDIR) $(DESTDIR)$(prefix)/share/doc 2>/dev/null -$(RMDIR) $(DESTDIR)$(prefix)/share/applications 2>/dev/null + -$(RMDIR) $(DESTDIR)$(prefix)/share/appdata 2>/dev/null -$(RMDIR) $(DESTDIR)$(prefix)/share 2>/dev/null -$(RMDIR) $(DESTDIR)$(prefix)/bin 2>/dev/null -$(RMDIR) $(DESTDIR)$(prefix) 2>/dev/null diff --git a/share/appdata/git-cola.appdata.xml b/share/appdata/git-cola.appdata.xml new file mode 100644 index 0000000..7836897 --- /dev/null +++ b/share/appdata/git-cola.appdata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop"> + <id>git-cola.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0</project_license> + <name>Git Cola</name> + <summary>Sleek and powerful git GUI</summary> + <description> + <p> + git-cola is a simple, powerful, and feature-rich GUI for git that provides an easy way to interact with Git repositories. + </p> + </description> + <screenshots> + <screenshot type="default"> + <image>https://git-cola.github.io/images/screenshot-main-linux.png</image> + </screenshot> + </screenshots> + <url type="homepage">https://git-cola.github.io/</url> +</component> diff --git a/share/appdata/git-dag.appdata.xml b/share/appdata/git-dag.appdata.xml new file mode 100644 index 0000000..0357e0e --- /dev/null +++ b/share/appdata/git-dag.appdata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop"> + <metadata_license>CC0-1.0</metadata_license> + <id>git-dag.desktop</id> + <metadata> + <value key="X-Merge-With-Parent">git-cola.desktop</value> + </metadata> +</component> >From e95dbe2e5ec4ccf5e89235667d1d91b5a6776474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EF=BC=B6=E5=AD=97=E9=BE=8D?= <[email protected]> Date: Thu, 24 Nov 2016 19:20:43 +0800 Subject: [PATCH] Add appdata.xml files. (cont.) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ｖ字龍 <[email protected]> --- setup.py | 1 + share/appdata/git-cola.appdata.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9500e2e..7e5c4c4 100755 --- a/setup.py +++ b/setup.py @@ -67,6 +67,7 @@ def cola_data_files(vendor_libs): _app_path('share/git-cola/bin', '*'), _app_path('share/git-cola/icons', '*.png'), _app_path('share/git-cola/icons', '*.svg'), + _app_path('share/appdata', '*.xml'), _app_path('share/applications', '*.desktop'), _app_path('share/doc/git-cola', '*.rst'), _app_path('share/doc/git-cola', '*.html'), diff --git a/share/appdata/git-cola.appdata.xml b/share/appdata/git-cola.appdata.xml index 7836897..3eadc7a 100644 --- a/share/appdata/git-cola.appdata.xml +++ b/share/appdata/git-cola.appdata.xml @@ -4,7 +4,7 @@ <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-2.0</project_license> <name>Git Cola</name> - <summary>Sleek and powerful git GUI</summary> + <summary>Sleek and powerful Git GUI</summary> <description> <p> git-cola is a simple, powerful, and feature-rich GUI for git that provides an easy way to interact with Git repositories. ++++++ v2.8.tar.gz -> v2.9.tar.gz ++++++ ++++ 29473 lines of diff (skipped)
