rpms/git-cola/F-11 git-cola.spec,1.6,1.7 sources,1.5,1.6
Ben Boeckel
mathstuf at fedoraproject.org
Mon Jul 20 14:39:58 UTC 2009
- Previous message (by thread): rpms/rubygem-activeldap/devel .cvsignore, 1.6, 1.7 rubygem-activeldap.spec, 1.8, 1.9 sources, 1.6, 1.7
- Next message (by thread): rpms/libgweather/devel 01_gettext_not_xml.patch, NONE, 1.1 libgweather.spec, 1.41, 1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mathstuf
Update of /cvs/pkgs/rpms/git-cola/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17361
Modified Files:
git-cola.spec sources
Log Message:
Update to 1.3.8
Index: git-cola.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/F-11/git-cola.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- git-cola.spec 23 Mar 2009 05:07:23 -0000 1.6
+++ git-cola.spec 20 Jul 2009 14:39:28 -0000 1.7
@@ -3,7 +3,7 @@
%{!?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.6
+Version: 1.3.8
Release: 1%{?dist}
Summary: A highly caffeinated git gui
@@ -18,10 +18,11 @@ BuildRequires: desktop-file-utils
BuildRequires: python-devel
BuildRequires: PyQt4-devel
BuildRequires: asciidoc
-BuildRequires: git-core
+BuildRequires: git
BuildRequires: gettext
BuildRequires: xmlto
-Requires: git-core
+BuildRequires: python-sphinx
+Requires: git
Requires: PyQt4
Requires: python-inotify
@@ -64,18 +65,25 @@ update-desktop-database &> /dev/null ||
%defattr(-,root,root,-)
%doc COPYRIGHT LICENSE README
%{_bindir}/git-cola
+%if 0%{?fedora} < 12
%{_bindir}/git-difftool
-%{_bindir}/git-difftool-helper
+%{_bindir}/git-difftool--helper
+%endif
%{_datadir}/applications/cola.desktop
-%{_datadir}/cola
-%{_docdir}/cola
+%{_datadir}/git-cola
+%{_docdir}/git-cola
%{_mandir}/man1/git-cola.1.gz
-%{_mandir}/man1/git-difftool.1.gz
# For noarch packages: sitelib
%{python_sitelib}/*
%changelog
+* Sun May 24 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.8-1
+- Update to 1.3.8
+- Fix changelog usage of %%
+- BR and R on git instead of git-core
+- Add conditionals on git-difftool
+
* Mon Mar 23 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.6-1
- Update to 1.3.6
@@ -83,7 +91,7 @@ update-desktop-database &> /dev/null ||
- Update to 1.3.5.42
* Sat Feb 28 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.5.28-1
-- Added %post and %postun
+- 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 23 Mar 2009 05:07:23 -0000 1.5
+++ sources 20 Jul 2009 14:39:28 -0000 1.6
@@ -1,2 +1 @@
-befeb8e4bc1e97b2bd02755047579e63 cola-1.3.5.42-src.tar.gz
-148fef205b2b52fbde1fafc64b540183 cola-1.3.6-src.tar.gz
+a3f4617049d2c32c31e2918f0264dbb8 cola-1.3.8-src.tar.gz
- Previous message (by thread): rpms/rubygem-activeldap/devel .cvsignore, 1.6, 1.7 rubygem-activeldap.spec, 1.8, 1.9 sources, 1.6, 1.7
- Next message (by thread): rpms/libgweather/devel 01_gettext_not_xml.patch, NONE, 1.1 libgweather.spec, 1.41, 1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list