[4.1] 7ba6b84 Remove last traces of redhat packaging files.

Lasse Karstensen lkarsten at varnish-software.com
Fri Sep 4 15:54:56 CEST 2015


commit 7ba6b842ee813ad738c9231414d727b2f959a6bc
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Fri Sep 4 11:59:05 2015 +0200

    Remove last traces of redhat packaging files.

diff --git a/Makefile.am b/Makefile.am
index 7624ec5..e49505f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include lib bin etc doc man redhat
+SUBDIRS = include lib bin etc doc man
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = varnishapi.pc
@@ -20,15 +20,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 install-data-local:
 	$(install_sh) -d -m 0755 $(DESTDIR)$(localstatedir)/varnish
 
-distcheck-hook:
-	V="@PACKAGE_VERSION@" ; \
-	V="$${V%%-*}" ; \
-	if ! grep "^Version: $$V$$" $(top_distdir)/redhat/varnish.spec && \
-	  [ "@PACKAGE_VERSION@" != "trunk" ]; then \
-	  echo "$$V" ; \
-	  echo "redhat/varnish.spec does not have a version number matching the package" ; \
-	  exit 1 ; \
-	fi
 
 distcleancheck_listfiles = \
 	find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
diff --git a/configure.ac b/configure.ac
index 6c4d5f2..48af690 100644
--- a/configure.ac
+++ b/configure.ac
@@ -658,7 +658,6 @@ AC_CONFIG_FILES([
     lib/libvmod_std/Makefile
     lib/libvmod_directors/Makefile
     man/Makefile
-    redhat/Makefile
     varnishapi.pc
     varnishapi-uninstalled.pc
 ])



More information about the varnish-commit mailing list