[ostree] Move Makefile.dist-packaging under packaging/

[Colin Walters <walters src gnome org>]

commit 93c68083ac68c87627a1b4fb43510fa064260320
Author: Colin Walters <walters verbum org>
Date:   Mon Jun 2 15:27:40 2014 -0400

    Move Makefile.dist-packaging under packaging/

 .../Makefile.dist-packaging                        |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.dist-packaging b/packaging/Makefile.dist-packaging
similarity index 72%
rename from Makefile.dist-packaging
rename to packaging/Makefile.dist-packaging
index 75a52f6..103b1e8 100644
--- a/Makefile.dist-packaging
+++ b/packaging/Makefile.dist-packaging
@@ -4,7 +4,7 @@ GITREV = $$(git describe --always --tags)
 GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,')
 
 srcdir=$(shell pwd)
-PACKAGE=$(shell basename $(srcdir))
+PACKAGE=ostree
 
 PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG)
 
@@ -13,7 +13,7 @@ dist-snapshot:
        echo "PACKAGE=$(PACKAGE)"; \
        TARFILE_TMP=$(PKG_VER).tar.tmp; \
        echo "Archiving $(PACKAGE) at $(GITREV)"; \
-       (cd $(srcdir); git archive --format=tar --prefix=$(PKG_VER)/ $(GITREV)) > $${TARFILE_TMP}; \
+       (cd ..; git archive --format=tar --prefix=$(PKG_VER)/ $(GITREV)) > $${TARFILE_TMP}; \
        (cd $$(git rev-parse --show-toplevel); git submodule status) | while read line; do \
          rev=$$(echo $$line | cut -f 1 -d ' '); path=$$(echo $$line | cut -f 2 -d ' '); \
          echo "Archiving $${path} at $${rev}"; \
@@ -26,14 +26,8 @@ dist-snapshot:
        xz $(PKG_VER).tar 
 
 srpm: dist-snapshot
-       (cd $(srcdir)/packaging; \
-        cp ../$(PKG_VER).tar.xz . ; \
         sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(PACKAGE).spec.in > $(PACKAGE).spec; \
-        ./rpmbuild-cwd -bs $(PACKAGE).spec)
+        ./rpmbuild-cwd -bs $(PACKAGE).spec
 
 rpm: srpm
-       $(srcdir)/packaging/rpmbuild-cwd --rebuild packaging/$(PKG_VER)*.src.rpm
-
-buildinstall: rpm
-       sudo yum localinstall $(PKG_VER)*.src.rpm
-
+       $(srcdir)/rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm