- remaining pl, use find_lang

Changed files:
    claws-mail-extra-plugins.spec -> 1.3

diff --git a/claws-mail-extra-plugins.spec b/claws-mail-extra-plugins.spec
index 887974d963575921e4e05bdbfa63231de3af3eab..bf364e774395c744cc97e024fbe16c20e1ead665 100644 (file)
--- a/claws-mail-extra-plugins.spec
+++ b/claws-mail-extra-plugins.spec
@@ -3,7 +3,7 @@
 #              -remove *others package
 
 Summary:       Plugins for sylpheed-claws (Metapackage)
-Summary(pl):   Wtyczki dla sylpheed-claws (Metapaczka)
+Summary(pl):   Wtyczki dla sylpheed-claws (metapakiet)
 Name:          sylpheed-claws-extra-plugins
 Version:       2.2.0
 Release:       1
@@ -12,22 +12,24 @@ Group:              Applications
 Source0:       http://dl.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.gz
 # Source0-md5: 0e305f70bdfcb7968846d20f42da561f
 URL:           http://claws.sylpheed.org/plugins.php
-BuildRequires: sylpheed-claws-devel >= 2.1.0
 BuildRequires: libgtkhtml-devel
-BuildRequires: synce-libsynce-devel
+BuildRequires: sylpheed-claws-devel >= 2.1.0
 BuildRequires: synce-librapi2-devel
+BuildRequires: synce-libsynce-devel
 Requires:      sylpheed-claws >= 2.1.0
-Requires:      sylpheed-claws-plugin-maildir >= %{version}
-Requires:      sylpheed-claws-plugin-gtkhtml2_viewer >= %{version}
-Requires:      sylpheed-claws-plugin-smime >= %{version}
-Requires:      sylpheed-claws-plugin-others >= %{version}
+Requires:      sylpheed-claws-plugin-gtkhtml2_viewer = %{version}-%{release}
+Requires:      sylpheed-claws-plugin-maildir = %{version}-%{release}
+Requires:      sylpheed-claws-plugin-smime = %{version}-%{release}
+Requires:      sylpheed-claws-plugin-others = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _plugins_dir    %{_libdir}/sylpheed-claws/plugins
+
 %description
-Plugins for sylpheed-claws
+Plugins for sylpheed-claws (metapackage).
 
 %description -l pl
-Wtyczki dla sylpheed-claws
+Wtyczki dla sylpheed-claws (metapakiet).
 
 %package -n sylpheed-claws-plugin-gtkhtml2_viewer
 Summary:       gtkhtml2_viewer plugin for sylpheed-claws
@@ -38,7 +40,7 @@ Group:                X11/Applications/Networking
 Renders HTML mail using the gtkhtml2 rendering widget.
 
 %description -n sylpheed-claws-plugin-gtkhtml2_viewer -l pl
-Wy¶wietla maile HTML u¿ywaj±c widgetia gtkhtml2.
+Wy¶wietla maile HTML u¿ywaj±c widgeta gtkhtml2.
 
 %package -n sylpheed-claws-plugin-maildir
 Summary:       Maildir++ Plugin for Sylpheed-Claws
@@ -68,7 +70,7 @@ decrypt mails, verify signatures or sign and encrypt your own mails.
 
 %description -n sylpheed-claws-plugin-smime -l pl
 Ta wtyczka obs³uguje podpisan± i/lub zaszyfrowan± pocztê S/MIME.
-Mo¿esz rozszyfrowywaæ, weryfikowaæ lub podpisywaæ i szyfrowaæ w³asn±
+Pozwala rozszyfrowywaæ, weryfikowaæ lub podpisywaæ i szyfrowaæ w³asn±
 pocztê.
 
 %package -n sylpheed-claws-plugin-others
@@ -79,7 +81,8 @@ Group:                X11/Applications/Networking
 %description -n sylpheed-claws-plugin-others
 Few plugins for sylpheed-claws.
 
-%define        _plugins_dir    %{_libdir}/sylpheed-claws/plugins
+%description -n sylpheed-claws-plugin-others -l pl
+Kilka dodatkowych wtyczek dla sylpheed-claws.
 
 %prep
 %setup -q
@@ -89,33 +92,34 @@ for i in `find * -maxdepth 0 -type d -print`; do
        cd "$i"
        %configure
        %{__make}
-       cd ../
+       cd ..
 done
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-
 for i in `find * -maxdepth 0 -type d -print`; do
-       cd "$i"
-       %{__make} install \
+       %{__make} -C "$i" install \
                DESTDIR=$RPM_BUILD_ROOT
-       cd ../
 done
 
+%find_lang gtkhtml2_viewer
+
+%find_lang acpi_notifier
+%find_lang rssyl
+%find_lang vcalendar
+cat acpi_notifier.lang rssyl.lang vcalendar.lang > others.lang
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 
-%files -n sylpheed-claws-plugin-gtkhtml2_viewer
+%files -n sylpheed-claws-plugin-gtkhtml2_viewer -f gtkhtml2_viewer.lang
 %defattr(644,root,root,755)
 %doc maildir-*/ChangeLog maildir-*/README
 %attr(755,root,root) %{_plugins_dir}/gtkhtml2_viewer.so
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
 
 %files -n sylpheed-claws-plugin-maildir
 %defattr(644,root,root,755)
@@ -127,19 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc smime-*/ChangeLog smime-*/README
 %attr(755,root,root) %{_plugins_dir}/smime.so
 
-%files -n sylpheed-claws-plugin-others
+%files -n sylpheed-claws-plugin-others -f others.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_plugins_dir}/acpi_notifier.so
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/acpi_notifier.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/acpi_notifier.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/acpi_notifier.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/acpi_notifier.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/acpi_notifier.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/acpi_notifier.mo
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/acpi_notifier.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/acpi_notifier.mo
 %attr(755,root,root) %{_plugins_dir}/att_remover.so
 %attr(755,root,root) %{_plugins_dir}/cachesaver.so
 %attr(755,root,root) %{_plugins_dir}/etpan-privacy.so
@@ -150,26 +144,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_plugins_dir}/notification_plugin.so
 %attr(755,root,root) %{_plugins_dir}/perl_plugin.so
 %attr(755,root,root) %{_plugins_dir}/rssyl.so
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/rssyl.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/rssyl.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/rssyl.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/rssyl.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/rssyl.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/rssyl.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/rssyl.mo
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/rssyl.mo
 %attr(755,root,root) %{_plugins_dir}/synce_plugin.so
 %attr(755,root,root) %{_plugins_dir}/vcalendar.so
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/vcalendar.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/vcalendar.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/vcalendar.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/vcalendar.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/vcalendar.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/vcalendar.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/vcalendar.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/vcalendar.mo