- merge trnslations from Kondara and KSI,

- minor changes in %install.

Changed files:
    gdm.spec -> 1.64
    gdm2.20.spec -> 1.64

diff --git a/gdm.spec b/gdm.spec
index 059845a61fd0eba677124d40c60f5b821675cb75..0437aed15a960759013745aaa37843eabd2b3a32 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,7 +1,10 @@
 Summary:       GNOME Display Manager
 Summary(es):   Administrador de Entrada del GNOME
+Summary(ja):   GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
 Summary(pl):   gdm
 Summary(pt_BR):        Gerenciador de Entrada do GNOME
+Summary(ru):   äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
+Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
 Version:       2.2.5.4
 Release:       7
@@ -23,12 +26,11 @@ BuildRequires:      gdk-pixbuf-devel
 BuildRequires: gettext-devel
 BuildRequires: gnome-libs-devel
 BuildRequires: gtk+-devel
+BuildRequires: intltool >= 0.14
 BuildRequires: libglade-gnome-devel
-BuildRequires: libtool
 BuildRequires: libxml-devel
 BuildRequires: perl-modules
 BuildRequires: scrollkeeper
-BuildRequires: intltool >= 0.14
 Requires:      gnome-libs >= 1.0.0
 Requires:      which
 Requires:      /usr/X11R6/bin/sessreg
@@ -37,8 +39,8 @@ Requires(pre):        /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(postun):      /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
-Requires(post,postun): scrollkeeper
-Requires(post,preun):  /sbin/chkconfig
+Requires(post,postun):scrollkeeper
+Requires(post,preun):/sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     xdm kdm wdm
 
@@ -60,6 +62,14 @@ several different X sessions on your local machine at the same time.
 %description -l es
 Administrador de Entrada del GNOME.
 
+%description -l ja
+Gdm (the GNOME Display Manager) ¤Ï¡¢¹âÅÙ¤ËÀßÄê²Äǽ¤Ê xdm X Display
+Manager ¤ÎºÆ¼ÂÁõÈǤǤ¹¡£ Gdm ¤ò»È¤¦¤È¡¢ X Window System
+¤¬Æ°¤¤¤Æ¤¤¤ë¤¢¤Ê¤¿¤Î
+¥·¥¹¥Æ¥à¤Ë¤¤¤í¤¤¤í¤Ê¥»¥Ã¥·¥ç¥ó¤òÁªÂò¤·¤Æ¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+
+¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î Gdm ¤Ç¤Ï¡¢³Æ¼ï¸À¸ì¤ä¡¢XIM ¤òÁªÂò¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
+
 %description -l pl
 Gdm jest wysokokonfigurowaln± reimplementacj± xdma. Gdm pozwala
 logowaæ siê do systemu z poziomu X11 i wspiera jednoczesn± pracê kilku
@@ -68,6 +78,16 @@ r
 %description -l pt_BR
 Gerenciador de Entrada do GNOME.
 
+%description -l ru
+GDM (GNOME Display Manager) - ÜÔÏ ÒÅÉÍÐÌÅÍÅÎÔÁÃÉÑ xdm (X Display
+Manager). GDM ÐÏÚ×ÏÌÑÅÔ ×ÁÍ ×ÈÏÄÉÔØ × ÓÉÓÔÅÍÕ, ÎÁ ËÏÔÏÒÏÊ ÚÁÐÕÝÅÎÏ X
+Window É ÐÏÄÄÅÒÖÉ×ÁÅÔ ÒÁÂÏÔÕ ÎÅÓËÏÌØÕÉÈ ÒÁÚÎÙÈ X ÓÅÁÎÓÏ× ÏÄÎÏ×ÒÅÍÅÎÎÏ.
+
+%description -l uk
+GDM (GNOME Display Manager) - ÃÅ ÒŦÍÐÌÅÍÅÎÔÁÃ¦Ñ xdm (X Display
+Manager). GDM ÄÏÚ×ÏÌѤ ×ÁÍ ×ÈÏÄÉÔÉ × ÓÉÓÔÅÍÕ, ÎÁ ÑË¦Ê ÚÁÐÕÝÅÎÏ X
+Window ÔÁ ЦÄÔÒÉÍÕ¤ ÒÏÂÏÔÕ Ë¦ÌØËÏÈ Ò¦ÚÎÉÈ X ÓÅÁÎÓ¦× ÏÄÎÏÞÁÓÎÏ.
+
 %package Xnest
 Summary:       Xnest (ie embedded X) server for GDM
 Summary(pl):   Serwer Xnest dla GDM
@@ -91,6 +111,7 @@ Ten pakiet dodaje do gdm wsparcie dla Xnest.
 rm -f missing
 %{__libtoolize}
 %{__gettextize}
+intltoolize --copy --force
 aclocal -I %{_aclocaldir}/gnome
 %{__autoconf}
 %{__automake}
@@ -108,6 +129,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
+       PAM_PREFIX=/etc \
        Settingsdir=%{_applnkdir}/Settings/GNOME \
        Systemdir=%{_applnkdir}/System \
        omf_dest_dir=%{_omf_dest_dir}/%{name}
@@ -115,7 +137,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/gdm.conf
-install %{SOURCE4} $RPM_BUILD_ROOT/usr/X11R6/share/pixmaps
+install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
 mv $RPM_BUILD_ROOT%{_applnkdir}/System/gdmconfig.desktop \

diff --git a/gdm2.20.spec b/gdm2.20.spec
index 059845a61fd0eba677124d40c60f5b821675cb75..0437aed15a960759013745aaa37843eabd2b3a32 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -1,7 +1,10 @@
 Summary:       GNOME Display Manager
 Summary(es):   Administrador de Entrada del GNOME
+Summary(ja):   GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
 Summary(pl):   gdm
 Summary(pt_BR):        Gerenciador de Entrada do GNOME
+Summary(ru):   äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
+Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
 Version:       2.2.5.4
 Release:       7
@@ -23,12 +26,11 @@ BuildRequires:      gdk-pixbuf-devel
 BuildRequires: gettext-devel
 BuildRequires: gnome-libs-devel
 BuildRequires: gtk+-devel
+BuildRequires: intltool >= 0.14
 BuildRequires: libglade-gnome-devel
-BuildRequires: libtool
 BuildRequires: libxml-devel
 BuildRequires: perl-modules
 BuildRequires: scrollkeeper
-BuildRequires: intltool >= 0.14
 Requires:      gnome-libs >= 1.0.0
 Requires:      which
 Requires:      /usr/X11R6/bin/sessreg
@@ -37,8 +39,8 @@ Requires(pre):        /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(postun):      /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
-Requires(post,postun): scrollkeeper
-Requires(post,preun):  /sbin/chkconfig
+Requires(post,postun):scrollkeeper
+Requires(post,preun):/sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     xdm kdm wdm
 
@@ -60,6 +62,14 @@ several different X sessions on your local machine at the same time.
 %description -l es
 Administrador de Entrada del GNOME.
 
+%description -l ja
+Gdm (the GNOME Display Manager) ¤Ï¡¢¹âÅÙ¤ËÀßÄê²Äǽ¤Ê xdm X Display
+Manager ¤ÎºÆ¼ÂÁõÈǤǤ¹¡£ Gdm ¤ò»È¤¦¤È¡¢ X Window System
+¤¬Æ°¤¤¤Æ¤¤¤ë¤¢¤Ê¤¿¤Î
+¥·¥¹¥Æ¥à¤Ë¤¤¤í¤¤¤í¤Ê¥»¥Ã¥·¥ç¥ó¤òÁªÂò¤·¤Æ¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+
+¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î Gdm ¤Ç¤Ï¡¢³Æ¼ï¸À¸ì¤ä¡¢XIM ¤òÁªÂò¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
+
 %description -l pl
 Gdm jest wysokokonfigurowaln± reimplementacj± xdma. Gdm pozwala
 logowaæ siê do systemu z poziomu X11 i wspiera jednoczesn± pracê kilku
@@ -68,6 +78,16 @@ r
 %description -l pt_BR
 Gerenciador de Entrada do GNOME.
 
+%description -l ru
+GDM (GNOME Display Manager) - ÜÔÏ ÒÅÉÍÐÌÅÍÅÎÔÁÃÉÑ xdm (X Display
+Manager). GDM ÐÏÚ×ÏÌÑÅÔ ×ÁÍ ×ÈÏÄÉÔØ × ÓÉÓÔÅÍÕ, ÎÁ ËÏÔÏÒÏÊ ÚÁÐÕÝÅÎÏ X
+Window É ÐÏÄÄÅÒÖÉ×ÁÅÔ ÒÁÂÏÔÕ ÎÅÓËÏÌØÕÉÈ ÒÁÚÎÙÈ X ÓÅÁÎÓÏ× ÏÄÎÏ×ÒÅÍÅÎÎÏ.
+
+%description -l uk
+GDM (GNOME Display Manager) - ÃÅ ÒŦÍÐÌÅÍÅÎÔÁÃ¦Ñ xdm (X Display
+Manager). GDM ÄÏÚ×ÏÌѤ ×ÁÍ ×ÈÏÄÉÔÉ × ÓÉÓÔÅÍÕ, ÎÁ ÑË¦Ê ÚÁÐÕÝÅÎÏ X
+Window ÔÁ ЦÄÔÒÉÍÕ¤ ÒÏÂÏÔÕ Ë¦ÌØËÏÈ Ò¦ÚÎÉÈ X ÓÅÁÎÓ¦× ÏÄÎÏÞÁÓÎÏ.
+
 %package Xnest
 Summary:       Xnest (ie embedded X) server for GDM
 Summary(pl):   Serwer Xnest dla GDM
@@ -91,6 +111,7 @@ Ten pakiet dodaje do gdm wsparcie dla Xnest.
 rm -f missing
 %{__libtoolize}
 %{__gettextize}
+intltoolize --copy --force
 aclocal -I %{_aclocaldir}/gnome
 %{__autoconf}
 %{__automake}
@@ -108,6 +129,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
+       PAM_PREFIX=/etc \
        Settingsdir=%{_applnkdir}/Settings/GNOME \
        Systemdir=%{_applnkdir}/System \
        omf_dest_dir=%{_omf_dest_dir}/%{name}
@@ -115,7 +137,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/gdm.conf
-install %{SOURCE4} $RPM_BUILD_ROOT/usr/X11R6/share/pixmaps
+install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
 mv $RPM_BUILD_ROOT%{_applnkdir}/System/gdmconfig.desktop \