From d6f9336cda924034cd8fb5b058dc18cb71f0c329 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Mon, 12 Dec 2011 01:59:14 +0100
Subject: [PATCH] Makefile: manage WITHKDE3 variable to allow disabling
 installation of KDE3 dependent components

---
 Makefile | 31 ++++++++++++++++++++++++-------
 VERSION  |  2 +-
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index e520ce6..265533a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,10 @@ include VERSION
 include SRPMSVERSIONS
 
 PACKAGE = desktop-base-openmamba
-
 DISTROID = openmamba
 
+WITHKDE3 := 1
+
 RPM_VENDOR = openmamba
 RPM_DISTRIBUTION = openmamba
 RPM_DISTROEXT = mamba
@@ -159,15 +160,18 @@ install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(sbindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(distrobindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kde4bindir)
+ifeq ($(WITHKDE3),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdeautostartdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdeconfigdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdewallpapersdir)
+endif
 	@$(INSTALL_DIR) $(DESTDIR)$(mambaimagesdir)
 	cp -r etc/polkit-1 $(DESTDIR)$(sysconfdir)/
 	cp -r etc/prelink.conf.d $(DESTDIR)$(sysconfdir)/
 	$(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir)
 	cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/
+ifeq ($(WITHKDE3),1)
 	cp -r kde/apps $(DESTDIR)$(kdedatadir)
 	$(INSTALL_DATA) kde/autostart/kmix.desktop $(DESTDIR)$(kdeautostartdir)/kmix.desktop
 	$(INSTALL_DATA) kde/config/*rc $(DESTDIR)$(kdeconfigdir)/
@@ -175,6 +179,7 @@ install-kde-distro-addons: dist-update
 	$(INSTALL_DATA) kde/config/kdeglobals $(DESTDIR)$(kdeconfigdir)/kdeglobals
 	$(INSTALL_DATA) kde/wallpapers/$(WALLPAPER).desktop $(DESTDIR)$(kdewallpapersdir)
 	$(INSTALL_DATA) kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kdewallpapersdir)
+endif
 	$(INSTALL_DATA) kde/wallpapers/{$(COMPIZ_WALLPAPERS)} $(DESTDIR)$(mambaimagesdir)
 #	$(INSTALL_SCRIPT) kde/bin/konsole-nofork $(DESTDIR)$(kde4bindir)
 
@@ -212,26 +217,35 @@ install-icons:
 	@for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
 	   $(INSTALL_DIR) $(DESTDIR)$(iconsdir)/$$i/apps/; \
 	   $(INSTALL_DATA) mambabase/mamba-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mamba.png; \
+	done
+ifeq ($(WITHKDE3),1)
+	@for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
 	   $(INSTALL_DATA) mambawelcome/mambawelcome-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mambawelcome.png; \
-#	   $(INSTALL_DATA) xramdr/xramdr-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/xramdr.png; \
 	   $(INSTALL_DATA) bootrecover/bootrecover-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/bootrecover.png; \
 	done
+endif
+#	   $(INSTALL_DATA) xramdr/xramdr-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/xramdr.png \
 
 install-mambabase:
 	@$(INSTALL_DIR) $(DESTDIR)$(mambabasedatadir)
-	$(INSTALL_SCRIPT) mambabase/mambabase.kmdr $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_DATA) mambabase/mambabase.db $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_SCRIPT) mambabase/mambabase.sh $(DESTDIR)$(mambabasedatadir)
+ifeq ($(WITHKDE3),1)
+	$(INSTALL_SCRIPT) mambabase/mambabase.kmdr $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_DATA) mambabase/mambabase.desktop $(DESTDIR)$(xdg_appsdir)
 	$(INSTALL_DATA) mambabase/mambabase-autostart.desktop $(DESTDIR)$(mambabasedatadir)
+endif
 
 install-mambareport:
+	$(INSTALL_SCRIPT) mambareport/openmamba-makereport $(DESTDIR)$(bindir)
+ifeq ($(WITHKDE3),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(mambareportdatadir)
 	$(INSTALL_SCRIPT) mambareport/mambareport.kmdr $(DESTDIR)$(mambareportdatadir)
-	$(INSTALL_SCRIPT) mambareport/openmamba-makereport $(DESTDIR)$(bindir)
 	$(INSTALL_DATA) mambareport/mambareport.desktop $(DESTDIR)$(xdg_appsdir)
+endif
 
 install-mambawelcome:
+ifeq ($(WITHKDE3),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(mambawelcomedatadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/rc.d/{init.d,rc5.d}
 	$(INSTALL_SCRIPT) mambawelcome/mambawelcome.kmdr $(DESTDIR)$(mambawelcomedatadir)
@@ -241,6 +255,7 @@ install-mambawelcome:
 	$(INSTALL_DATA) gpl-it.html $(DESTDIR)$(mambawelcomedatadir)/gpl-it.html
 	$(INSTALL_DATA) gpl-es.html $(DESTDIR)$(mambawelcomedatadir)/gpl-es.html
 	ln -s ../init.d/mambawelcome $(DESTDIR)$(sysconfdir)/rc.d/rc5.d/S99mambawelcome
+endif
 
 install-xramdr:
 	@$(INSTALL_DIR) $(DESTDIR)$(xramdrdatadir)
@@ -249,9 +264,11 @@ install-xramdr:
 
 install-bootrecover:
 	@$(INSTALL_DIR) $(DESTDIR)$(bootrecoverdatadir)
-	$(INSTALL_SCRIPT) bootrecover/bootrecover.kmdr $(DESTDIR)$(bootrecoverdatadir)
 	$(INSTALL_SCRIPT) bootrecover/bootrecover.sh $(DESTDIR)$(bootrecoverdatadir)
+ifeq ($(WITHKDE3),1)
+	$(INSTALL_SCRIPT) bootrecover/bootrecover.kmdr $(DESTDIR)$(bootrecoverdatadir)
 	$(INSTALL_DATA) bootrecover/openmamba-bootrecover.desktop $(DESTDIR)$(xdg_appsdir)
+endif
 
 install-usbinstall:
 	@$(INSTALL_DIR) $(DESTDIR)$(usbinstalldatadir)
@@ -267,11 +284,11 @@ install: $(pck_infiles:.in=) \
 	install-kde-distro-addons \
 	install-distromenu \
 	install-srpms \
+	install-usbinstall \
+	install-openmamba-update \
 	install-mambabase \
 	install-mambawelcome \
 	install-mambareport \
-	install-usbinstall \
-	install-openmamba-update \
 	install-bootrecover \
 	install-locales \
 	install-icons
diff --git a/VERSION b/VERSION
index 1021077..e5f0de1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION = 2.2.37
+VERSION = 2.3.0