packages: calibre/calibre.spec - more adjustements - another unsupported lo...

[lisu]

Author: lisu                         Date: Wed Jun 29 09:38:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more adjustements
- another unsupported locale
- builds and runs, rel 2

---- Files affected:
packages/calibre:
   calibre.spec (1.93 -> 1.94) 

---- Diffs:

================================================================
Index: packages/calibre/calibre.spec
diff -u packages/calibre/calibre.spec:1.93 packages/calibre/calibre.spec:1.94
--- packages/calibre/calibre.spec:1.93	Wed Jun 29 11:00:13 2011
+++ packages/calibre/calibre.spec	Wed Jun 29 11:38:18 2011
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Konwerter oraz biblioteka dla e-booków
 Name:		calibre
 Version:	0.8.7
-Release:	0.1
+Release:	2
 License:	GPL v3+
 Group:		Applications/Multimedia
 Source0:	%{name}-%{version}-nofonts.tar.xz
@@ -110,9 +110,11 @@
 %patch4 -p1
 %patch5 -p1
 
+# upstream decides to store locale files in a single zip file but we prefer separate .mo
 mkdir resources/localization/locales
 unzip resources/localization/locales.zip -d resources/localization/locales
 chmod 755 resources/localization/locales/*
+rm -f resources/localization/locales.zip
 
 %build
 %{__python} setup.py build
@@ -133,6 +135,12 @@
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/localization/locales $RPM_BUILD_ROOT%{_datadir}/locale
 
 # set proper filenames for locales (TODO: switch to patch if possible)
+for file in $RPM_BUILD_ROOT%{_datadir}/locale/*; do
+	lang=$(echo $file|%{__sed} 's:.*locale/\(.*\).*:\1:')
+	mkdir $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES
+	mv $RPM_BUILD_ROOT%{_datadir}/locale/$lang/*.mo \
+	$RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES
+done;
 for file in $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/messages.mo; do
 	lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/LC_MESSAGES.*:\1:')
 	mv $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/messages.mo \
@@ -143,22 +151,21 @@
 	mv $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/iso639.mo \
 	$RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/%{name}_iso639.mo
 done;
-for file in $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/qt.qm; do
-	lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/LC_MESSAGES.*:\1:')
-	mv $file $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/%{name}.$lang.qm
-done;
 
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/%{name}-uninstall
 
 # unsupported
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ltg
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/en_AU
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
 
+%find_lang %{name} --all-name
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc Changelog.yaml COPYRIGHT README
 %attr(755,root,root) %{_bindir}/calibre
@@ -196,6 +203,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2011/06/29 09:38:18  lisu
+- more adjustements
+- another unsupported locale
+- builds and runs, rel 2
+
 Revision 1.93  2011/06/29 09:00:13  lisu
 - revert to separated .mo files
 - rel 0.1 needs test
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/calibre/calibre.spec?r1=1.93&r2=1.94&f=u