[git-cola] Fix installation of translations

Kevin Kofler kkofler at fedoraproject.org
Mon Jan 3 01:26:30 UTC 2011


commit df2cd230cb9a02c9a94e5248cacd71d3789496a0
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Jan 3 02:26:05 2011 +0100

    Fix installation of translations

 cola-1.4.3-translations.patch |   18 ++++++++++++++++++
 git-cola.spec                 |    9 +++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/cola-1.4.3-translations.patch b/cola-1.4.3-translations.patch
new file mode 100644
index 0000000..c04a385
--- /dev/null
+++ b/cola-1.4.3-translations.patch
@@ -0,0 +1,18 @@
+diff -ur cola-1.4.3/setup.py cola-1.4.3-translations/setup.py
+--- cola-1.4.3/setup.py	2010-12-28 04:03:25.000000000 +0100
++++ cola-1.4.3-translations/setup.py	2011-01-03 02:21:01.000000000 +0100
+@@ -95,12 +95,13 @@
+             _app_path('share/git-cola/styles/images', '*.png'),
+             _app_path('share/applications', '*.desktop'),
+             _app_path('share/doc/git-cola', '*.txt'),
+-            _app_path('share/locale', '*/LC_MESSAGES/git-cola.mo'),
+             _package('cola'),
+             _package('cola.models'),
+             _package('cola.controllers'),
+             _package('cola.views')]
+ 
++    data.extend([_app_path(localedir, 'git-cola.mo') for localedir in glob('share/locale/*/LC_MESSAGES')])
++
+     if not standalone:
+         data.extend([_thirdparty_package('jsonpickle'),
+                      _thirdparty_package('simplejson')])
diff --git a/git-cola.spec b/git-cola.spec
index 7b3f203..20023a6 100644
--- a/git-cola.spec
+++ b/git-cola.spec
@@ -9,6 +9,8 @@ Group:          Development/Tools
 License:        GPLv2+
 URL:            http://cola.tuxfamily.org/
 Source0:        http://cola.tuxfamily.org/releases/cola-%{version}.tar.gz
+# fix installation of translations
+Patch0:         cola-1.4.3-translations.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,6 +35,7 @@ sugary flavour and caffeine-inspired features.
 
 %prep
 %setup -q -n cola-%{version}
+%patch0 -p1 -b .translations
 
 
 %build
@@ -47,6 +50,7 @@ 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
+%find_lang git-cola
 
 
 %clean
@@ -61,7 +65,7 @@ update-desktop-database &> /dev/null || :
 update-desktop-database &> /dev/null || :
 
 
-%files
+%files -f git-cola.lang
 %defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE README
 %{_bindir}/git-cola
@@ -73,10 +77,11 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
-* Sun Jan 02 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.4.3-1
+* Mon Jan 03 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.4.3-1
 - Update to 1.4.3, fixes broken Actions widget
 - Drop docpath patch, fixed upstream
 - Drop obsolete conditional for Fedora <= 11
+- Fix installation of translations
 
 * Fri Jul 30 2010 Thomas Spura <tomspur at fedoraproject.org> - 1.4.1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild


More information about the scm-commits mailing list