packages (DEVEL): avidemux/avidemux.spec, avidemux/qtlocale.patch (NEW) - q...

[glen]

Author: glen                         Date: Wed Dec 16 19:07:13 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- qtlocale patch from atrpms

---- Files affected:
packages/avidemux:
   avidemux.spec (1.71.2.5 -> 1.71.2.6) , qtlocale.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.71.2.5 packages/avidemux/avidemux.spec:1.71.2.6
--- packages/avidemux/avidemux.spec:1.71.2.5	Wed Dec 16 17:16:44 2009
+++ packages/avidemux/avidemux.spec	Wed Dec 16 20:07:08 2009
@@ -9,7 +9,6 @@
 # - the bconds don't work with cmake, all gets enabled if BR found
 # - Could not find Gettext -- libintl not required for gettext support
 # - fix lib64 libdir install
-# - i18n in /usr/bin/i18n
 # - fix plugin scan dir: Scanning directory /usr/lib/ADM_plugins/audioDecoder/
 #
 # Conditional build:
@@ -23,13 +22,13 @@
 %define		with_sse3	1
 %endif
 
-%define		qt4_version	4.2
+%define		qt4_version	4.3
 
 Summary:	A small audio/video editing software for Linux
 Summary(pl.UTF-8):	Mały edytor audio/wideo dla Linuksa
 Name:		avidemux
 Version:	2.5.1
-Release:	0.2
+Release:	0.3
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 Source0:	http://dl.sourceforge.net/avidemux/%{name}_%{version}.tar.gz
@@ -37,7 +36,7 @@
 Source1:	%{name}.desktop
 Patch0:		gcc44.patch
 Patch1:		types.patch
-#Patch0:	%{name}-autoconf.patch
+Patch2:		qtlocale.patch
 #Patch1:	%{name}-dts_internal.patch
 #Patch2:	%{name}-sparc64.patch
 URL:		http://fixounet.free.fr/avidemux/
@@ -85,13 +84,10 @@
 
 %prep
 %setup -q -n %{name}_%{version}
-#%patch0 -p1
-#%patch1 -p0
-#%patch2 -p1
-
-find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' -o -name '*.cmake' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 echo 'pt_BR' >> po/LINGUAS
 
@@ -151,6 +147,20 @@
 %attr(755,root,root) %{_libdir}/libADM_render_gtk.so
 %{?with_qt4:%attr(755,root,root) %{_libdir}/libADM_render_qt4.so}
 %attr(755,root,root) %{_libdir}/libADM_smjs.so
+%lang(ca) %{_datadir}/%{name}/i18n/*_ca.qm
+%lang(cs) %{_datadir}/%{name}/i18n/*_cs.qm
+%lang(de) %{_datadir}/%{name}/i18n/*_de.qm
+%lang(el) %{_datadir}/%{name}/i18n/*_el.qm
+%lang(es) %{_datadir}/%{name}/i18n/*_es.qm
+%lang(fr) %{_datadir}/%{name}/i18n/*_fr.qm
+%lang(it) %{_datadir}/%{name}/i18n/*_it.qm
+%lang(ja) %{_datadir}/%{name}/i18n/*_ja.qm
+%lang(pt_BR) %{_datadir}/%{name}/i18n/*_pt_BR.qm
+%lang(ru) %{_datadir}/%{name}/i18n/*_ru.qm
+%lang(sr) %{_datadir}/%{name}/i18n/*_sr.qm
+%lang(sr at latin) %{_datadir}/%{name}/i18n/*_sr at latin.qm
+%lang(tr) %{_datadir}/%{name}/i18n/*_tr.qm
+%lang(zh_TW) %{_datadir}/%{name}/i18n/*_zh_TW.qm
 %{_datadir}/ADM_scripts
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*.png
@@ -161,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71.2.6  2009/12/16 19:07:08  glen
+- qtlocale patch from atrpms
+
 Revision 1.71.2.5  2009/12/16 16:16:44  glen
 - up to 2.5.1
 

================================================================
Index: packages/avidemux/qtlocale.patch
diff -u /dev/null packages/avidemux/qtlocale.patch:1.1.2.1
--- /dev/null	Wed Dec 16 20:07:13 2009
+++ packages/avidemux/qtlocale.patch	Wed Dec 16 20:07:08 2009
@@ -0,0 +1,47 @@
+--- avidemux_2.5.0/cmake/Ts.cmake.qtlocale	2008-03-11 19:21:46.000000000 +0100
++++ avidemux_2.5.0/cmake/Ts.cmake	2009-07-18 19:44:50.000000000 +0200
+@@ -64,7 +64,7 @@
+                 
+             SET(qm_files ${qm_files} ${_outXml} ${_out})
+ 
+-			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
++			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
+         ENDFOREACH(ts_input ${ts_files})
+ 
+         SET(${_sources} ${${_sources}} ${qm_files})
+@@ -95,7 +95,7 @@
+                 
+             SET(qm_files ${qm_files} ${_out})
+ 
+-			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
++			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
+         ENDFOREACH(ts_input ${ts_files})
+ 
+         SET(${_sources} ${${_sources}} ${qm_files})
+--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp.qtlocale	2008-10-01 15:49:39.000000000 +0200
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2009-07-18 19:51:36.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <Carbon/Carbon.h>
+ #endif
+ #include <QtGui/QPaintEngine>
++//#include "../../config.h"  // for ADMLOCALE with CMake
+ 
+ #include "ADM_inttype.h"
+ #include "ADM_files.h"
+@@ -73,7 +74,8 @@
+ #ifdef __APPLE__
+ 	QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";
+ #else
+-	QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
++//	QString appdir = ADMLOCALE;
++	QString appdir = "/usr/share/avidemux/i18n/";
+ #endif
+ 
+ 	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
+@@ -164,4 +165,4 @@
+ 	}
+ 
+ 	return "Qt";
+-}
+\ No newline at end of file
++}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/avidemux.spec?r1=1.71.2.5&r2=1.71.2.6&f=u