diff --git a/icewm-desktop-nodisplay.patch b/icewm-desktop-nodisplay.patch new file mode 100644 index 0000000..eb60e49 --- /dev/null +++ b/icewm-desktop-nodisplay.patch @@ -0,0 +1,22 @@ +From 3d09111fa081005c772c2942d42cc2d1600047f5 Mon Sep 17 00:00:00 2001 +From: Chingkai +Date: Wed, 20 Dec 2017 15:13:07 +0800 +Subject: [PATCH] Set NoDisplay for icewm.desktop + +--- + lib/icewm.desktop | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: icewm-1.4.2/lib/icewm.desktop +=================================================================== +--- icewm-1.4.2.orig/lib/icewm.desktop ++++ icewm-1.4.2/lib/icewm.desktop +@@ -11,7 +11,7 @@ Comment[da]=Simpel og hurtig vindueshån + Icon=icewm + TryExec=/usr/bin/icewm + Exec=icewm +-NoDisplay=false ++NoDisplay=true + Hidden=false + Categories=WindowManager;Application;System; + StartupNotify=false diff --git a/icewm.changes b/icewm.changes index 82d3f91..7830452 100644 --- a/icewm.changes +++ b/icewm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Dec 21 03:22:18 UTC 2017 - qkzhu@suse.com + +- Drop our distribution's icewm.desktop and use the one provided by + IceWM upstream +- Add patch icewm-desktop-nodisplay.patch + Set NoDisplay for upstream's icewm.desktop since it only starts the + window manager, icewm-session.desktop (the preferred program to + start the IceWM system) will be displayed in display manager + (bsc#1072557) + ------------------------------------------------------------------- Fri Dec 15 03:24:36 UTC 2017 - yfjiang@suse.com diff --git a/icewm.desktop b/icewm.desktop deleted file mode 100644 index 28467d4..0000000 --- a/icewm.desktop +++ /dev/null @@ -1,69 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=XSession -Exec=icewm-session -TryExec=icewm-session -Name=IceWM -Name[af]=Icewm -Name[eo]=GlaciFA -Name[hi]=आइस-डबल्यूएम -Name[lo]=ຕົວຈັດການຫນ້າຕ່າງ IceWM -Name[sv]=Ice WM -Name[th]=ตัวจัดการหน้าต่าง IceWM -Name[xx]=xxIceWMxx -Comment=A Windows 95-OS/2-Motif-like window manager -Comment[ar]=مدير نوافذ مشابه لـ Win95-OS/2-Motif -Comment[be]=Кіраваньне вокнамі падобнае на Windows 95-OS/2-Motif -Comment[bn]=Windows 95-OS/2-Motif-এর অনুরূপ একটি উইণ্ডো ম্যানেজার -Comment[bs]=Window manager nalik na Windows 95-OS/2-Motif -Comment[ca]=Un gestor de finestres com els de Windows 95-OS/2-Motif -Comment[cs]=Správce oken podobný Windows 95-OS/2-Motif -Comment[cy]=Trefnydd ffenestri sy'n debyg i Windows95-OS/2-Motif -Comment[da]=En Windows 95-OS/2-Motif-lignende vindueshåndtering -Comment[de]=Fenstermanager im Stil von Windows 95, OS/2 und Motif -Comment[el]=Ένας διαχειριστής παραθύρων παρόμοιος με τα Windows 95-OS/2-Motif -Comment[eo]=Fenestroadministrilo kiel Vindozo 95, OS/2 kaj Motifo -Comment[es]=Un administrador de ventanas similar a Win95-OS/2-Motif -Comment[et]=Aknahaldur, mis näeb välja nagu Windows 95-OS/2-Motif -Comment[eu]=Windows 95 OS/2 Motif-en itxura duen leiho kudeatzailea -Comment[fi]=Windows 95:n ja OS/2-Motifin tyylinen ikkunaohjelma -Comment[fr]=Un gestionnaire de fenêtres ressemblant à Windows 95-OS/2-Motif -Comment[fy]=In Win95-OS/2-Motif-likens finstersmanager -Comment[gl]=Un xestor de fiestras coma o de Windows 95-OS/2-Motif -Comment[he]=מנהל חלונות מבוסס Motif הדומה במראהו לחלונות 95/OS-2 -Comment[hi]=विंडोज़ 95-ओएस/2-मोटिफ जैसा विंडो प्रबंधक -Comment[hr]=Upravitelj prozora nalik na Windows 95/OS/2/Motif -Comment[hu]=Win95-OS/2-Motif-szerű ablakkezelő -Comment[is]=Gluggastjóri sem líkist 95-OS/2-Motif -Comment[it]=Un window manager in stile Windows 95-OS/2-Motif -Comment[ja]=Windows95,OS/2,Motifに似たウィンドウマネージャ -Comment[lt]=A Windows 95-OS/2-Motif-primenanti langų tvarkyklė -Comment[lv]=Windows 95 - OS/2 - Motif līdzīgs logu menedžeris -Comment[mk]=Менаџер на прозорци со изглед на Windows 95, OS/2 и Motif -Comment[mn]=Виндовс 95-OS/2-Motif-шиг цонхны удирдагч -Comment[mt]=Window manager jixbaħ lill-Windows 95-OS/2-Motif -Comment[nb]=En vindusbehandler som likner Windows 95-OS/2-Motif -Comment[nds]=Finsterpleger, de utsüht as Windows 95-OS/2-Motif -Comment[nl]=Een Win95-OS/2-Motif-achtige windowmanager -Comment[nn]=Ein vindaugssjef som liknar Windows 95-OS/2-Motif -Comment[pa]=ਇੱਕ ਵਿੰਡੋ 95-OS/2-Motif-ਵਰਗਾ ਝਰੋਖਾ ਮੈਨੇਜਰ -Comment[pl]=Menedżer okien podobny do Windows 95-OS/2-Motif -Comment[pt]=Um gestor de janelas parecido com o Windows 95, OS/2 e Motif -Comment[pt_BR]=Um gerenciador de janelas parecido com Windows 95-OS/2-Motif -Comment[ro]=Un manager de ferestre cu aspect de Windows 95, OS/2 sau Motif -Comment[ru]=Оконный менеджер в стиле Windows95-OS/2-Motif -Comment[se]=Windows 95-OS/2-Motif-lágan lásegieđahalli -Comment[sk]=Správca okien podobný Windows 95-OS/2-Motif -Comment[sl]=Okenski upravitelj, podoben Windows 95, OS/2 in Motifu -Comment[sr]=Менаџер прозора налик на Windows 95/OS/2/Motif -Comment[sr@Latn]=Menadžer prozora nalik na Windows 95/OS/2/Motif -Comment[sv]=Fönsterhanterare som liknar Windows 95-OS/2-Motif -Comment[ta]=சாளரங்கள் 95-OS/2-மாடிஃப்-லைக் சாளர மேலாளர் -Comment[tg]=Windows 95-OS/2-Motif-монанди мудири тиреза -Comment[tr]=Windows 95-OS/2-Motif benzeri bir pencere yöneticisi -Comment[uk]=Менеджер вікон наподіб Windows 95-OS/2-Motif -Comment[uz]=Win95-OS/2-Motif'га ўхшаш ойна бошқарувчи -Comment[vi]=Trình quản lý cửa sổ với mô típ kiểu Windows 95 -Comment[wa]=On manaedjeu di purneas rishonnant Windows95-OS/2-Motif -Comment[xx]=xxA Windows 95-OS/2-Motif-like window managerxx -Comment[zh_CN]=类似 Windows-OS/2-Motif 的窗口管理器 diff --git a/icewm.spec b/icewm.spec index 198b5ef..c504abe 100644 --- a/icewm.spec +++ b/icewm.spec @@ -25,11 +25,12 @@ License: LGPL-2.1+ Group: System/GUI/Other Url: http://www.icewm.org/ Source0: https://github.com/bbidulock/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2 -Source1: icewm.desktop # PATCH-FIX-OPENSUSE icewm-mate.patch sor.alexei@meowr.ru -- Add MATE Menus support. Patch0: icewm-mate.patch # PATCH-FEATURE-SUSE icewm-susemenu.patch tyang@suse.com -- Add xdg-menu for SLED icewm Patch1: icewm-susemenu.patch +# PATCH-FIX-OPENSUSE icewm-desktop-nodisplay.patch qkzhu@suse.com -- Set NoDisplay for icewm.desktop +Patch2: icewm-desktop-nodisplay.patch Patch99: icewm-preferences.patch BuildRequires: autoconf BuildRequires: automake @@ -136,6 +137,7 @@ mailbox status, and a digital clock. It is fast and small. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Do not require needlessly new gettext. sed -i 's/0.19.6/0.18.3/g' configure.ac @@ -207,9 +209,6 @@ mv %{buildroot}/%{_sysconfdir}/icewm/preferences \ %find_lang icewm ln -sf icewm.html %{buildroot}/%{_docdir}/icewm/index.html -# Install the xsession desktop file. -install -Dm 0644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/icewm.desktop - mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ for file in %{lites}; do mv -f lite/$file-lite %{buildroot}%{_prefix}/bin @@ -220,7 +219,7 @@ for file in %{lites}; do ln -s %{_sysconfdir}/alternatives/$file %{buildroot}%{_bindir}/$file done -%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/icewm.desktop +%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/icewm-session.desktop touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop @@ -230,11 +229,11 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadi %post %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ - default-xsession.desktop %{_datadir}/xsessions/icewm.desktop 15 + default-xsession.desktop %{_datadir}/xsessions/icewm-session.desktop 15 %postun -[ -f %{_datadir}/xsessions/icewm.desktop ] || %{_sbindir}/update-alternatives \ - --remove default-xsession.desktop %{_datadir}/xsessions/icewm.desktop +[ -f %{_datadir}/xsessions/icewm-session.desktop ] || %{_sbindir}/update-alternatives \ + --remove default-xsession.desktop %{_datadir}/xsessions/icewm-session.desktop %post lite %{_sbindir}/update-alternatives \