[varnish-agent] bumped version to experimental 4.0.0

[Dridi Boukelmoune]

commit 18ad9617112cf6018dc99de4ffb67de1da9875a8
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Apr 28 07:30:40 2014 +0200

    bumped version to experimental 4.0.0

 vagent.automake.patch          |    9 --
 vagent.configure.patch         |   13 ---
 vagent.disable_ban_tests.patch |   12 ---
 vagent.disable_test.patch      |   12 +++
 vagent.secret_privileges.patch |   79 --------------------
 vagent.test_suite.patch        |  161 ----------------------------------------
 varnish-agent.spec             |   46 ++++++------
 7 files changed, 36 insertions(+), 296 deletions(-)
---
diff --git a/vagent.disable_test.patch b/vagent.disable_test.patch
new file mode 100644
index 0000000..ba8992f
--- /dev/null
+++ b/vagent.disable_test.patch
@@ -0,0 +1,12 @@
+diff --git i/tests/Makefile.am w/tests/Makefile.am
+index 454dce1..4528a50 100644
+--- i/tests/Makefile.am
++++ w/tests/Makefile.am
+@@ -2,7 +2,6 @@ LOG_COMPILER = $(srcdir)/test-wrapper
+ TESTS = ban.sh \
+ 	arguments.sh \
+ 	buffers.sh \
+-	vac_register.sh \
+ 	json.sh \
+ 	log.sh \
+ 	status.sh \
diff --git a/varnish-agent.spec b/varnish-agent.spec
index cca1a9e..547942e 100644
--- a/varnish-agent.spec
+++ b/varnish-agent.spec
@@ -1,34 +1,31 @@
+%global commit 1b8447bffa6dd4872995f1e244a42493789f0c47
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name:           varnish-agent
-Version:        2.1
-Release:        5%{?dist}
+Version:        4.0.0
+Release:        0.1%{?dist}
 Summary:        Administration agent for Varnish Cache
 Group:          System Environment/Daemons
 
 License:        BSD
 URL:            https://github.com/varnish/vagent2
-Source0:        https://github.com/varnish/vagent2/archive/%{version}.tar.gz
+Source0:        https://github.com/varnish/vagent2/archive/%{commit}/vagent2-%{version}-%{shortcommit}.tar.gz
 Source1:        varnish-agent.service
 Source2:        agent.params
 
-# The patches all come from the following pull requests:
-# https://github.com/varnish/vagent2/pull/94
-# https://github.com/varnish/vagent2/pull/101
-
-# offers a better out-of-the-box experience
-Patch0:         vagent.secret_privileges.patch
-
-# necessary fixes for the build
-Patch1:         vagent.configure.patch
-Patch2:         vagent.automake.patch
-Patch3:         vagent.test_suite.patch
+Patch0:         vagent.disable_test.patch
 
-# disables a failing test upstream is investigating
-# it looks like a bug in varnish, not the agent
-Patch4:         vagent.disable_ban_tests.patch
-
-BuildRequires:  autoconf automake libtool python-docutils
-BuildRequires:  systemd varnish-libs-devel libmicrohttpd-devel
-BuildRequires:  varnish python-demjson perl-libwww-perl
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libcurl-devel
+BuildRequires:  libmicrohttpd-devel
+BuildRequires:  libtool
+BuildRequires:  perl-libwww-perl
+BuildRequires:  python-demjson
+BuildRequires:  python-docutils
+BuildRequires:  systemd
+BuildRequires:  varnish
+BuildRequires:  varnish-libs-devel
 
 Requires:       varnish
 
@@ -43,7 +40,7 @@ Administration Console (VAC).
 
 
 %prep
-%autosetup -n vagent2-%{version} -p1
+%autosetup -n vagent2-%{commit} -p1
 
 # varnish-agent expects to be built from the git repository
 sed -i s/NOGIT/%{version}/ include/Makefile.am
@@ -93,6 +90,11 @@ make check
 
 
 %changelog
+* Mon Apr 28 2014 Dridi Boukelmoune <dridi.boukelmoune at gmail.com> - 4.0.0-0.1
+- Bumped version to experimental 4.0.0
+- Switched to a commit tarball from github
+- Removed the upstreamed patches
+
 * Sun Dec 08 2013 Dridi Boukelmoune <dridi.boukelmoune at gmail.com> - 2.1-5
 - Removed the %%optflags on the %%configure command line