[PATCH] [Kimchi] Fix make-rpm target

make-rpm was failing as below because the dist target (which is responsible to generate the package tarball) was removed from rpm generation Add it back and update po/Makefile.in.in to do not modify files while generating the package. /usr/bin/mkdir -p rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp ./kimchi.spec rpm/SPECS/kimchi.spec cp kimchi-2.2.0.tar.gz rpm/SOURCES cp: cannot stat ‘kimchi-2.2.0.tar.gz’: No such file or directory Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- Makefile.am | 8 ++++---- po/Makefile.in.in | 9 --------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 95eff36..01d4edf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,17 +135,17 @@ kimchi.spec: contrib/kimchi.spec.fedora contrib/kimchi.spec.suse /bin/false ; \ fi -rpm: kimchi.spec +rpm: dist kimchi.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec cp $(DIST_ARCHIVES) rpm/SOURCES rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec -fedora-rpm: contrib/kimchi.spec.fedora +fedora-rpm: dist contrib/kimchi.spec.fedora ln -sf contrib/kimchi.spec.fedora kimchi.spec $(MAKE) rpm -suse-rpm: contrib/kimchi.spec.suse +suse-rpm: dist contrib/kimchi.spec.suse ln -sf contrib/kimchi.spec.suse kimchi.spec $(MAKE) rpm @@ -183,7 +183,7 @@ VERSION: git describe --abbrev=0 --always > $@; \ fi -.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION +.PHONY: deb install-deb rpm fedora-rpm suse-rpm VERSION clean-local: diff --git a/po/Makefile.in.in b/po/Makefile.in.in index d01fb31..b7168c7 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -306,7 +306,6 @@ maintainer-clean: distclean distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - $(MAKE) update-po @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: stamp-po $(DISTFILES) @@ -317,14 +316,6 @@ dist2: stamp-po $(DISTFILES) if test -f $(srcdir)/$(DOMAIN).pot; then \ dists="$$dists $(DOMAIN).pot stamp-po"; \ fi; \ - if test -f $(srcdir)/ChangeLog; then \ - dists="$$dists ChangeLog"; \ - fi; \ - for i in 0 1 2 3 4 5 6 7 8 9; do \ - if test -f $(srcdir)/ChangeLog.$$i; then \ - dists="$$dists ChangeLog.$$i"; \ - fi; \ - done; \ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ if test -f $$file; then \ -- 2.5.5

Reviewed-by: Daniel Barboza <danielhb@linux.vnet.ibm.com> On 09/28/2016 04:05 PM, Aline Manera wrote:
make-rpm was failing as below because the dist target (which is responsible to generate the package tarball) was removed from rpm generation Add it back and update po/Makefile.in.in to do not modify files while generating the package.
/usr/bin/mkdir -p rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp ./kimchi.spec rpm/SPECS/kimchi.spec cp kimchi-2.2.0.tar.gz rpm/SOURCES cp: cannot stat ‘kimchi-2.2.0.tar.gz’: No such file or directory
Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- Makefile.am | 8 ++++---- po/Makefile.in.in | 9 --------- 2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/Makefile.am b/Makefile.am index 95eff36..01d4edf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,17 +135,17 @@ kimchi.spec: contrib/kimchi.spec.fedora contrib/kimchi.spec.suse /bin/false ; \ fi
-rpm: kimchi.spec +rpm: dist kimchi.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec cp $(DIST_ARCHIVES) rpm/SOURCES rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec
-fedora-rpm: contrib/kimchi.spec.fedora +fedora-rpm: dist contrib/kimchi.spec.fedora ln -sf contrib/kimchi.spec.fedora kimchi.spec $(MAKE) rpm
-suse-rpm: contrib/kimchi.spec.suse +suse-rpm: dist contrib/kimchi.spec.suse ln -sf contrib/kimchi.spec.suse kimchi.spec $(MAKE) rpm
@@ -183,7 +183,7 @@ VERSION: git describe --abbrev=0 --always > $@; \ fi
-.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION +.PHONY: deb install-deb rpm fedora-rpm suse-rpm VERSION
clean-local: diff --git a/po/Makefile.in.in b/po/Makefile.in.in index d01fb31..b7168c7 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -306,7 +306,6 @@ maintainer-clean: distclean
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - $(MAKE) update-po @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: stamp-po $(DISTFILES) @@ -317,14 +316,6 @@ dist2: stamp-po $(DISTFILES) if test -f $(srcdir)/$(DOMAIN).pot; then \ dists="$$dists $(DOMAIN).pot stamp-po"; \ fi; \ - if test -f $(srcdir)/ChangeLog; then \ - dists="$$dists ChangeLog"; \ - fi; \ - for i in 0 1 2 3 4 5 6 7 8 9; do \ - if test -f $(srcdir)/ChangeLog.$$i; then \ - dists="$$dists ChangeLog.$$i"; \ - fi; \ - done; \ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ if test -f $$file; then \
participants (2)
-
Aline Manera
-
Daniel Henrique Barboza