Some refactoring of common variables in Makefiles to the new kolab.mk.

37 files changed, 0 insertions, 489 deletions

diff --git a/pear/Horde_Argv/Makefile b/pear/Horde_Argv/Makefile
index c4b6d0f..4ecd552 100644
--- a/pear/Horde_Argv/Makefile
+++ b/pear/Horde_Argv/Makefile
@@ -5,19 +5,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 
diff --git a/pear/Horde_Auth/Makefile b/pear/Horde_Auth/Makefile
index c4b6d0f..4ecd552 100644
--- a/pear/Horde_Auth/Makefile
+++ b/pear/Horde_Auth/Makefile
@@ -5,19 +5,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 
diff --git a/pear/Horde_Browser/Makefile b/pear/Horde_Browser/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_Browser/Makefile
+++ b/pear/Horde_Browser/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_CLI/Makefile b/pear/Horde_CLI/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_CLI/Makefile
+++ b/pear/Horde_CLI/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_Cache/Makefile b/pear/Horde_Cache/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_Cache/Makefile
+++ b/pear/Horde_Cache/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_Cipher/Makefile b/pear/Horde_Cipher/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_Cipher/Makefile
+++ b/pear/Horde_Cipher/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_DOM/Makefile b/pear/Horde_DOM/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_DOM/Makefile
+++ b/pear/Horde_DOM/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_DataTree/Makefile b/pear/Horde_DataTree/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_DataTree/Makefile
+++ b/pear/Horde_DataTree/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_Date/Makefile b/pear/Horde_Date/Makefile
index 5646b49..cd7f893 100644
--- a/pear/Horde_Date/Makefile
+++ b/pear/Horde_Date/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 #SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
 
diff --git a/pear/Horde_Framework/Makefile b/pear/Horde_Framework/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_Framework/Makefile
+++ b/pear/Horde_Framework/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_Group/Makefile b/pear/Horde_Group/Makefile
index 1d5164f..fd22c3a 100644
--- a/pear/Horde_Group/Makefile
+++ b/pear/Horde_Group/Makefile
@@ -5,19 +5,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_History/Makefile b/pear/Horde_History/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_History/Makefile
+++ b/pear/Horde_History/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_LDAP/Makefile b/pear/Horde_LDAP/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_LDAP/Makefile
+++ b/pear/Horde_LDAP/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_MIME/Makefile b/pear/Horde_MIME/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_MIME/Makefile
+++ b/pear/Horde_MIME/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_NLS/Makefile b/pear/Horde_NLS/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_NLS/Makefile
+++ b/pear/Horde_NLS/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_Notification/Makefile b/pear/Horde_Notification/Makefile
index 46089f9..28fd9ab 100644
--- a/pear/Horde_Notification/Makefile
+++ b/pear/Horde_Notification/Makefile
@@ -4,23 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
 
diff --git a/pear/Horde_Perms/Makefile b/pear/Horde_Perms/Makefile
index 1d5164f..fd22c3a 100644
--- a/pear/Horde_Perms/Makefile
+++ b/pear/Horde_Perms/Makefile
@@ -5,19 +5,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_Prefs/Makefile b/pear/Horde_Prefs/Makefile
index 46089f9..28fd9ab 100644
--- a/pear/Horde_Prefs/Makefile
+++ b/pear/Horde_Prefs/Makefile
@@ -4,23 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
 
diff --git a/pear/Horde_Secret/Makefile b/pear/Horde_Secret/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_Secret/Makefile
+++ b/pear/Horde_Secret/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_Serialize/Makefile b/pear/Horde_Serialize/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_Serialize/Makefile
+++ b/pear/Horde_Serialize/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_SessionObjects/Makefile b/pear/Horde_SessionObjects/Makefile
index 6be60fd..d1b2fb4 100644
--- a/pear/Horde_SessionObjects/Makefile
+++ b/pear/Horde_SessionObjects/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_Util/Makefile b/pear/Horde_Util/Makefile
index 1d5164f..fd22c3a 100644
--- a/pear/Horde_Util/Makefile
+++ b/pear/Horde_Util/Makefile
@@ -5,19 +5,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/Horde_iCalendar/Makefile b/pear/Horde_iCalendar/Makefile
index a6e9f5c..5287b81 100644
--- a/pear/Horde_iCalendar/Makefile
+++ b/pear/Horde_iCalendar/Makefile
@@ -5,19 +5,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 EXTRA=ChangeLog HK-GW-iCalendar-Quoted_parameters.patch package.xml
 
diff --git a/pear/PEAR-Auth_SASL/Makefile b/pear/PEAR-Auth_SASL/Makefile
index d788ea9..45a41c3 100644
--- a/pear/PEAR-Auth_SASL/Makefile
+++ b/pear/PEAR-Auth_SASL/Makefile
@@ -5,19 +5,6 @@ PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/PEAR-Date/Makefile b/pear/PEAR-Date/Makefile
index d788ea9..45a41c3 100644
--- a/pear/PEAR-Date/Makefile
+++ b/pear/PEAR-Date/Makefile
@@ -5,19 +5,6 @@ PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/PEAR-HTTP_Request/Makefile b/pear/PEAR-HTTP_Request/Makefile
index 93f1fc7..b7ac36a 100644
--- a/pear/PEAR-HTTP_Request/Makefile
+++ b/pear/PEAR-HTTP_Request/Makefile
@@ -5,19 +5,6 @@ PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/PEAR-Horde-Channel/Makefile b/pear/PEAR-Horde-Channel/Makefile
index f0f112e..7b510eb 100644
--- a/pear/PEAR-Horde-Channel/Makefile
+++ b/pear/PEAR-Horde-Channel/Makefile
@@ -1,18 +1,5 @@
 include ../../kolab.mk
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 PACKAGE = PEAR-Horde-Channel
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
diff --git a/pear/PEAR-Log/Makefile b/pear/PEAR-Log/Makefile
index d788ea9..45a41c3 100644
--- a/pear/PEAR-Log/Makefile
+++ b/pear/PEAR-Log/Makefile
@@ -5,19 +5,6 @@ PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/PEAR-Mail-mimeDecode/Makefile b/pear/PEAR-Mail-mimeDecode/Makefile
index d788ea9..45a41c3 100644
--- a/pear/PEAR-Mail-mimeDecode/Makefile
+++ b/pear/PEAR-Mail-mimeDecode/Makefile
@@ -5,19 +5,6 @@ PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/PEAR-Mail/Makefile b/pear/PEAR-Mail/Makefile
index d788ea9..45a41c3 100644
--- a/pear/PEAR-Mail/Makefile
+++ b/pear/PEAR-Mail/Makefile
@@ -5,19 +5,6 @@ PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/PEAR-Net_LDAP2/Makefile b/pear/PEAR-Net_LDAP2/Makefile
index 2dbaf23..e89fbf7 100644
--- a/pear/PEAR-Net_LDAP2/Makefile
+++ b/pear/PEAR-Net_LDAP2/Makefile
@@ -5,19 +5,6 @@ PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9RC.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/PEAR-Net_LMTP/Makefile b/pear/PEAR-Net_LMTP/Makefile
index 93f1fc7..b7ac36a 100644
--- a/pear/PEAR-Net_LMTP/Makefile
+++ b/pear/PEAR-Net_LMTP/Makefile
@@ -5,19 +5,6 @@ PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/PEAR-Net_SMTP/Makefile b/pear/PEAR-Net_SMTP/Makefile
index 93f1fc7..b7ac36a 100644
--- a/pear/PEAR-Net_SMTP/Makefile
+++ b/pear/PEAR-Net_SMTP/Makefile
@@ -5,19 +5,6 @@ PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/PEAR-Net_Socket/Makefile b/pear/PEAR-Net_Socket/Makefile
index d788ea9..45a41c3 100644
--- a/pear/PEAR-Net_Socket/Makefile
+++ b/pear/PEAR-Net_Socket/Makefile
@@ -5,19 +5,6 @@ PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/PEAR-Net_URL/Makefile b/pear/PEAR-Net_URL/Makefile
index 93f1fc7..b7ac36a 100644
--- a/pear/PEAR-Net_URL/Makefile
+++ b/pear/PEAR-Net_URL/Makefile
@@ -5,19 +5,6 @@ PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all
diff --git a/pear/PEAR-PHPUnit-Channel/Makefile b/pear/PEAR-PHPUnit-Channel/Makefile
index a20c775..8461a18 100644
--- a/pear/PEAR-PHPUnit-Channel/Makefile
+++ b/pear/PEAR-PHPUnit-Channel/Makefile
@@ -1,18 +1,5 @@
 include ../../kolab.mk
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 PACKAGE = PEAR-PHPUnit-Channel
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
diff --git a/pear/PHPUnit/Makefile b/pear/PHPUnit/Makefile
index ca34834..8ecb740 100644
--- a/pear/PHPUnit/Makefile
+++ b/pear/PHPUnit/Makefile
@@ -4,19 +4,6 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.phpunit.de/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all