Cleanup of RPM build process - no more .git in tarball, use automake's dist-gzip...

Signed-off-by: Ondrej Mikle <ondrej.mikle@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index a80763d929bd0e4aa82c1bf8ae9a8286c6d86d97..e25e8ff2a287303029639b01b96c127f37baa550 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,23 +24,18 @@ EXTRA_DIST = \
 #install-data-local:
 #      $(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor
 
-# Assume a tarball is in .. for now.
-dist-rpm:
-       RPM_BUILD_DIR="/tmp/tor-rpm-build-$$$$";                \
-       rm -rf $$RPM_BUILD_DIR;                                 \
-       mkdir $$RPM_BUILD_DIR || exit 1;                        \
-       for subdir in BUILD RPMS SOURCES SPECS SRPMS; do        \
-           mkdir $$RPM_BUILD_DIR/$$subdir;                     \
-       done;                                                   \
-       mkdir $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION);           \
-       cp -R ./ $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION)/;       \
-       pushd $$RPM_BUILD_DIR/SOURCES/;                         \
-       tar zcf tor-$(VERSION).tar.gz ./;                       \
-       popd;                                                   \
-       LIBS=-lrt rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \
-       mv $$RPM_BUILD_DIR/SRPMS/* .;                           \
-       mv $$RPM_BUILD_DIR/RPMS/* .;                            \
-       rm -rf $$RPM_BUILD_DIR
+# Use automake's dist-gzip target to build the tarball
+dist-rpm: dist-gzip
+       TIMESTAMP=$$(date +"%Y-%m-%d_%H.%M.%S");                                \
+       RPM_BUILD_DIR=$$(mktemp -d "/tmp/tor-rpm-build-$$TIMESTAMP-XXXX");      \
+       mkdir -p "$$RPM_BUILD_DIR"/{BUILD,RPMS,SOURCES/"tor-$(VERSION)",SPECS,SRPMS}; \
+       cp -fa "$(distdir).tar.gz" "$$RPM_BUILD_DIR"/SOURCES/;                  \
+       LIBS=-lrt rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec;     \
+       cp -fa "$$RPM_BUILD_DIR"/SRPMS/* .;                                     \
+       cp -fa "$$RPM_BUILD_DIR"/RPMS/* .;                                      \
+       rm -rf "$$RPM_BUILD_DIR";                                               \
+       echo "RPM build finished";                                              \
+       #end of dist-rpm
 
 dist: check