From fd893650c8d4c04efca49ab09d7923c2c0e81073 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Sun, 9 Feb 2014 04:04:13 -0800
Subject: Update how we remove files.

---
 rpm/include.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rpm/include.mk b/rpm/include.mk
index 27b6bd0e..e6916459 100644
--- a/rpm/include.mk
+++ b/rpm/include.mk
@@ -25,10 +25,11 @@ $(DIST_ARCHIVES): $(DISTFILES)
 	$(MAKE) $(AM_MAKEFLAGS) dist-gzip
 
 $(RPM_SOURCE): | $(RPM_BUILDDIR) $(DIST_ARCHIVES)
-	@rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_DIR)
 	@cp $(DIST_ARCHIVES) $(RPM_SOURCE)
 
 $(RPM_BUILD_TARGET): $(RPM_SOURCE) support/@PACKAGE@.spec
+	-@rm -f $(BUILD_RPMS) $(BUILD_SRPMS)
+	-@rm -rf $(BUILD_RPM_DIR)
 	@@RPMBUILD@ -ba $(top_srcdir)/support/@PACKAGE@.spec
 	@cp $(BUILD_RPMS) $(BUILD_SRPMS) .
 
@@ -39,7 +40,8 @@ rpm-sign: $(RPM_BUILD_TARGET)
 
 .PHONY: clean-rpm
 clean-rpm:
-	-@rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_SOURCE) $(BUILD_RPM_DIR) $(RPM_DIST)
+	-@rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_SOURCE) $(RPM_DIST)
+	-@rm -rf $(BUILD_RPM_DIR)
 
 rpm: $(RPM_BUILD_TARGET)
 dist-rpm: $(RPM_BUILD_TARGET)
-- 
cgit v1.2.1


From 30f2a0f97e193f632c64205abe83abca7ed08ee7 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Sun, 9 Feb 2014 04:19:48 -0800
Subject: Merge from template.

---
 rpm/include.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rpm/include.mk b/rpm/include.mk
index e6916459..bf9bd1a8 100644
--- a/rpm/include.mk
+++ b/rpm/include.mk
@@ -1,9 +1,10 @@
 # vim:ft=automake
 
 RPM_BUILDDIR= ~/rpmbuild
+RPM_SOURCESDIR= $(RPM_BUILDDIR)/SOURCES
 
 RPM_BUILD_TARGET= @PACKAGE@-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
-RPM_SOURCE= $(RPM_BUILDDIR)/SOURCES/$(DIST_ARCHIVES)
+RPM_SOURCE= $(RPM_SOURCESDIR)/$(DIST_ARCHIVES)
 
 RPMS=
 RPMS+= $(RPM_BUILD_TARGET)
@@ -24,8 +25,8 @@ $(RPM_BUILDDIR):
 $(DIST_ARCHIVES): $(DISTFILES)
 	$(MAKE) $(AM_MAKEFLAGS) dist-gzip
 
-$(RPM_SOURCE): | $(RPM_BUILDDIR) $(DIST_ARCHIVES)
-	@cp $(DIST_ARCHIVES) $(RPM_SOURCE)
+$(RPM_SOURCE): $(DIST_ARCHIVES) $(RPM_BUILDDIR)
+	@cp $< $@
 
 $(RPM_BUILD_TARGET): $(RPM_SOURCE) support/@PACKAGE@.spec
 	-@rm -f $(BUILD_RPMS) $(BUILD_SRPMS)
-- 
cgit v1.2.1