From 2f1841dc437a8b82e418ca754211e13aef751a144e970fa6a575af3c3553e9ee Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 13 Sep 2007 16:42:46 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=34 --- fix-desktop-files.diff | 152 +++++++++++++++++++++++++++++++++++++++++ gdm.changes | 5 ++ gdm.spec | 12 ++-- 3 files changed, 165 insertions(+), 4 deletions(-) create mode 100644 fix-desktop-files.diff diff --git a/fix-desktop-files.diff b/fix-desktop-files.diff new file mode 100644 index 0000000..b6eee2e --- /dev/null +++ b/fix-desktop-files.diff @@ -0,0 +1,152 @@ +--- ./gui/gdmflexiserver-xnest.desktop.in.in 2007/09/13 08:35:04 1.1 ++++ ./gui/gdmflexiserver-xnest.desktop.in.in 2007/09/13 08:36:01 +@@ -1,7 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 + _Name=New Login in a Window +-_GenericName=New Login in a Window + _Comment=Login as another user in a window + TryExec=@X_XNEST_CMD@ + Exec=gdmflexiserver --xnest +--- ./gui/gdmflexiserver-xnest.desktop 2007/09/13 08:35:10 1.1 ++++ ./gui/gdmflexiserver-xnest.desktop 2007/09/13 08:35:28 +@@ -26,32 +26,6 @@ + Name[th]=การเข้าระบบใหม่ในหน้าต่าง + Name[vi]=Đăng nhập mới trong cửa sổ + Name[zh_CN]=窗口中的新登录 +-GenericName=New Login in a Window +-GenericName[bg]=Ново влизане в прозорец +-GenericName[bn_IN]=উইন্ডোর মধ্যে নতুন লগ-ইন +-GenericName[de]=In einem Fenster neu anmelden +-GenericName[dz]=སྒོ་སྒྲིག་ཅིག་ནང་ ནང་བསྐྱོད་གསརཔ +-GenericName[en_CA]=New Login in a Window +-GenericName[es]=Nuevo acceso en una ventana +-GenericName[et]=Uus sisselogimine aknas +-GenericName[eu]=Saio berria leiho batean +-GenericName[fi]=Uusi kirjautuminen ikkunassa +-GenericName[fr]=Nouvelle connexion dans une fenêtre +-GenericName[gu]=વિન્ડોમાં નવો પ્રવેશ +-GenericName[hu]=Új bejelentkezés egy ablakban +-GenericName[ja]=ウィンドウから新しいログイン +-GenericName[kn]=ಒಂದು ವಿಂಡೋದಲ್ಲಿ ಹೊಸ ಪ್ರವೇಶ +-GenericName[ko]=창에서 새로 로그인 +-GenericName[lt]=Naujas prisijungimas lange +-GenericName[ml]=ജാലകത്തില്‍ ഉളള പുതിയ ലോഗിന്‍ +-GenericName[nb]=Ny innlogging i et vindu +-GenericName[or]=ଗୋଟିଏ ୱିଣ୍ଡୋରେ ନୂତନ ଲଗଇନ +-GenericName[pt_BR]=Nova Sessão em uma Janela +-GenericName[sv]=Ny inloggning i ett fönster +-GenericName[ta]=சாளரத்தில் புதிய நுழைவு +-GenericName[th]=การเข้าระบบใหม่ในหน้าต่าง +-GenericName[vi]=Đăng nhập mới trong cửa sổ +-GenericName[zh_CN]=窗口中的新登录 + Comment=Login as another user in a window + Comment[bg]=Влизане в системата като друг потребител в прозорец + Comment[bn_IN]=লগ-আউট না করে পৃথক ব্যবহারকারীরূপে উইন্ডোর মধ্যে লগ-ইন করুন +--- gui/gdmphotosetup.desktop.in 2007/09/13 08:33:22 1.25 ++++ gui/gdmphotosetup.desktop.in 2007/09/13 08:36:41 +@@ -1,7 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 + _Name=Login Photo +-_GenericName=Login Photo + _Comment=Change the picture that will show in the GDM (login manager) face browser + TryExec=gdmphotosetup + Exec=gdmphotosetup +--- ./gui/gdmflexiserver.desktop 2007/09/13 08:37:47 1.1 ++++ ./gui/gdmflexiserver.desktop 2007/09/13 08:38:04 +@@ -78,84 +78,6 @@ + Name[zh_HK]=以新身分登入 + Name[zh_TW]=以新身分登入 + Name[zu]=Umngenisi omusha +-GenericName=New Login +-GenericName[af]=Nuwe aanmelding +-GenericName[ar]=ولوج جديد +-GenericName[az]=Yeni Giriş +-GenericName[be]=Новы ўваход +-GenericName[bg]=Ново влизане +-GenericName[bn]=নতুন লগইন +-GenericName[bn_IN]=নতুন লগ-ইন +-GenericName[bs]=Nova prijava +-GenericName[ca]=Entrada nova +-GenericName[cs]=Nové přihlášení +-GenericName[cy]=Mewngofnodiad Newydd +-GenericName[da]=Nyt logind +-GenericName[de]=Neu anmelden +-GenericName[dz]=ནང་བསྐྱོད་གསརཔ། +-GenericName[el]=Νέα Είσοδος +-GenericName[en_CA]=New Login +-GenericName[en_GB]=New Login +-GenericName[es]=Pantalla de entrada nueva +-GenericName[et]=Uus seanss +-GenericName[eu]=Saio-hasiera berria +-GenericName[fa]=ورود جدید به سیستم +-GenericName[fi]=Uusi kirjautuminen +-GenericName[fr]=Nouvelle connexion +-GenericName[ga]=Logann nua +-GenericName[gl]=Nova sesión +-GenericName[gu]=નવો પ્રવેશ +-GenericName[he]=חיבור חדש +-GenericName[hi]=नया लॉगइन +-GenericName[hr]=Nova prijava +-GenericName[hu]=Új bejelentkezés +-GenericName[hy]=Նոր մուտք +-GenericName[id]=Login Baru +-GenericName[it]=Nuovo login +-GenericName[ja]=新しいログイン +-GenericName[ka]=ახალი შესვლა +-GenericName[kn]=ಹೊಸ ದಾಖಲಾತಿ +-GenericName[ko]=새로 로그인 +-GenericName[ku]=Têketina Nû +-GenericName[lt]=Naujas prisijungimas +-GenericName[lv]=Jauna pieslēgšanās +-GenericName[mg]=Fidirana vaovao +-GenericName[mk]=Ново најавување +-GenericName[ml]=പുയിയ ലോഗിന്‍ +-GenericName[mn]=Шинэ нэвтрэлт +-GenericName[mr]=नविन प्रवेश +-GenericName[ms]=Logmasuk baru +-GenericName[nb]=Ny innlogging +-GenericName[ne]=नयाँ लगइन +-GenericName[nl]=Nieuwe aanmelding +-GenericName[nn]=Ny innlogging +-GenericName[nso]=Go Tsena go go Swa +-GenericName[oc]=Connection novèla +-GenericName[or]=ନୂତନ ଲଗଇନ୍ +-GenericName[pa]=ਨਵਾਂ ਲਾਗਇਨ +-GenericName[pl]=Nowy login +-GenericName[pt]=Nova Sessão +-GenericName[pt_BR]=Nova Sessão +-GenericName[ro]=Autentificare nouă +-GenericName[ru]=Новый сеанс +-GenericName[si]=නව පිවිසුම +-GenericName[sk]=Nové prihlásenie +-GenericName[sl]=Nova prijava +-GenericName[sq]=Login i Ri +-GenericName[sr]=Нова пријава +-GenericName[sr@Latn]=Nova prijava +-GenericName[sv]=Ny inloggning +-GenericName[ta]=புதிய உள்நுழைவு +-GenericName[th]=การเข้าระบบใหม่ +-GenericName[tr]=Yeni Giriş +-GenericName[uk]=Новий сеанс +-GenericName[vi]=Đăng nhập mới +-GenericName[wa]=Novea elodjaedje +-GenericName[xh]=Ungeno Olutsha +-GenericName[zh_CN]=新登录 +-GenericName[zh_HK]=以新身分登入 +-GenericName[zh_TW]=以新身分登入 +-GenericName[zu]=Umngenisi omusha + Comment=Log in as another user without logging out + Comment[af]=Meld aan as 'n ander gebruiker sonder om eers af te meld + Comment[ar]=لُجْ كمستخدم آخر دون الخروج +--- ./gui/gdmflexiserver.desktop.in 2007/09/13 08:50:58 1.25 ++++ ./gui/gdmflexiserver.desktop.in 2007/09/13 08:51:40 +@@ -1,7 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 + _Name=New Login +-_GenericName=New Login + _Comment=Log in as another user without logging out + Exec=gdmflexiserver + Icon=gdm diff --git a/gdm.changes b/gdm.changes index b9e81c9..62f16ff 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 13 10:43:52 CEST 2007 - stbinner@suse.de + +- '%suse_update_desktop_file -G "" foo' doesn't seem to work anymore + ------------------------------------------------------------------- Wed Sep 12 19:42:46 CEST 2007 - jberkman@novell.com diff --git a/gdm.spec b/gdm.spec index 78d0cbb..a7b722c 100644 --- a/gdm.spec +++ b/gdm.spec @@ -22,7 +22,7 @@ PreReq: %insserv_prereq License: GPL v2 or later Group: System/GUI/GNOME Version: 2.19.7 -Release: 10 +Release: 12 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -56,6 +56,7 @@ Patch38: gdm-2.19.3-token-login2.patch Patch39: gdm-2.19.7-pam-hide-password.patch Patch40: gdm-XKeepsCrashing-SaX2.patch Patch41: gdm-2.19.7-vncxauth.patch +Patch42: fix-desktop-files.diff URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Docdir: %{_defaultdocdir} @@ -112,6 +113,7 @@ gnome-patch-translation-prepare %patch39 -p1 %patch40 %patch41 -p1 +%patch42 gnome-patch-translation-update %build @@ -152,9 +154,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/xsessions/ssh.desktop rm $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop rmdir $RPM_BUILD_ROOT%{_sysconfdir}/dm %suse_update_desktop_file gdmsetup SystemSetup -%suse_update_desktop_file -G "" gdmphotosetup SystemSetup -%suse_update_desktop_file -G "" gdmflexiserver RemoteAccess -%suse_update_desktop_file -G "" gdmflexiserver-xnest RemoteAccess +%suse_update_desktop_file gdmphotosetup SystemSetup +%suse_update_desktop_file gdmflexiserver RemoteAccess +%suse_update_desktop_file gdmflexiserver-xnest RemoteAccess #echo DocPath=gdm >> $RPM_BUILD_ROOT%{_datadir}/applications/gdmsetup.desktop #echo DocPath=gdm >> $RPM_BUILD_ROOT%{_datadir}/applications/gdmphotosetup.desktop mkdir -p $RPM_BUILD_ROOT/var/log/gdm @@ -246,6 +248,8 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %files lang -f %{name}.lang %changelog +* Thu Sep 13 2007 - stbinner@suse.de +- '%%suse_update_desktop_file -G "" foo' doesn't seem to work anymore * Wed Sep 12 2007 - jberkman@novell.com - correctly add localhost xauth for "remote" connections on little endian machines (bnc #296699)