rpms/git-cola/F-9 git-cola-shebang.patch, 1.1, 1.2 git-cola.spec, 1.2, 1.3 sources, 1.2, 1.3

[Ben Boeckel]

Author: mathstuf

Update of /cvs/pkgs/rpms/git-cola/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29809

Modified Files:
	git-cola-shebang.patch git-cola.spec sources 
Log Message:
Update to 1.3.5.28, fix %post/%postun, and use desktop-file-install, add BR on desktop-file-utils

git-cola-shebang.patch:

Index: git-cola-shebang.patch
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/F-9/git-cola-shebang.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-cola-shebang.patch	6 Feb 2009 15:40:35 -0000	1.1
+++ git-cola-shebang.patch	28 Feb 2009 20:14:34 -0000	1.2
@@ -18,16 +18,6 @@
  
  import os
  from PyQt4.QtGui import QDialog
-diff -r -U 5 cola/controllers/__init__.py cola/controllers/__init__.py
---- cola/controllers/__init__.py	2009-01-22 03:48:56.000000000 -0500
-+++ cola/controllers/__init__.py	2009-02-05 11:27:42.000000000 -0500
-@@ -1,6 +1,5 @@
--#!/usr/bin/env python
- """This module provides access to the application controllers."""
- 
- import os
- import sys
- import time
 diff -r -U 5 cola/controllers/merge.py cola/controllers/merge.py
 --- cola/controllers/merge.py	2009-01-22 03:48:56.000000000 -0500
 +++ cola/controllers/merge.py	2009-02-05 11:27:36.000000000 -0500
@@ -83,11 +73,11 @@
 +++ cola/model.py	2009-02-05 11:27:47.000000000 -0500
 @@ -1,6 +1,5 @@
 -#!/usr/bin/env python
- # Copyright (c) 2008 David Aguilar
- """This module provides the Model class, an observable and serializable
- data model.
+ # Copyright (c) 2009 David Aguilar
+ """
+ This module provides the Model class, a generic, serializable
+ data container.
  """
- 
 diff -r -U 5 cola/observer.py cola/observer.py
 --- cola/observer.py	2009-01-22 03:48:56.000000000 -0500
 +++ cola/observer.py	2009-02-05 11:27:25.000000000 -0500
@@ -117,7 +107,7 @@
  """This handles saving complex settings such as bookmarks, etc.
  """
  
- HAS_SIMPLEJSON = False
+ import os
 diff -r -U 5 cola/utils.py cola/utils.py
 --- cola/utils.py	2009-01-22 03:48:56.000000000 -0500
 +++ cola/utils.py	2009-02-05 11:27:09.000000000 -0500


Index: git-cola.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/F-9/git-cola.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git-cola.spec	9 Feb 2009 18:38:48 -0000	1.2
+++ git-cola.spec	28 Feb 2009 20:14:34 -0000	1.3
@@ -3,14 +3,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           git-cola
-Version:        1.3.5
-Release:        4%{?dist}
+Version:        1.3.5.28
+Release:        1%{?dist}.1
 Summary:        A highly caffeinated git gui
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://cola.tuxfamily.org/
 Source0:        http://cola.tuxfamily.org/releases/cola-%{version}-src.tar.gz
+## Upstream patches
+# Accepted (target 1.3.6)
 Patch99:        git-cola-shebang.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,6 +23,7 @@
 BuildRequires:  git-core
 BuildRequires:  gettext
 BuildRequires:  xmlto
+BuildRequires:  desktop-file-utils
 Requires:       git-core
 Requires:       PyQt4
 Requires:       python-inotify
@@ -43,14 +46,24 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot} --prefix=%{_prefix}
+rm -f %{buildroot}%{_datadir}/applications/cola.desktop
+desktop-file-install --delete-original --dir %{buildroot}%{_datadir}/applications share/applications/cola.desktop
 make DESTDIR=%{buildroot} prefix=%{_prefix} install-doc
 make DESTDIR=%{buildroot} prefix=%{_prefix} install-html
 
- 
+
 %clean
 rm -rf %{buildroot}
 
 
+%post
+update-desktop-database &> /dev/null || :
+
+
+%postun
+update-desktop-database &> /dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE README
@@ -67,6 +80,16 @@
 
 
 %changelog
+* Sat Feb 28 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.5.28-1.fc10.1
+- Add BR on desktop-file-utils
+
+* Sat Feb 28 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.5.28-1
+- Added %post and %postun
+- Use desktop-file-install
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Feb 9 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.5-4
 - Added missing Requires on PyQt4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Feb 2009 15:40:35 -0000	1.2
+++ sources	28 Feb 2009 20:14:34 -0000	1.3
@@ -1 +1 @@
-5d3b3c0177f6dc7937eebcbbbafc6bcd  cola-1.3.5-src.tar.gz
+3ae77c4daa45e5deec249d5ec27efd34  cola-1.3.5.28-src.tar.gz