From 0d81a89138bab3c000f9918336770b2d6515972a Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 20 Oct 2019 14:21:26 +0200 Subject: [PATCH] mambabase: update Makefile and mambabase for rpm packaging --- Makefile | 20 +++++++------------- mambabase/mambabase | 2 ++ mambabase/mambabase-autostart.desktop | 2 +- mambabase/mambabase.desktop | 2 +- mambabase/mambabase.png | Bin 0 -> 12127 bytes mambabase/mambabase.py | 15 ++++++++------- 6 files changed, 19 insertions(+), 22 deletions(-) create mode 100755 mambabase/mambabase create mode 100644 mambabase/mambabase.png diff --git a/Makefile b/Makefile index e3bab86..8d0a74a 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,6 @@ endif PACKAGE = desktop-base-openmamba DISTROID = openmamba -WITHKDE3 := 1 WITHKDE3TOOLS := 1 RPM_VENDOR = openmamba @@ -60,12 +59,7 @@ mambareportdatadir = ${datadir}/openmamba/mambareport mambaimagesdir = ${datadir}/openmamba/images xramdrdatadir = ${datadir}/openmamba/xramdr iconsdir = ${datadir}/icons/hicolor -kdeprefixdir = $(shell kde-config --prefix) -kdedatadir = $(kdeprefixdir)/share -kdeautostartdir = ${kdedatadir}/autostart -kdeconfigdir = ${kdedatadir}/config localesdir = ${datadir}/locale -kdelocalesdir = ${kdedatadir}/locale pck_desktop = $(wildcard desktop/*.bz2) systemlogodir = ${datadir}/pixmaps xdg_appsdir = ${datadir}/applications @@ -133,15 +127,13 @@ dist-update: $(pck_infiles:.in=) locales: $(pck_catalogs:.po=.mo) $(pck_catalogs1:.po=.mo) install-locales: locales -ifeq ($(WITHKDE3TOOLS),1) @for f in $(pck_catalogs); do\ lang=`echo $$f | sed 's,.*/\(.*\)\.po,\1,'`;\ echo "installing i18n file for language \`$$lang'...";\ - dir="$(DESTDIR)$(kdelocalesdir)/$$lang/LC_MESSAGES";\ + dir="$(DESTDIR)$(datadir)/locale/$$lang/LC_MESSAGES";\ $(INSTALL_DIR) $$dir;\ $(INSTALL_DATA) $${f/.po/.mo} $$dir/mambabase.mo;\ done -endif @for f in $(pck_catalogs1); do\ lang=`echo $$f | sed 's,.*/\(.*\)\.po,\1,'`;\ echo "installing i18n file for language \`$$lang'...";\ @@ -210,12 +202,14 @@ install-icons: install-mambabase: @$(INSTALL_DIR) $(DESTDIR)$(mambabasedatadir) - $(INSTALL_SCRIPT) mambabase/mambabase.sh $(DESTDIR)$(mambabasedatadir) -ifeq ($(WITHKDE3TOOLS),1) - $(INSTALL_SCRIPT) mambabase/mambabase.kmdr $(DESTDIR)$(mambabasedatadir) + $(INSTALL_SCRIPT) mambabase/mambabase $(DESTDIR)$(bindir)/mambabase + $(INSTALL_SCRIPT) mambabase/mambabase.py $(DESTDIR)$(mambabasedatadir) + $(INSTALL_SCRIPT) mambabase/mambabase-pkggroups-parser.sh $(DESTDIR)$(mambabasedatadir) $(INSTALL_DATA) mambabase/mambabase.desktop $(DESTDIR)$(xdg_appsdir) $(INSTALL_DATA) mambabase/mambabase-autostart.desktop $(DESTDIR)$(mambabasedatadir) -endif + $(INSTALL_DATA) mambabase/openmamba.png $(DESTDIR)$(mambabasedatadir) + $(INSTALL_DATA) mambabase/mambabase.png $(DESTDIR)$(mambabasedatadir) + cp mambabase/*.ui $(DESTDIR)$(mambabasedatadir) install-mambareport: $(INSTALL_SCRIPT) mambareport/openmamba-makereport $(DESTDIR)$(bindir) diff --git a/mambabase/mambabase b/mambabase/mambabase new file mode 100755 index 0000000..11ad53e --- /dev/null +++ b/mambabase/mambabase @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/bin/python3 /usr/share/openmamba/mambabase/mambabase.py diff --git a/mambabase/mambabase-autostart.desktop b/mambabase/mambabase-autostart.desktop index d5a03d1..a5069b4 100755 --- a/mambabase/mambabase-autostart.desktop +++ b/mambabase/mambabase-autostart.desktop @@ -3,7 +3,7 @@ Name=mambabase GenericName=openmamba components installer GenericName[it]=Installazione componenti base di openmamba -Exec=kmdr-executor /usr/share/openmamba/mambabase/mambabase.kmdr +Exec=/usr/bin/mambabase Icon=mamba Terminal=0 Type=Application diff --git a/mambabase/mambabase.desktop b/mambabase/mambabase.desktop index 573247d..ad87487 100644 --- a/mambabase/mambabase.desktop +++ b/mambabase/mambabase.desktop @@ -3,7 +3,7 @@ Name=openmamba base components Name[it]=Componenti base di openmamba GenericName=openmamba base components installer GenericName[it]=Installazione dei componenti base di openmamba -Exec=kmdr-executor /usr/share/openmamba/mambabase/mambabase.kmdr +Exec=/usr/bin/mambabase Icon=mamba Terminal=0 Type=Application diff --git a/mambabase/mambabase.png b/mambabase/mambabase.png new file mode 100644 index 0000000000000000000000000000000000000000..7951ee3c747bcf27fe15231ea93d80fa5556cd7a GIT binary patch literal 12127 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 Vv1V5KfX)B_002ovPDHLkV1gVgD4+lU literal 0 HcmV?d00001 diff --git a/mambabase/mambabase.py b/mambabase/mambabase.py index 41d50f5..eb6dd9b 100755 --- a/mambabase/mambabase.py +++ b/mambabase/mambabase.py @@ -16,6 +16,7 @@ import gi gi.require_version('PackageKitGlib', '1.0') from gi.repository import PackageKitGlib as packagekit +DATADIR = os.path.dirname(os.path.realpath((__file__))) + "/" class InstallThread(QtCore.QThread): parent = None @@ -169,7 +170,7 @@ class MambabaseWizard(QtWidgets.QWizard): class WelcomePage(QtWidgets.QWizardPage): def __init__(self, parent=None): super(WelcomePage, self).__init__(parent) - uic.loadUi('WelcomePage.ui', self) + uic.loadUi(DATADIR + "WelcomePage.ui", self) self.show() @@ -179,7 +180,7 @@ class SelectGroupsPage(QtWidgets.QWizardPage): def __init__(self, parent=None): super(SelectGroupsPage, self).__init__(parent) - uic.loadUi('SelectGroupsPage.ui', self) + uic.loadUi(DATADIR + "SelectGroupsPage.ui", self) self.loadPkgGroups() self.show() @@ -197,7 +198,7 @@ class SelectGroupsPage(QtWidgets.QWizardPage): 'devel': self.inst_devel } # Load packages group db into a dict - result = subprocess.run(['/usr/libexec/mambabase-pkggroups-parser.sh'], + result = subprocess.run([DATADIR + "mambabase-pkggroups-parser.sh"], stdout=subprocess.PIPE) lines = result.stdout.decode('UTF-8').splitlines() for line in lines: @@ -237,7 +238,7 @@ class SelectExtraPage(QtWidgets.QWizardPage): def __init__(self, parent=None): super(SelectExtraPage, self).__init__(parent) - uic.loadUi('SelectExtraPage.ui', self) + uic.loadUi(DATADIR + "SelectExtraPage.ui", self) self.setCommitPage(True) self.setExtras() self.show() @@ -272,7 +273,7 @@ class InstallationPage(QtWidgets.QWizardPage): def __init__(self, parent=None): super(InstallationPage, self).__init__(parent) - uic.loadUi('InstallationPage.ui', self) + uic.loadUi(DATADIR + "InstallationPage.ui", self) self.setCommitPage(True) self.show() @@ -292,14 +293,14 @@ class InstallationPage(QtWidgets.QWizardPage): class FinishPage(QtWidgets.QWizardPage): def __init__(self, parent=None): super(FinishPage, self).__init__(parent) - uic.loadUi('FinishPage.ui', self) + uic.loadUi(DATADIR + "FinishPage.ui", self) self.show() if __name__ == '__main__': import sys app = QtWidgets.QApplication(sys.argv) - app.setWindowIcon(QtGui.QIcon("mamba-128x128.png")) + app.setWindowIcon(QtGui.QIcon(DATADIR + "mambabase.png")) gettext.install('mambabase', '/usr/share/locale') wizard = MambabaseWizard() wizard.show()