rpms/git-cola/F-12 .cvsignore, 1.7, 1.8 git-cola.spec, 1.10, 1.11 sources, 1.7, 1.8

[Ben Boeckel]

Author: mathstuf

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

Modified Files:
	.cvsignore git-cola.spec sources 
Log Message:
Update to 1.4.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	28 Aug 2009 23:58:23 -0000	1.7
+++ .cvsignore	6 Feb 2010 20:50:40 -0000	1.8
@@ -1 +1 @@
-cola-1.3.9.14-src.tar.gz
+cola-1.4.1.2.tar.gz


Index: git-cola.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/F-12/git-cola.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- git-cola.spec	28 Aug 2009 23:58:23 -0000	1.10
+++ git-cola.spec	6 Feb 2010 20:50:40 -0000	1.11
@@ -1,15 +1,14 @@
 %{!?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.9.14
-Release:        1%{?dist}
+Version:        1.4.1.2
+Release:        2%{?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
+Source0:        http://cola.tuxfamily.org/releases/cola-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,24 +23,26 @@ BuildRequires:  python-sphinx
 Requires:       git
 Requires:       PyQt4
 Requires:       python-inotify
+Requires:       python-simplejson
+Requires:       python-jsonpickle
 
 %description
 A sweet, carbonated git gui known for its
 sugary flavour and caffeine-inspired features.
 
+
 %prep
 %setup -q -n cola-%{version}
 
 
 %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}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot} --prefix=%{_prefix} --standalone
 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
@@ -72,10 +73,29 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/git-cola
 %{_docdir}/git-cola
 %{_mandir}/man1/git-cola.1.gz
-%{python_sitelib}/*
+%{python_sitelib}/git_cola-*
 
 
 %changelog
+* Mon Jan 25 2010 Ben Boeckel <MathStuf at gmail.com> - 1.4.1.2-2
+- Fix %%files list
+
+* Sun Jan 24 2010 Ben Boeckel <MathStuf at gmail.com> - 1.4.1.2-1
+- Update to 1.4.1.2
+
+* Thu Dec 10 2009 Ben Boeckel <MathStuf at gmail.com> - 1.4.1-1
+- Update to 1.4.1
+
+* Tue Nov 17 2009 Ben Boeckel <MathStuf at gmail.com> 1.4.0.5-1
+- Update to 1.4.0.5
+
+* Mon Nov 02 2009 Ben Boeckel <MathStuf at gmail.com> 1.4.0.1-1
+- Update to 1.4.0.1
+- Add patch to not ship simplejson
+
+* Sat Oct 24 2009 Ben Boeckel <MathStuf at gmail.com> 1.4.0-1
+- Update to 1.4.0
+
 * Fri Aug 28 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.9.14-1
 - Update to 1.3.9.14
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Aug 2009 23:58:23 -0000	1.7
+++ sources	6 Feb 2010 20:50:40 -0000	1.8
@@ -1 +1 @@
-8f94cd347e97a0c8315a98f0d23e2192  cola-1.3.9.14-src.tar.gz
+dd0edcc7ceceb585a298d17cfd4bc575  cola-1.4.1.2.tar.gz