From 5500643f3c4561b6fe46259109a558c1e4c05545 Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Thu, 5 May 2016 09:40:18 +0800
Subject: [PATCH] v2.0.0

Signed-off-by: Andy Green <andy@warmcat.com>
---
 CMakeLists.txt     |  6 +++---
 changelog          | 33 +++++++++++++++++++++++++++++++++
 libwebsockets.spec |  7 +++++--
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d9edada6..803c49c92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,13 +8,13 @@ project(libwebsockets C)
 
 set(PACKAGE "libwebsockets")
 set(CPACK_PACKAGE_NAME "${PACKAGE}")
-set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "7")
+set(CPACK_PACKAGE_VERSION_MAJOR "2")
+set(CPACK_PACKAGE_VERSION_MINOR "0")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 set(CPACK_PACKAGE_VENDOR "andy@warmcat.com")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
-set(SOVERSION "7")
+set(SOVERSION "8")
 set(CPACK_SOURCE_GENERATOR "TGZ")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
 set(VERSION "${CPACK_PACKAGE_VERSION}")
diff --git a/changelog b/changelog
index a13eabef1..9fbcffb9a 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,42 @@
 Changelog
 ---------
 
+v2.0.0
+======
+
+Summary
+-------
+
+ - There are only api additions, the api is compatible with v1.7.x.  But
+   there is necessarily an soname bump to 8.
+ 
+ - If you are using lws client, you mainly need to be aware the option
+   LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT is needed at context-creation time
+   if you will use SSL.
+   
+ - If you are using lws for serving, the above is also true but there are
+   many new features to simplify your code (and life).  There is a
+   summany online here
+   
+     https://libwebsockets.org/lws-2.0-new-features.html
+     
+   but basically the keywords are vhosts, mounts and plugins.  You can now
+   do the web serving part from lws without any user callback code at all.
+   See ./test-server/test-server-v2.0.c for an example, it has no user
+   code for ws either since it uses the protocol plugins... that one C file
+   is all that is needed to do the whole test server function.
+   
+   You now have the option to use a small generic ws-capable webserver
+   "lwsws" and write your ws part as a plugin.  That eliminates even
+   cut-and-pasting the test server code and offers more configurable
+   features like control over http cacheability in JSON.
+
+
 Fixes
 -----
 
+These are already in 1.7.x series
+
 1) MAJOR (Windows-only) fix assert firing
 
 2) MAJOR http:/1.1 connections handled by  lws_return_http_status() did not
diff --git a/libwebsockets.spec b/libwebsockets.spec
index 0de40abb1..355caa532 100644
--- a/libwebsockets.spec
+++ b/libwebsockets.spec
@@ -1,5 +1,5 @@
 Name: libwebsockets
-Version: 1.7.0
+Version: 2.0.0
 Release: 1%{?dist}
 Summary: Websocket Server and Client Library
 
@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/libwebsockets-test-echo
 /usr/bin/libwebsockets-test-fraggle
 /usr/bin/libwebsockets-test-fuzxy
-/%{_libdir}/libwebsockets.so.7
+/%{_libdir}/libwebsockets.so.8
 /%{_libdir}/libwebsockets.so
 /%{_libdir}/cmake/libwebsockets/LibwebsocketsConfig.cmake
 /%{_libdir}/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_libdir}/pkgconfig/libwebsockets.pc
 
 %changelog
+* Thu May 05 2016 Andy Green <andy@warmcat.com> 2.0.0-1
+- MAJOR SONAMEBUMP APICHANGES Upstream 2.0.0 release
+
 * Tue Feb 16 2016 Andy Green <andy@warmcat.com> 1.7.0-1
 - MAJOR SONAMEBUMP APICHANGES Upstream 1.7.0 release