diff --git a/Makefile b/Makefile index 5c84cc5..91954a9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Makefile for desktop-base-kde -# Copyright (C) 2004-2021 by Silvan Calarco +# Copyright (C) 2004-2022 by Silvan Calarco # Copyright (C) 2005-2007 by Davide Madrisan include VERSION @@ -12,10 +12,6 @@ RPM_VENDOR = openmamba RPM_DISTRIBUTION = openmamba RPM_DISTROEXT = mamba -SYSCONFIGFILE = netsrpminstall - -WALLPAPERS = openmamba_Bamboo,openmamba_Circles -DEFAULT_WALLPAPER = openmamba_Circles DESKTOP_DESKTOPTHEME = openmamba #SCREENSAVER = $(DISTROid).desktop @@ -32,12 +28,8 @@ sysconfdir = /etc sbindir = ${exec_prefix}/sbin bindir = ${exec_prefix}/bin datadir = ${prefix}/share -initrddir = ${sysconfdir}/rc.d/init.d mandir = ${prefix}/usr/share/man sysconfigdir= ${sysconfdir}/sysconfig -mambabasedatadir = ${datadir}/openmamba/mambabase -mambawelcomedatadir = ${datadir}/openmamba/mambawelcome -bootrecoverdatadir = ${datadir}/openmamba/bootrecover iconsdir = ${datadir}/icons/hicolor kdeprefixdir = $(shell kde4-config --prefix) kdedatadir = ${kdeprefixdir}/share @@ -46,7 +38,6 @@ kdebindir = ${kdeprefixdir}/bin kdeautostartdir = ${kdedatadir}/autostart kdeconfigdir = ${kdedatadir}/config kde5configdir = ${sysconfdir}/xdg -kde5wallpapersdir = ${datadir}/wallpapers kdeappsdir = ${kdedatadir}/apps kde5appsdir = ${prefix}/share localesdir = ${kdedatadir}/locale @@ -73,7 +64,6 @@ pck_srpms = flashplugin msttcorefonts win32codecs skype pck_infiles := $(wildcard kde/config/*.in \ kde/scripts/*.in \ - kde/wallpapers/*.in \ SRPMS/*/*.in) pck_sysconfigfile := distroutils.sysconfig @@ -98,12 +88,10 @@ pck_catalogs2 := $(wildcard bootrecover/po/*.po) s,@datadir@,${datadir},g;\ s,@distrobindir@,$(distrobindir),g;\ s,@distrokdedir@,$(distrokdedir),g;\ - s,@distrosrpmsdir@,$(distrosrpmsdir),g;\ - s,@wallpaper@,$(DEFAULT_WALLPAPER),g;\ s,@desktoptheme@,$(DEFAULT_DESKTOPTHEME),g;\ s,@screensaver@,${SCREENSAVER},g;" $< > $@ -all: dist-update locales wallpapers +all: dist-update locales dist-update: $(pck_infiles:.in=) @@ -111,19 +99,6 @@ dist-update: $(pck_infiles:.in=) locales: $(pck_catalogs:.po=.mo) $(pck_catalogs1:.po=.mo) $(pck_catalogs2:.po=.mo) -wallpapers: - @for w in openmamba_Circles; do \ - mkdir -p kde/wallpapers/$${w}/contents/images; \ - convert src/wallpapers/$${w}.png +repage -gravity SouthEast -resize 400 -crop 400x250+0+0 +repage kde/wallpapers/$${w}/contents/screenshot.png; \ - for s in 1280x800 1440x900 1920x1200; do \ - convert src/wallpapers/$${w}.png +repage -gravity SouthEast -resize $${s/x*} \ - -crop $${s}+0+0 +repage kde/wallpapers/$${w}/contents/images/$${s}.png; \ - done; \ - for s in 1024x768 1280x1024 1600x1200; do \ - convert src/wallpapers/$${w}.png +repage -gravity SouthEast -resize x$${s/*x} \ - -crop $${s}+0+0 +repage kde/wallpapers/$${w}/contents/images/$${s}.png; \ - done; done - install-kde-distro-addons: dist-update @$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/pam.d @$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/sudoers.d/ @@ -132,7 +107,6 @@ install-kde-distro-addons: dist-update @$(INSTALL_DIR) $(DESTDIR)$(sbindir) @$(INSTALL_DIR) $(DESTDIR)$(kde5datadir) @$(INSTALL_DIR) $(DESTDIR)$(kde5configdir) - @$(INSTALL_DIR) $(DESTDIR)$(kde5wallpapersdir) @$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/color-schemes @$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/konqueror/profiles @$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/konsole @@ -140,20 +114,6 @@ install-kde-distro-addons: dist-update $(INSTALL_DATA) kde/config/powerdevilrc $(DESTDIR)$(kde5configdir)/powerdevilrc $(INSTALL_DATA) kde/config/kwalletrc $(DESTDIR)$(kde5configdir)/kwalletrc $(INSTALL_DATA) kde/apps/color-schemes/OpenmambaGreen.colors $(DESTDIR)$(kde5appsdir)/color-schemes/OpenmambaGreen.colors - cp -a kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kde5wallpapersdir) - -install-srpms: - @$(INSTALL_DIR) $(DESTDIR)$(distrosrpmsdir) - @$(INSTALL_DIR) $(DESTDIR)$(sysconfigdir) - :> $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE) - @$(INSTALL_DIR) $(DESTDIR)$(sysconfigdir) - for pck in $(pck_srpms); do\ - rpmbuild -bs SRPMS/$$pck/$${pck}.spec \ - --define="_sourcedir `pwd`/SRPMS/$$pck" \ - --define="_srcrpmdir $(DESTDIR)$(distrosrpmsdir)" || exit 1;\ - cat SRPMS/$$pck/$(pck_sysconfigfile) >> \ - $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE);\ - done install-icons: @for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \ @@ -164,7 +124,6 @@ install: $(pck_infiles:.in=) \ install-kde-distro-addons dist: clean - @git log > ChangeLog.git @mkdir /tmp/$(distdir) @cp -a * /tmp/$(distdir)/ @rm -f $(dist_archive);\ @@ -180,4 +139,3 @@ dist-rpm: dist clean: rm -f $(dist_archive) rm -f $(patsubst %.in,%,$(pck_infiles)) - rm -rf kde/wallpapers/openmamba_Circles/contents diff --git a/kde/wallpapers/openmamba_Bamboo/contents/images/1024x768.jpg b/kde/wallpapers/openmamba_Bamboo/contents/images/1024x768.jpg deleted file mode 100644 index 2a80fcc..0000000 Binary files a/kde/wallpapers/openmamba_Bamboo/contents/images/1024x768.jpg and /dev/null differ diff --git a/kde/wallpapers/openmamba_Bamboo/contents/images/1280x1024.jpg b/kde/wallpapers/openmamba_Bamboo/contents/images/1280x1024.jpg deleted file mode 100644 index 045e189..0000000 Binary files a/kde/wallpapers/openmamba_Bamboo/contents/images/1280x1024.jpg and /dev/null differ diff --git a/kde/wallpapers/openmamba_Bamboo/contents/images/1280x800.jpg b/kde/wallpapers/openmamba_Bamboo/contents/images/1280x800.jpg deleted file mode 100644 index 3d31c78..0000000 Binary files a/kde/wallpapers/openmamba_Bamboo/contents/images/1280x800.jpg and /dev/null differ diff --git a/kde/wallpapers/openmamba_Bamboo/contents/images/1440x900.jpg b/kde/wallpapers/openmamba_Bamboo/contents/images/1440x900.jpg deleted file mode 100644 index eadd11e..0000000 Binary files a/kde/wallpapers/openmamba_Bamboo/contents/images/1440x900.jpg and /dev/null differ diff --git a/kde/wallpapers/openmamba_Bamboo/contents/images/1600x1200.jpg b/kde/wallpapers/openmamba_Bamboo/contents/images/1600x1200.jpg deleted file mode 100644 index c7c0aa0..0000000 Binary files a/kde/wallpapers/openmamba_Bamboo/contents/images/1600x1200.jpg and /dev/null differ diff --git a/kde/wallpapers/openmamba_Bamboo/contents/images/1920x1200.jpg b/kde/wallpapers/openmamba_Bamboo/contents/images/1920x1200.jpg deleted file mode 100644 index 85a5e0d..0000000 Binary files a/kde/wallpapers/openmamba_Bamboo/contents/images/1920x1200.jpg and /dev/null differ diff --git a/kde/wallpapers/openmamba_Bamboo/contents/screenshot.png b/kde/wallpapers/openmamba_Bamboo/contents/screenshot.png deleted file mode 100644 index 5d53f57..0000000 Binary files a/kde/wallpapers/openmamba_Bamboo/contents/screenshot.png and /dev/null differ diff --git a/kde/wallpapers/openmamba_Bamboo/metadata.desktop b/kde/wallpapers/openmamba_Bamboo/metadata.desktop deleted file mode 100644 index 53a5b8d..0000000 --- a/kde/wallpapers/openmamba_Bamboo/metadata.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=openmamba Bamboo -Name[it]=openmamba Bamboo -X-KDE-PluginInfo-Name=openmamba_Bamboo -X-KDE-PluginInfo-Author=Anna Gleede -X-KDE-PluginInfo-Email=amg@mambasoft.it -X-KDE-PluginInfo-License=LGPLv3 diff --git a/kde/wallpapers/openmamba_Circles/metadata.desktop b/kde/wallpapers/openmamba_Circles/metadata.desktop deleted file mode 100644 index 20c156d..0000000 --- a/kde/wallpapers/openmamba_Circles/metadata.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=openmamba Circles -Name[it]=openmamba Circles -X-KDE-PluginInfo-Name=openmamba_Circles -X-KDE-PluginInfo-Author=Cristina Iurissevich -X-KDE-PluginInfo-Email=info@openmamba.org -X-KDE-PluginInfo-License=LGPLv3 diff --git a/src/wallpapers/openmamba_Circles.png b/src/wallpapers/openmamba_Circles.png deleted file mode 100644 index 0dd3384..0000000 Binary files a/src/wallpapers/openmamba_Circles.png and /dev/null differ diff --git a/src/wallpapers/openmamba_Circles.svg b/src/wallpapers/openmamba_Circles.svg deleted file mode 100644 index e489c75..0000000 --- a/src/wallpapers/openmamba_Circles.svg +++ /dev/null @@ -1,488 +0,0 @@ - - - -image/svg+xml \ No newline at end of file