Browse code

Makefile: make git-rpm instead of make rpm

To be clear it comes from git, not a release tarball.

Matt Domsch authored on 2014/03/23 23:44:18
Showing 1 changed files
... ...
@@ -19,14 +19,15 @@ $(SPEC): $(SPEC).in
19 19
             -e 's/##SHORTCOMMIT##/$(SHORTCOMMIT)/' \
20 20
             $(SPEC).in > $(SPEC)
21 21
 
22
-tarball:
23
-	git archive --format tar --prefix s3cmd-$(COMMIT)/ HEAD | gzip -c > $(TARBALL)
22
+# fixme: python setup.py sdist also generates a PKG-INFO file which we don't have using straight git archive
23
+git-tarball:
24
+	git archive --format tar --prefix s3cmd-$(COMMIT)/ HEAD S3/ s3cmd NEWS README INSTALL setup.cfg s3cmd.1 setup.py| gzip -c > $(TARBALL)
24 25
 
25 26
 # Use older digest algorithms for local rpmbuilds, as EPEL5 and
26 27
 # earlier releases need this.  When building using mock for a
27 28
 # particular target, it will use the proper (newer) digests if that
28 29
 # target supports it.
29
-rpm: clean tarball $(SPEC)
30
+git-rpm: clean git-tarball $(SPEC)
30 31
 	tmp_dir=`mktemp -d` ; \
31 32
 	mkdir -p $${tmp_dir}/{BUILD,RPMS,SRPMS,SPECS,SOURCES} ; \
32 33
 	cp $(TARBALL) $${tmp_dir}/SOURCES ; \