[Wok 0/2] RPM build fixes
Lucio Correia (2): Fix version error in RPM building Remove unnecessary kimchi references Makefile.am | 6 +----- contrib/wok.spec.suse.in | 8 -------- 2 files changed, 1 insertion(+), 13 deletions(-) -- 1.9.1
This code is not necessary because version is already got by configure.ac code. Signed-off-by: Lucio Correia <luciojhc@linux.vnet.ibm.com> --- Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 106a577..d78bb11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -156,12 +156,8 @@ uninstall-local: $(RM) -rf $(DESTDIR)/etc/wok $(RM) $(DESTDIR)/etc/nginx/conf.d/wok.conf -VERSION: - @if test -d .git; then \ - git describe --abbrev=0 > $@; \ - fi -.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION +.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog clean-local: -- 1.9.1
Hi Lucio, That way the VERSION file will not be updated while running "make dist". We can make that update more robust to do not fail when no tag is listed. I will apply patch 2 by now. Regards, Aline Manera On 07/12/2015 16:22, Lucio Correia wrote:
This code is not necessary because version is already got by configure.ac code.
Signed-off-by: Lucio Correia <luciojhc@linux.vnet.ibm.com> --- Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am index 106a577..d78bb11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -156,12 +156,8 @@ uninstall-local: $(RM) -rf $(DESTDIR)/etc/wok $(RM) $(DESTDIR)/etc/nginx/conf.d/wok.conf
-VERSION: - @if test -d .git; then \ - git describe --abbrev=0 > $@; \ - fi
-.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION +.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog
clean-local:
Signed-off-by: Lucio Correia <luciojhc@linux.vnet.ibm.com> --- contrib/wok.spec.suse.in | 8 -------- 1 file changed, 8 deletions(-) diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 088aa95..192163b 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -106,14 +106,6 @@ rm -rf $RPM_BUILD_ROOT %endif - -%if 0%{?with_systemd} -%{_unitdir}/kimchid.service -%else -%{_initrddir}/kimchid -%endif - - %changelog * Fri Jun 19 2015 Lucio Correia <luciojhc@linux.vnet.ibm.com> 2.0 - Rename to wokd -- 1.9.1
Applied. Thanks. Regards, Aline Manera
Reviewed-by: Daniel Barboza <dhbarboza82@gmail.com> On 12/07/2015 04:22 PM, Lucio Correia wrote:
Lucio Correia (2): Fix version error in RPM building Remove unnecessary kimchi references
Makefile.am | 6 +----- contrib/wok.spec.suse.in | 8 -------- 2 files changed, 1 insertion(+), 13 deletions(-)
participants (3)
-
Aline Manera -
Daniel Henrique Barboza -
Lucio Correia