libtransport.git Changeset - 4a28fcd6ec19

Changeset - 4a28fcd6ec19

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 10 years ago 2015-12-29 09:32:03
jkaluza@redhat.com

Preparation for 2.0.0

2 files changed with 3 insertions and 3 deletions:

CMakeLists.txt

ChangeLog

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -253,28 +253,28 @@ message("-----------------------") @@
 if (SPECTRUM_VERSION)
 	ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
 else (SPECTRUM_VERSION)
 	if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
 		if (NOT GIT_EXECUTABLE)
 		set (GIT_EXECUTABLE git)
 		endif()
 		execute_process(COMMAND ${GIT_EXECUTABLE} "--git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git" rev-parse --short HEAD
 						OUTPUT_VARIABLE GIT_REVISION
 						OUTPUT_STRIP_TRAILING_WHITESPACE
+		)
-		set(SPECTRUM_VERSION 2.0.0-beta-git-${GIT_REVISION})
 		set(SPECTRUM_VERSION 2.0.0-git-${GIT_REVISION})
 		ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
 	else (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
-		set(SPECTRUM_VERSION 2.0.0-alpha)
 		set(SPECTRUM_VERSION 2.0.0)
 		ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
 	endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
 endif (SPECTRUM_VERSION)
 message("Version           : " ${SPECTRUM_VERSION})
 if (SQLITE3_FOUND)
 	ADD_DEFINITIONS(-DWITH_SQLITE)
 	include_directories(${SQLITE3_INCLUDE_DIR})
 	message("SQLite3           : yes")
 else (SQLITE3_FOUND)
 	if (WIN32)

ChangeLog

➞

Show inline comments

-Version 2.0.0 (2015-XX-XX):
+Version 2.0.0 (2015-12-29):
 	General:
 	* Fix compilation with new versions of Spectrum 2 dependencies.
 	* Added support for multiple frontends - Slack frontend is the first one.
 	* Log errors related to backend spawning (Show proper log message for
 	  example when path to backend binary is not found).
 	* Set SQLite3 as default database backend.
 	* Fixed disconnecting from server caused by sending VCard response
 	  with bad "from" attribute.
 	* Added Munin plugin (Thanks to Askovpen).
 	* Added support for more admin_jid JIDs (Thanks to Askovpen).
 	* Fixed allowed_servers option.
 	* Options from config file can now be set also using command line like

0 comments (0 inline, 0 general)