rpms/git-cola/devel git-cola-shebang.patch, NONE, 1.1 git-cola.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Ben Boeckel]

Author: mathstuf

Update of /cvs/pkgs/rpms/git-cola/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1260

Modified Files:
	.cvsignore sources 
Added Files:
	git-cola-shebang.patch git-cola.spec 
Log Message:
Initial build

git-cola-shebang.patch:

--- NEW FILE git-cola-shebang.patch ---
diff -r -U 5 cola/controllers/bookmark.py cola/controllers/bookmark.py
--- cola/controllers/bookmark.py	2009-01-22 03:48:56.000000000 -0500
+++ cola/controllers/bookmark.py	2009-02-05 11:27:20.000000000 -0500
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 """This controller handles the bookmarks dialog."""
 
 import os
 import sys
 
diff -r -U 5 cola/controllers/createbranch.py cola/controllers/createbranch.py
--- cola/controllers/createbranch.py	2009-01-22 03:48:56.000000000 -0500
+++ cola/controllers/createbranch.py	2009-02-05 11:27:50.000000000 -0500
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 """This controller handles the create branch dialog."""
 
 
 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
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 """This controller handles the merge dialog."""
 
 
 from PyQt4.Qt import Qt
 
diff -r -U 5 cola/controllers/repobrowser.py cola/controllers/repobrowser.py
--- cola/controllers/repobrowser.py	2009-01-22 03:48:56.000000000 -0500
+++ cola/controllers/repobrowser.py	2009-02-05 11:27:14.000000000 -0500
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 """This controller handles the repository file browser."""
 
 
 import os
 from PyQt4.QtGui import QDialog
diff -r -U 5 cola/controllers/search.py cola/controllers/search.py
--- cola/controllers/search.py	2009-01-22 03:48:56.000000000 -0500
+++ cola/controllers/search.py	2009-02-05 11:27:39.000000000 -0500
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 """This controller handles the search dialog."""
 
 
 import os
 import re
diff -r -U 5 cola/controllers/util.py cola/controllers/util.py
--- cola/controllers/util.py	2009-01-22 03:48:56.000000000 -0500
+++ cola/controllers/util.py	2009-02-05 11:27:29.000000000 -0500
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 """This module provides utility controllers.
 """
 
 
 import os
diff -r -U 5 cola/inotify.py cola/inotify.py
--- cola/inotify.py	2009-01-22 03:48:56.000000000 -0500
+++ cola/inotify.py	2009-02-05 11:27:17.000000000 -0500
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 # Copyright (c) 2008 David Aguilar
 """This module provides an inotify plugin for Linux and other systems
 which provide the pyinotify module.
 
 """
diff -r -U 5 cola/model.py cola/model.py
--- cola/model.py	2009-01-22 03:48:56.000000000 -0500
+++ 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.
 """
 
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
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 # Copyright (c) 2008 David Aguilar
 """This module provides the Observer design pattern.
 """
 
 class Observer(object):
diff -r -U 5 cola/qobserver.py cola/qobserver.py
--- cola/qobserver.py	2009-01-22 03:48:56.000000000 -0500
+++ cola/qobserver.py	2009-02-05 11:27:04.000000000 -0500
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 # Copyright (c) 2008 David Aguilar
 """This module provides the QObserver class which allows for simple
 correspondancies between model parameters and Qt widgets.
 
 The QObserver class handles receiving notifications from
diff -r -U 5 cola/settings.py cola/settings.py
--- cola/settings.py	2009-01-22 03:48:56.000000000 -0500
+++ cola/settings.py	2009-02-05 11:27:44.000000000 -0500
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 # Copyright (c) 2008 David Aguilar
 """This handles saving complex settings such as bookmarks, etc.
 """
 
 HAS_SIMPLEJSON = False
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
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 # Copyright (c) 2008 David Aguilar
 """This module provides miscellaneous utility functions."""
 
 import os
 import re
diff -r -U 5 cola/views/syntax.py cola/views/syntax.py
--- cola/views/syntax.py	2009-01-22 03:48:56.000000000 -0500
+++ cola/views/syntax.py	2009-02-05 11:27:33.000000000 -0500
@@ -1,6 +1,5 @@
-#!/usr/bin/python
 # Copyright (c) 2008 David Aguilar
 """This module provides SyntaxHighlighter classes.
 These classes are installed onto specific cola widgets and
 implement the diff syntax highlighting.
 


--- NEW FILE git-cola.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?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:        3%{?dist}
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
Patch99:        git-cola-shebang.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  PyQt4-devel
BuildRequires:  asciidoc
BuildRequires:  git-core
BuildRequires:  gettext
BuildRequires:  xmlto
Requires:       git-core
Requires:       python-inotify

%description
A sweet, carbonated git gui known for its
sugary flavour and caffeine-inspired features.

%prep
%setup -q -n cola-%{version}
%patch99


%build
# Remove CFLAGS=... for noarch packages (unneeded)
%{__python} setup.py build
make doc


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot} --prefix=%{_prefix}
make DESTDIR=%{buildroot} prefix=%{_prefix} install-doc
make DESTDIR=%{buildroot} prefix=%{_prefix} install-html

 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYRIGHT LICENSE README
%{_bindir}/git-cola
%{_bindir}/git-difftool
%{_bindir}/git-difftool-helper
%{_datadir}/applications/cola.desktop
%{_datadir}/cola
%{_docdir}/cola
%{_mandir}/man1/git-cola.1.gz
%{_mandir}/man1/git-difftool.1.gz
# For noarch packages: sitelib
%{python_sitelib}/*


%changelog
* Thu Feb 5 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.5-3
- Added patch for shebang line removal

* Thu Feb 5 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.5-2
- Add missing BRs

* Sun Feb 1 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.5-1
- Update for 1.3.5

* Thu Jan 8 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.4.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Feb 2009 03:01:07 -0000	1.1
+++ .cvsignore	6 Feb 2009 15:22:12 -0000	1.2
@@ -0,0 +1 @@
+cola-1.3.5-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Feb 2009 03:01:07 -0000	1.1
+++ sources	6 Feb 2009 15:22:12 -0000	1.2
@@ -0,0 +1 @@
+5d3b3c0177f6dc7937eebcbbbafc6bcd  cola-1.3.5-src.tar.gz