Author: sparky Date: Thu Dec 17 20:39:23 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fix build without qt4: .qm translations belong to qt UI
- BRequire gtk+2-devel only if building with gtk enabled
---- Files affected:
packages/avidemux:
avidemux.spec (1.77 -> 1.78)
---- Diffs:
================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.77
packages/avidemux/avidemux.spec:1.78
--- packages/avidemux/avidemux.spec:1.77 Thu Dec 17 21:05:28 2009
+++ packages/avidemux/avidemux.spec Thu Dec 17 21:39:18 2009
@@ -54,7 +54,7 @@
BuildRequires: ffmpeg-devel
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 1:2.6.0
+%{?with_gtk:BuildRequires: gtk+2-devel >= 1:2.6.0}
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: js-devel(threads)
BuildRequires: lame-libs-devel
@@ -167,6 +167,7 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_bindir},%{_mandir}/man1}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
@@ -302,21 +303,6 @@
%{_datadir}/ADM_scripts
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/i18n
-%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(s...@latin) %{_datadir}/%{name}/i18n/*[email protected]
-%lang(tr) %{_datadir}/%{name}/i18n/*_tr.qm
-%lang(zh_TW) %{_datadir}/%{name}/i18n/*_zh_TW.qm
%if %{with gtk}
%files ui-gtk
@@ -362,6 +348,22 @@
%attr(755,root,root)
%{_libdir}/ADM_plugins/videoFilter/libADM_vf_mpdelogo_qt4.so
%attr(755,root,root)
%{_libdir}/ADM_plugins/videoFilter/libADM_vf_mplayerResize_qt4.so
%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_sub_qt4.so
+
+%dir %{_datadir}/%{name}/i18n
+%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(s...@latin) %{_datadir}/%{name}/i18n/*[email protected]
+%lang(tr) %{_datadir}/%{name}/i18n/*_tr.qm
+%lang(zh_TW) %{_datadir}/%{name}/i18n/*_zh_TW.qm
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -370,6 +372,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.78 2009/12/17 20:39:18 sparky
+- fix build without qt4: .qm translations belong to qt UI
+- BRequire gtk+2-devel only if building with gtk enabled
+
Revision 1.77 2009/12/17 20:05:28 glen
- simplify plugins building (idea from archlinux), no need for -L patch anymore
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/avidemux.spec?r1=1.77&r2=1.78&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
