diff --git a/0001-Require-the-right-ASQt-version.patch b/0001-Require-the-right-ASQt-version.patch new file mode 100644 index 0000000..f62b956 --- /dev/null +++ b/0001-Require-the-right-ASQt-version.patch @@ -0,0 +1,30 @@ +From d513cbf9351b690c6e4fa885385561218e5c1dbe Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Wed, 9 Sep 2015 20:16:05 +0200 +Subject: [PATCH 1/3] Require the right ASQt version + +The AppStreamQt versions are now aligned with AppStream versions, to +give better control over the feature-level an ASQt-based application +requires (and to make maintenance easier and avoid confusion). +Unfortunately, the version number became lower with that, this patch +adjusts Muon to reflect that. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 076e267..2ab7aea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,7 +33,7 @@ else() + endif() + + if(packagekitqt5_FOUND OR AkabeiClient_FOUND) +- find_package(AppstreamQt 1.1) ++ find_package(AppstreamQt 0.8.4) + endif() + endif() + find_package(KF5Attica) +-- +2.5.0 + diff --git a/0002-Rename-desktop-file.patch b/0002-Rename-desktop-file.patch new file mode 100644 index 0000000..434bf14 --- /dev/null +++ b/0002-Rename-desktop-file.patch @@ -0,0 +1,302 @@ +From 6243eaa9412d5abc13c1c0bd26f79e6c2017c92b Mon Sep 17 00:00:00 2001 +From: Aleix Pol +Date: Thu, 10 Sep 2015 00:17:34 +0200 +Subject: [PATCH 2/3] Rename desktop file + +As requested by Harald Sitter + +CCMAIL: sitter@kde.org +--- + discover/muon-discover.desktop | 136 -------------------------------------- + discover/org.kde.discover.desktop | 136 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 136 insertions(+), 136 deletions(-) + delete mode 100644 discover/muon-discover.desktop + create mode 100644 discover/org.kde.discover.desktop + +diff --git a/discover/muon-discover.desktop b/discover/muon-discover.desktop +deleted file mode 100644 +index 8e7c7b2..0000000 +--- a/discover/muon-discover.desktop ++++ /dev/null +@@ -1,136 +0,0 @@ +-[Desktop Entry] +-Name=Muon Discover +-Name[bg]=Muon Discover +-Name[bs]=Muon otkrivač +-Name[ca]=Muon Discover +-Name[ca@valencia]=Muon Discover +-Name[cs]=Muon Discover +-Name[da]=Muon Discover +-Name[de]=Muon-Discover +-Name[el]=Muon Discover +-Name[en_GB]=Muon Discover +-Name[es]=Muon Discover +-Name[et]=Muoni avastusretk +-Name[fi]=Muon Discover +-Name[fr]=Découvreur de Muon +-Name[ga]=Aimsiú Muon +-Name[gl]=Descubridor do Muon +-Name[hu]=Muon Discover +-Name[id]=Muon Discover +-Name[it]=Muon Discover +-Name[kk]=Muon тапқышы +-Name[ko]=Muon 발견 +-Name[lt]=Muon apžvalga +-Name[mr]=म्युओन डिस्कव्हर +-Name[nb]=Muon-oppdager +-Name[nds]=Muon-Opdecken +-Name[nl]=Muon-zoeken +-Name[pa]=ਮੂਓਨ ਖੋਜ +-Name[pl]=Odkrywca Muon +-Name[pt]=Descoberta do Muon +-Name[pt_BR]=Muon Discover +-Name[ro]=Descoperire Muon +-Name[ru]=Обзор программ Muon +-Name[sk]=Muon Discover +-Name[sl]=Odkritelj Muon +-Name[sr]=Муонов откривач +-Name[sr@ijekavian]=Муонов откривач +-Name[sr@ijekavianlatin]=Muonov otkrivač +-Name[sr@latin]=Muonov otkrivač +-Name[sv]=Muon upptäckt +-Name[tr]=Muon Keşfet +-Name[uk]=Шукач Muon +-Name[x-test]=xxMuon Discoverxx +-Name[zh_CN]=Muon 发现者 +-Name[zh_TW]=Muon 探詢器 +-Exec=muon-discover +-Icon=muondiscover +-Type=Application +-X-DocPath=muon/index.html +-GenericName=Software Center +-GenericName[ast]=Centru de software +-GenericName[bg]=Софтуерен център +-GenericName[bs]=Softverski centar +-GenericName[ca]=Centre de programari +-GenericName[ca@valencia]=Centre de programari +-GenericName[cs]=Centrum softwaru +-GenericName[da]=Softwarecenter +-GenericName[de]=Programmverwaltung +-GenericName[el]=Κέντρο λογισμικού +-GenericName[en_GB]=Software Centre +-GenericName[es]=Centro de software +-GenericName[et]=Tarkvarakeskus +-GenericName[fi]=Sovellusvalikoima +-GenericName[fr]=Logithèque +-GenericName[ga]=Lárionad Bogearraí +-GenericName[gl]=Centro de Software +-GenericName[hu]=Szoftverközpont +-GenericName[id]=Pusat Perangkat Lunak +-GenericName[it]=Software Center +-GenericName[kk]=Бағдарлама орталығы +-GenericName[ko]=소프트웨어 센터 +-GenericName[lt]=Programų centras +-GenericName[mr]=सॉफ़्टवेअर केंद्र +-GenericName[nb]=Programvaresenter +-GenericName[nds]=Software-Zentrum +-GenericName[nl]=Softwarecentrum +-GenericName[pa]=ਸਾਫਟਵੇਅਰ ਸੈਂਟਰ +-GenericName[pl]=Centrum oprogramowania +-GenericName[pt]=Centro de Aplicações +-GenericName[pt_BR]=Central de aplicativos +-GenericName[ro]=Centrul de Aplicații +-GenericName[ru]=Центр программ +-GenericName[sk]=Softwareové centum +-GenericName[sl]=Programsko središče +-GenericName[sr]=Софтверски центар +-GenericName[sr@ijekavian]=Софтверски центар +-GenericName[sr@ijekavianlatin]=Softverski centar +-GenericName[sr@latin]=Softverski centar +-GenericName[sv]=Programvarucentral +-GenericName[tr]=Yazılım Merkezi +-GenericName[ug]=يۇمشاق دېتال مەركىزى +-GenericName[uk]=Центр програм +-GenericName[x-test]=xxSoftware Centerxx +-GenericName[zh_CN]=软件中心 +-GenericName[zh_TW]=軟體中心 +-Categories=Qt;KDE;System; +-Keywords=program;software;repository;package;install;remove;update;apps;applications; +-Keywords[ast]=programa;software;repositoriu;paquete;instalar;desaniciar;anovar;apps;aplicaciones; +-Keywords[bg]=програма;софтуер;хранилище;пакет;инсталиране;премахване;обновяване;приложение;приложения; +-Keywords[ca]=programa;programari;repositori;paquet;instal·la;suprimeix;actualitza;apps;aplicacions; +-Keywords[ca@valencia]=programa;programari;repositori;paquet;instal·la;suprimeix;actualitza;apps;aplicacions; +-Keywords[cs]=program;software;repozitář;balíček;instalovat;odstranit;aktualizovat;programy;aplikace; +-Keywords[da]=program;software;repository;softwarekilde;pakke;installere;fjerne;apps;applikationer;opdatere; +-Keywords[de]=Programm;Software;Archiv;Repository;Paket;Installieren;Entfernen;Aktualisieren;deb;Programme;Anwendungen; +-Keywords[el]=πρόγραμμα;λογισμικό;αποθετήριο;πακέτο;εγκατάσταση;αφαίρεση;ενημέρωση;εφαρμογές; +-Keywords[en_GB]=program;software;repository;package;install;remove;update;apps;applications; +-Keywords[es]=programa;software;repositorio;paquete;instalar;eliminar;actualizar;apps;aplicaciones; +-Keywords[et]=programm,rakendus,tarkvara,hoidla,pakk,pakett,paigaldamine,installimine,eemaldamine,uuendamine,rakendused,deb +-Keywords[fi]=program;software;repository;package;install;remove;update;apps;applications;ohjelma;ohjelmisto;ohjelmalähde;lähteet;arkisto;paketti;asenna;poista;päivitä;sovellukset; +-Keywords[fr]=programme ; logiciel ; dépôt ; archive ; paquet ; installation ; suppression ; mise à jour ; deb +-Keywords[gl]=aplicativo,software,repositorio,paquete,instalar,eliminar,actualizar,deb +-Keywords[hu]=program;szoftver;tároló;csomag;telepítés;eltávolítás;frissítés;appok;alkalmazások; +-Keywords[id]=program;perangkat lunak;repositori;paket;pasang;buang;perbarui;apl;aplikasi; +-Keywords[it]=programma;software;deposito;pacchetto;installa;rimuovi;aggiorna;app;applicazioni; +-Keywords[ko]=program,software,repository,archive,package,install,remove,update,deb,프로그램,소프트웨어,저장소,리포지토리,패키지,꾸러미,설치,삭제,업데이트 +-Keywords[lt]=programos;programinė įranga;saugykla;archyvas;paketas;įdiegti;pašalinti;atnaujinti; +-Keywords[nb]=program;programvare;pakkebrønn;pakke;installere;fjerne;oppdatere;app;apper; +-Keywords[nds]=programm;software;repository;archiev,paket;installeren;wegmaken;opfrischen;update;apps;programmen; +-Keywords[nl]=programma;software;opslagruimte;pakket;installeren;verwijderen;bijwerken;apps;toepassingen;applicaties; +-Keywords[pl]=program,oprogramowanie,repozytorium,archiwum,pakiet,paczka,instaluj,zainstaluj,usuń,odinstaluj,uaktualnij,aktualizuj,programy,aplikacje,deb +-Keywords[pt]=programa;software;repositório;arquivo;pacote;instalar;remover;actualizar;deb;aplicações; +-Keywords[pt_BR]=programa;software;repositório;pacote;instalar;instalação;remover;atualizar;aplicativos;apps;aplicações; +-Keywords[ro]=program;software;depozit;arhivă;pachet;instalare;elimină;actualizare;aplicații; +-Keywords[ru]=program;software;repository;package;install;remove;update;apps;applications;программа;приложение;репозиторий;пакет;установка;удаление;deb; +-Keywords[sk]=program;softvér;repozitár;archív;balík;inštalácia;odstránenie;appky;aplikácie;aktualizácia; +-Keywords[sl]=program;programska oprema;skladišče;paket;namesti;odstrani;posodobi;programi; +-Keywords[sr]=program;software;repository;package;install;remove;update;apps;applications;програм;софтвер;ризница;пакет;инсталирати;уклонити;ажурирати; +-Keywords[sr@ijekavian]=program;software;repository;package;install;remove;update;apps;applications;програм;софтвер;ризница;пакет;инсталирати;уклонити;ажурирати; +-Keywords[sr@ijekavianlatin]=program;software;repository;package;install;remove;update;apps;applications;program;softver;riznica;paket;instalirati;ukloniti;ažurirati; +-Keywords[sr@latin]=program;software;repository;package;install;remove;update;apps;applications;program;softver;riznica;paket;instalirati;ukloniti;ažurirati; +-Keywords[sv]=program;programvara;arkiv;paket;installera;ta bort;uppdatera;appar;program; +-Keywords[tr]=uygulama;yazılım;depo;paket;kur;kaldır;güncelle;uygulamalar;yüklemeler; +-Keywords[uk]=program;software;repository;package;install;remove;update;app;apps;applications;програма;програмне забезпечення;сховище;архів;пакунок;встановити;встановлення;вилучити;вилучення;оновлення;оновити; +-Keywords[x-test]=xxprogramxx;xxsoftwarexx;xxrepositoryxx;xxpackagexx;xxinstallxx;xxremovexx;xxupdatexx;xxappsxx;xxapplicationsxx; +-Keywords[zh_CN]=program;software;repository;package;install;remove;update;apps;applications;程序;软件;软件源;包;安装;移除;升级;应用程序; +-Keywords[zh_TW]=program;software;repository;package;install;remove;update;apps;applications; +diff --git a/discover/org.kde.discover.desktop b/discover/org.kde.discover.desktop +new file mode 100644 +index 0000000..8e7c7b2 +--- /dev/null ++++ b/discover/org.kde.discover.desktop +@@ -0,0 +1,136 @@ ++[Desktop Entry] ++Name=Muon Discover ++Name[bg]=Muon Discover ++Name[bs]=Muon otkrivač ++Name[ca]=Muon Discover ++Name[ca@valencia]=Muon Discover ++Name[cs]=Muon Discover ++Name[da]=Muon Discover ++Name[de]=Muon-Discover ++Name[el]=Muon Discover ++Name[en_GB]=Muon Discover ++Name[es]=Muon Discover ++Name[et]=Muoni avastusretk ++Name[fi]=Muon Discover ++Name[fr]=Découvreur de Muon ++Name[ga]=Aimsiú Muon ++Name[gl]=Descubridor do Muon ++Name[hu]=Muon Discover ++Name[id]=Muon Discover ++Name[it]=Muon Discover ++Name[kk]=Muon тапқышы ++Name[ko]=Muon 발견 ++Name[lt]=Muon apžvalga ++Name[mr]=म्युओन डिस्कव्हर ++Name[nb]=Muon-oppdager ++Name[nds]=Muon-Opdecken ++Name[nl]=Muon-zoeken ++Name[pa]=ਮੂਓਨ ਖੋਜ ++Name[pl]=Odkrywca Muon ++Name[pt]=Descoberta do Muon ++Name[pt_BR]=Muon Discover ++Name[ro]=Descoperire Muon ++Name[ru]=Обзор программ Muon ++Name[sk]=Muon Discover ++Name[sl]=Odkritelj Muon ++Name[sr]=Муонов откривач ++Name[sr@ijekavian]=Муонов откривач ++Name[sr@ijekavianlatin]=Muonov otkrivač ++Name[sr@latin]=Muonov otkrivač ++Name[sv]=Muon upptäckt ++Name[tr]=Muon Keşfet ++Name[uk]=Шукач Muon ++Name[x-test]=xxMuon Discoverxx ++Name[zh_CN]=Muon 发现者 ++Name[zh_TW]=Muon 探詢器 ++Exec=muon-discover ++Icon=muondiscover ++Type=Application ++X-DocPath=muon/index.html ++GenericName=Software Center ++GenericName[ast]=Centru de software ++GenericName[bg]=Софтуерен център ++GenericName[bs]=Softverski centar ++GenericName[ca]=Centre de programari ++GenericName[ca@valencia]=Centre de programari ++GenericName[cs]=Centrum softwaru ++GenericName[da]=Softwarecenter ++GenericName[de]=Programmverwaltung ++GenericName[el]=Κέντρο λογισμικού ++GenericName[en_GB]=Software Centre ++GenericName[es]=Centro de software ++GenericName[et]=Tarkvarakeskus ++GenericName[fi]=Sovellusvalikoima ++GenericName[fr]=Logithèque ++GenericName[ga]=Lárionad Bogearraí ++GenericName[gl]=Centro de Software ++GenericName[hu]=Szoftverközpont ++GenericName[id]=Pusat Perangkat Lunak ++GenericName[it]=Software Center ++GenericName[kk]=Бағдарлама орталығы ++GenericName[ko]=소프트웨어 센터 ++GenericName[lt]=Programų centras ++GenericName[mr]=सॉफ़्टवेअर केंद्र ++GenericName[nb]=Programvaresenter ++GenericName[nds]=Software-Zentrum ++GenericName[nl]=Softwarecentrum ++GenericName[pa]=ਸਾਫਟਵੇਅਰ ਸੈਂਟਰ ++GenericName[pl]=Centrum oprogramowania ++GenericName[pt]=Centro de Aplicações ++GenericName[pt_BR]=Central de aplicativos ++GenericName[ro]=Centrul de Aplicații ++GenericName[ru]=Центр программ ++GenericName[sk]=Softwareové centum ++GenericName[sl]=Programsko središče ++GenericName[sr]=Софтверски центар ++GenericName[sr@ijekavian]=Софтверски центар ++GenericName[sr@ijekavianlatin]=Softverski centar ++GenericName[sr@latin]=Softverski centar ++GenericName[sv]=Programvarucentral ++GenericName[tr]=Yazılım Merkezi ++GenericName[ug]=يۇمشاق دېتال مەركىزى ++GenericName[uk]=Центр програм ++GenericName[x-test]=xxSoftware Centerxx ++GenericName[zh_CN]=软件中心 ++GenericName[zh_TW]=軟體中心 ++Categories=Qt;KDE;System; ++Keywords=program;software;repository;package;install;remove;update;apps;applications; ++Keywords[ast]=programa;software;repositoriu;paquete;instalar;desaniciar;anovar;apps;aplicaciones; ++Keywords[bg]=програма;софтуер;хранилище;пакет;инсталиране;премахване;обновяване;приложение;приложения; ++Keywords[ca]=programa;programari;repositori;paquet;instal·la;suprimeix;actualitza;apps;aplicacions; ++Keywords[ca@valencia]=programa;programari;repositori;paquet;instal·la;suprimeix;actualitza;apps;aplicacions; ++Keywords[cs]=program;software;repozitář;balíček;instalovat;odstranit;aktualizovat;programy;aplikace; ++Keywords[da]=program;software;repository;softwarekilde;pakke;installere;fjerne;apps;applikationer;opdatere; ++Keywords[de]=Programm;Software;Archiv;Repository;Paket;Installieren;Entfernen;Aktualisieren;deb;Programme;Anwendungen; ++Keywords[el]=πρόγραμμα;λογισμικό;αποθετήριο;πακέτο;εγκατάσταση;αφαίρεση;ενημέρωση;εφαρμογές; ++Keywords[en_GB]=program;software;repository;package;install;remove;update;apps;applications; ++Keywords[es]=programa;software;repositorio;paquete;instalar;eliminar;actualizar;apps;aplicaciones; ++Keywords[et]=programm,rakendus,tarkvara,hoidla,pakk,pakett,paigaldamine,installimine,eemaldamine,uuendamine,rakendused,deb ++Keywords[fi]=program;software;repository;package;install;remove;update;apps;applications;ohjelma;ohjelmisto;ohjelmalähde;lähteet;arkisto;paketti;asenna;poista;päivitä;sovellukset; ++Keywords[fr]=programme ; logiciel ; dépôt ; archive ; paquet ; installation ; suppression ; mise à jour ; deb ++Keywords[gl]=aplicativo,software,repositorio,paquete,instalar,eliminar,actualizar,deb ++Keywords[hu]=program;szoftver;tároló;csomag;telepítés;eltávolítás;frissítés;appok;alkalmazások; ++Keywords[id]=program;perangkat lunak;repositori;paket;pasang;buang;perbarui;apl;aplikasi; ++Keywords[it]=programma;software;deposito;pacchetto;installa;rimuovi;aggiorna;app;applicazioni; ++Keywords[ko]=program,software,repository,archive,package,install,remove,update,deb,프로그램,소프트웨어,저장소,리포지토리,패키지,꾸러미,설치,삭제,업데이트 ++Keywords[lt]=programos;programinė įranga;saugykla;archyvas;paketas;įdiegti;pašalinti;atnaujinti; ++Keywords[nb]=program;programvare;pakkebrønn;pakke;installere;fjerne;oppdatere;app;apper; ++Keywords[nds]=programm;software;repository;archiev,paket;installeren;wegmaken;opfrischen;update;apps;programmen; ++Keywords[nl]=programma;software;opslagruimte;pakket;installeren;verwijderen;bijwerken;apps;toepassingen;applicaties; ++Keywords[pl]=program,oprogramowanie,repozytorium,archiwum,pakiet,paczka,instaluj,zainstaluj,usuń,odinstaluj,uaktualnij,aktualizuj,programy,aplikacje,deb ++Keywords[pt]=programa;software;repositório;arquivo;pacote;instalar;remover;actualizar;deb;aplicações; ++Keywords[pt_BR]=programa;software;repositório;pacote;instalar;instalação;remover;atualizar;aplicativos;apps;aplicações; ++Keywords[ro]=program;software;depozit;arhivă;pachet;instalare;elimină;actualizare;aplicații; ++Keywords[ru]=program;software;repository;package;install;remove;update;apps;applications;программа;приложение;репозиторий;пакет;установка;удаление;deb; ++Keywords[sk]=program;softvér;repozitár;archív;balík;inštalácia;odstránenie;appky;aplikácie;aktualizácia; ++Keywords[sl]=program;programska oprema;skladišče;paket;namesti;odstrani;posodobi;programi; ++Keywords[sr]=program;software;repository;package;install;remove;update;apps;applications;програм;софтвер;ризница;пакет;инсталирати;уклонити;ажурирати; ++Keywords[sr@ijekavian]=program;software;repository;package;install;remove;update;apps;applications;програм;софтвер;ризница;пакет;инсталирати;уклонити;ажурирати; ++Keywords[sr@ijekavianlatin]=program;software;repository;package;install;remove;update;apps;applications;program;softver;riznica;paket;instalirati;ukloniti;ažurirati; ++Keywords[sr@latin]=program;software;repository;package;install;remove;update;apps;applications;program;softver;riznica;paket;instalirati;ukloniti;ažurirati; ++Keywords[sv]=program;programvara;arkiv;paket;installera;ta bort;uppdatera;appar;program; ++Keywords[tr]=uygulama;yazılım;depo;paket;kur;kaldır;güncelle;uygulamalar;yüklemeler; ++Keywords[uk]=program;software;repository;package;install;remove;update;app;apps;applications;програма;програмне забезпечення;сховище;архів;пакунок;встановити;встановлення;вилучити;вилучення;оновлення;оновити; ++Keywords[x-test]=xxprogramxx;xxsoftwarexx;xxrepositoryxx;xxpackagexx;xxinstallxx;xxremovexx;xxupdatexx;xxappsxx;xxapplicationsxx; ++Keywords[zh_CN]=program;software;repository;package;install;remove;update;apps;applications;程序;软件;软件源;包;安装;移除;升级;应用程序; ++Keywords[zh_TW]=program;software;repository;package;install;remove;update;apps;applications; +-- +2.5.0 + diff --git a/0003-Remove-deprecated-file-fix-install-file-name.patch b/0003-Remove-deprecated-file-fix-install-file-name.patch new file mode 100644 index 0000000..f276001 --- /dev/null +++ b/0003-Remove-deprecated-file-fix-install-file-name.patch @@ -0,0 +1,83 @@ +From 5861150a36d34ed0c149a2dbe8ed3722b4ac1ab2 Mon Sep 17 00:00:00 2001 +From: Aleix Pol +Date: Thu, 10 Sep 2015 00:40:34 +0200 +Subject: [PATCH 3/3] Remove deprecated file, fix install file name + +--- + discover/CMakeLists.txt | 3 +- + discover/muon-discover-category.desktop | 50 --------------------------------- + 2 files changed, 1 insertion(+), 52 deletions(-) + delete mode 100755 discover/muon-discover-category.desktop + +diff --git a/discover/CMakeLists.txt b/discover/CMakeLists.txt +index 56d14d6..b836507 100644 +--- a/discover/CMakeLists.txt ++++ b/discover/CMakeLists.txt +@@ -28,7 +28,6 @@ target_link_libraries(muon-discover LINK_PUBLIC KF5::KIOWidgets + + install(TARGETS muon-discover ${INSTALL_TARGETS_DEFAULT_ARGS} ) + +-install(PROGRAMS muon-discover.desktop muon-discover-category.desktop +- DESTINATION ${XDG_APPS_INSTALL_DIR} ) ++install(PROGRAMS org.kde.discover.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) + install(FILES featured.json DESTINATION ${DATA_INSTALL_DIR}/muondiscover) + install(FILES muondiscoverui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/muondiscover) +diff --git a/discover/muon-discover-category.desktop b/discover/muon-discover-category.desktop +deleted file mode 100755 +index 42ee70f..0000000 +--- a/discover/muon-discover-category.desktop ++++ /dev/null +@@ -1,50 +0,0 @@ +-[Desktop Entry] +-Name=Install More... +-Name[ast]=Instalar más... +-Name[bg]=Инсталиране на още... +-Name[bs]=Instaliraj još... +-Name[ca]=Instal·la'n més... +-Name[ca@valencia]=Instal·la'n més... +-Name[cs]=Nainstalovat více ... +-Name[da]=Installér mere... +-Name[de]=Mehr installieren ... +-Name[el]=Εγκατάσταση περισσότερων... +-Name[en_GB]=Install More... +-Name[es]=Instalar más... +-Name[et]=Rohkem tarkvara... +-Name[fi]=Asenna lisää… +-Name[fr]=Installer plus... +-Name[ga]=Suiteáil Tuilleadh... +-Name[gl]=Instalar máis... +-Name[hu]=Több telepítése… +-Name[id]=Pasang Lebih... +-Name[it]=Installa altro... +-Name[kk]=Тағы орнату... +-Name[ko]=더 설치... +-Name[lt]=Įdiegti daugiau... +-Name[mr]=अजुन प्रतिष्ठापीत करा... +-Name[nb]=Installer flere … +-Name[nds]=Mehr installeren... +-Name[nl]=Meer installeren... +-Name[pa]=…ਹੋਰ ਇੰਸਟਾਲ +-Name[pl]=Wgraj więcej... +-Name[pt]=Instalar Mais... +-Name[pt_BR]=Instalar mais... +-Name[ro]=Instalează mai multe... +-Name[ru]=Установить ещё... +-Name[sk]=Inštalovať viac... +-Name[sl]=Namesti več ... +-Name[sr]=Инсталирајте још... +-Name[sr@ijekavian]=Инсталирајте још... +-Name[sr@ijekavianlatin]=Instalirajte još... +-Name[sr@latin]=Instalirajte još... +-Name[sv]=Installera fler... +-Name[tr]=Daha Fazla Yükle... +-Name[uk]=Встановити ще… +-Name[x-test]=xxInstall More...xx +-Name[zh_CN]=安装更多... +-Name[zh_TW]=安裝更多... +-Exec=muon-discover --category @category +-Icon=muondiscover +-Type=Application +-NoDisplay=true +-- +2.5.0 + diff --git a/muon-5.3.1-dt.patch b/muon-5.3.1-dt.patch index e7b23bd..4b5f3cb 100644 --- a/muon-5.3.1-dt.patch +++ b/muon-5.3.1-dt.patch @@ -1,7 +1,7 @@ -diff --git a/discover/muon-discover.desktop b/discover/muon-discover.desktop +diff --git a/discover/org.kde.discover.desktop b/discover/org.kde.discover.desktop index a3f8597..b3f042e 100644 ---- a/discover/muon-discover.desktop -+++ b/discover/muon-discover.desktop +--- a/discover/org.kde.discover.desktop ++++ b/discover/org.kde.discover.desktop @@ -103,19 +103,19 @@ Keywords[de]=Programm;Software;Archiv;Repository;Paket;Installieren;Entfernen;Ak Keywords[el]=πρόγραμμα;λογισμικό;αποθετήριο;πακέτο;εγκατάσταση;αφαίρεση;ενημέρωση;εφαρμογές; Keywords[en_GB]=program;software;repository;package;install;remove;update;apps;applications; diff --git a/muon-5.4.1-appstream.patch b/muon-5.4.1-appstream.patch deleted file mode 100644 index 4ab1971..0000000 --- a/muon-5.4.1-appstream.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up muon-5.4.1/CMakeLists.txt.appstream muon-5.4.1/CMakeLists.txt ---- muon-5.4.1/CMakeLists.txt.appstream 2015-09-03 05:38:25.000000000 -0500 -+++ muon-5.4.1/CMakeLists.txt 2015-09-09 13:11:26.666887689 -0500 -@@ -33,7 +33,7 @@ else() - endif() - - if(packagekitqt5_FOUND OR AkabeiClient_FOUND) -- find_package(AppstreamQt 1.1) -+ find_package(AppstreamQt 0.8.4) - endif() - endif() - find_package(KF5Attica) diff --git a/muon.spec b/muon.spec index a625193..789546d 100644 --- a/muon.spec +++ b/muon.spec @@ -2,17 +2,20 @@ Name: muon Summary: A collection of package management tools for KDE Version: 5.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://projects.kde.org/projects/kde/workspace/muon Source0: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz +## upstream patches +Patch1: 0001-Require-the-right-ASQt-version.patch +Patch2: 0002-Rename-desktop-file.patch +Patch3: 0003-Remove-deprecated-file-fix-install-file-name.patch + ## upstreamable patches -# fix .desktop file validation -Patch1: muon-5.3.1-dt.patch -# fix appstream-qt version detection -Patch2: muon-5.4.1-appstream.patch +Patch50: muon-5.3.1-dt.patch + BuildRequires: appstream-qt-devel >= 0.8.4 BuildRequires: cmake @@ -110,9 +113,8 @@ cat plasma_applet_org.kde.muonnotifier.lang >> muon-updater.lang rm -fv %{buildroot}%{_libdir}/libmuonprivate.so %check -desktop-file-validate %{buildroot}%{_datadir}/applications/muon-discover-category.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/muon-discover.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/muon-updater.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.discover.desktop %files @@ -134,8 +136,8 @@ update-desktop-database -q 2> /dev/null ||: %files discover -f muon-discover.lang %{_bindir}/muon-discover -%{_datadir}/applications/muon-discover-category.desktop -%{_datadir}/applications/muon-discover.desktop +%{_datadir}/applications/org.kde.discover.desktop + %{_datadir}/icons/hicolor/*/apps/muondiscover.* %{_datadir}/muondiscover/ %{_datadir}/kxmlgui5/muondiscover/ @@ -167,6 +169,9 @@ update-desktop-database -q 2> /dev/null ||: %changelog +* Tue Sep 29 2015 Rex Dieter 5.4.1-2 +- pull in upstream fixes (notably discover .desktop rename) + * Wed Sep 09 2015 Rex Dieter - 5.4.1-1 - 5.4.1