From 15f33b33e62a703105671dff675689265da88b16 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 1 Feb 2008 19:53:04 +0200
Subject: [PATCH] Ditch the "system" %_topdir, default to ~/rpmbuild instead -
 building as root should be discouraged and /usr/src for building stuff   is
 horribly wrong anyway

---
 Makefile.am | 47 -----------------------------------------------
 lib/rpmrc.c |  2 +-
 macros.in   |  2 +-
 3 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 284b15e..1269d10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -212,18 +212,6 @@ EXTRA_DIST += rpmpopt.in
 
 usrsrcdir = $(prefix)/src
 
-pkgsrcdir = $(usrsrcdir)/packages
-pkgsrc_RPMSdir = $(pkgsrcdir)/RPMS
-pkgsrc_RPMS_DATA =
-pkgsrc_SRPMSdir = $(pkgsrcdir)/SRPMS
-pkgsrc_SRPMS_DATA =
-pkgsrc_SPECSdir = $(pkgsrcdir)/SPECS
-pkgsrc_SPECS_DATA =
-pkgsrc_SOURCESdir = $(pkgsrcdir)/SOURCES
-pkgsrc_SOURCES_DATA =
-pkgsrc_BUILDdir = $(pkgsrcdir)/BUILD
-pkgsrc_BUILD_DATA =
-
 rpmvardir = $(localstatedir)/lib/rpm
 rpmvar_DATA =
 
@@ -252,42 +240,7 @@ install-exec-hook:
 	done
 
 install-data-local:
-	@case "@host_cpu@" in \
-	*86)	$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/i386 ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/i486 ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/i586 ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/i686 ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/geode ;;\
-	alpha*) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/alpha ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/alphaev6 ;;\
-	arm*)	$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv3l ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv4l ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv4tl ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv5tel ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv5tejl ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv6l ;;\
-	sparc*) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/sparc ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/sparcv8 ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/sparcv9 ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/sparcv9v ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/sparc64 ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/sparc64v ;;\
-	ia64*)	$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ia64 ;;\
-	s390*)	$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/s390 ;;\
-	mipsel*) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/mipsel ;;\
-	mips*)  $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/mips ;;\
-	powerpc*) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppciseries ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppcpseries ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64 ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64iseries ;\
-		$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64pseries ;;\
-	*)	$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/@host_cpu@ ;;\
-	esac
-	$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/noarch
 	@case "@host_os@" in \
-	mint) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/m68kmint ;;\
 	solaris*|linux*|darwin*) \
 	   DESTDIR="$(DESTDIR)" pkglibdir="$(rpmconfigdir)" $(SHELL) $(top_srcdir)/installplatform rpmrc macros platform ;; \
 	esac
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 76aa413..2b25197 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -473,7 +473,7 @@ static void setDefaults(void)
     addMacro(NULL, "_preScriptEnvironment",NULL, prescriptenviron,RMIL_DEFAULT);
 
     addMacroDefault("_topdir",
-		"/usr/src/packages",	"%{_usrsrc}/packages");
+		"/usr/src/packages",		"%(echo $HOME)/rpmbuild");
     addMacroDefault("_tmppath",
 		LOCALSTATEDIR "/tmp",		"%{_var}/tmp");
     addMacroDefault("_dbpath",
diff --git a/macros.in b/macros.in
index 10f7622..bc2138a 100644
--- a/macros.in
+++ b/macros.in
@@ -221,7 +221,7 @@ package or when debugging this package.\
 %_tmppath		%{_var}/tmp
 
 #	Path to top of build area.
-%_topdir		%{_usrsrc}/packages
+%_topdir		%(echo $HOME)/rpmbuild
 
 #	The path to the unzip executable (legacy, use %{__unzip} instead).
 %_unzipbin		%{__unzip}
-- 
2.7.4