[packages/git-cola] up to 2.3

[glen]

commit 3972a72e89ff6c90ff79e8146534fe4daa584170
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Feb 22 23:18:55 2016 +0200

    up to 2.3
    
    resynced from fedora repo, 27dba58

 git-cola-shebang.patch | 16 ----------
 git-cola.spec          | 79 +++++++++++++++++++++++---------------------------
 2 files changed, 37 insertions(+), 58 deletions(-)
---
diff --git a/git-cola.spec b/git-cola.spec
index b2cfb66..b635d6a 100644
--- a/git-cola.spec
+++ b/git-cola.spec
@@ -1,73 +1,68 @@
-Summary:	A highly caffeinated git gui
+Summary:	A sleek and powerful git GUI
 Name:		git-cola
-Version:	1.3.7.60
+Version:	2.3
 Release:	1
 License:	GPL v2+
+Source0:	https://github.com/git-cola/git-cola/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	0f3c5355eda07e752d1f8f536882a2d0
 Group:		Development/Tools
-Source0:	http://cola.tuxfamily.org/releases/cola-%{version}-src.tar.gz
-# Source0-md5:	b7bd6c8a4410be84d885bf7debd49aab
-Patch0:		%{name}-shebang.patch
-URL:		http://cola.tuxfamily.org/
-BuildRequires:	asciidoc
-BuildRequires:	docbook-dtd45-xml
-BuildRequires:	gettext-devel
-BuildRequires:	git-core
-BuildRequires:	python-PyQt4
+URL:		http://git-cola.github.io/
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	git-core >= 1.5.2
 BuildRequires:	python-devel
-BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
+BuildRequires:	sip-PyQt4 >= 4.3
+BuildRequires:	sphinx-pdg
 BuildRequires:	xmlto
+Requires:	PyQt4 >= 4.3
 Requires:	git-core >= 1.5.2
-Requires:	python >= 1:2.4
-Requires:	python-PyQt4 >= 4.3
+Requires:	hicolor-icon-theme
+Requires:	python-inotify
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-A sweet, carbonated git gui known for its sugary flavour and
-caffeine-inspired features.
+git-cola is a powerful git GUI with a slick and intuitive user
+interface.
 
 %prep
-%setup -q -n cola-%{version}
-%patch0 -p0
+%setup -q
 
 %build
-export INSTALL_GIT_DIFFTOOL=1
-%{__python} setup.py build
+%{__make}
 %{__make} doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 \
-	--skip-build \
-	--root $RPM_BUILD_ROOT \
-	--prefix=%{_prefix}
-
-%{__make} install-doc install-html \
+%{__make} install install-doc install-html \
+	prefix=%{_prefix} \
 	DESTDIR=$RPM_BUILD_ROOT \
-	prefix=%{_prefix}
 
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_postclean
+%find_lang %{name}
+
+desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/git-cola-folder-handler.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/git-cola.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/git-dag.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database > /dev/null 2>&1 || :
+%update_desktop_database
+%update_icon_cache hicolor
 
 %postun
-update-desktop-database > /dev/null 2>&1 || :
+%update_desktop_database
+%update_icon_cache hicolor
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc COPYRIGHT LICENSE README
-%attr(755,root,root) %{_bindir}/git-cola
-%attr(755,root,root) %{_bindir}/git-difftool
-%attr(755,root,root) %{_bindir}/git-difftool--helper
-%{_desktopdir}/cola.desktop
-%{_datadir}/git-cola
-%{_docdir}/git-cola
-%{_mandir}/man1/git-cola.1*
-%{py_sitescriptdir}/*.egg-info
+%doc COPYING COPYRIGHT README.md
+%attr(755,root,root) %{_bindir}/cola
+%attr(755,root,root) %{_bindir}/git-*
+%{_desktopdir}/git*.desktop
+%{_datadir}/%{name}/
+%{_iconsdir}/hicolor/scalable/apps/%{name}.svg
+%{_docdir}/%{name}/
+%{_mandir}/man1/git*.1*
diff --git a/git-cola-shebang.patch b/git-cola-shebang.patch
deleted file mode 100644
index a4cfd17..0000000
--- a/git-cola-shebang.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- bin/difftool/git-difftool~	2009-05-11 05:05:57.000000000 +0200
-+++ bin/difftool/git-difftool	2009-05-31 11:40:47.304899717 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- # Copyright (c) 2009 David Aguilar
- #
- # This is a wrapper around the GIT_EXTERNAL_DIFF-compatible
---- bin/git-cola~	2009-05-11 05:05:57.000000000 +0200
-+++ bin/git-cola	2009-05-31 11:40:12.081294820 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- # -*- python-mode -*-
- """Takes care of starting the main function
- """
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/git-cola.git/commitdiff/0f29fba12528ef79ab4f55f298b7edea9c3ae794