2 files changed, 15 insertions(+), 3 deletions(-)

M CMakeLists.txt
R packaging/{biboumi.spec => biboumi.spec.cmake}

@@ 24,8 24,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Mo
 ## Get the software version
 #
 set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR})
+set(RPM_VERSION ${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR})
+
 if(${PROJECT_NAME}_VERSION_SUFFIX MATCHES ".+")
   set(ARCHIVE_NAME ${ARCHIVE_NAME}${${PROJECT_NAME}_VERSION_SUFFIX})
+  set(RPM_VERSION ${RPM_VERSION}${${PROJECT_NAME}_VERSION_SUFFIX})
 endif()
 
 if(${PROJECT_NAME}_VERSION_SUFFIX MATCHES "^~dev$")


@@ 39,6 42,7 @@ if(${PROJECT_NAME}_VERSION_SUFFIX MATCHES "^~dev$")
     if(GIT_REVISION)
       set(${PROJECT_NAME}_VERSION_SUFFIX "${${PROJECT_NAME}_VERSION_SUFFIX} (${GIT_REVISION})")
       set(ARCHIVE_NAME ${ARCHIVE_NAME}${GIT_REVISION})
+      set(RPM_VERSION ${RPM_VERSION}${GIT_REVISION})
     endif()
   endif()
 endif()


@@ 251,3 255,8 @@ else()
   set(WATCHDOG_SEC "")
 endif()
 configure_file(unit/biboumi.service.cmake biboumi.service)
+
+execute_process(COMMAND "date" "+%a %b %d %Y" OUTPUT_VARIABLE RPM_DATE
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+configure_file(packaging/biboumi.spec.cmake biboumi.spec)

@@ 1,5 1,5 @@
 Name:     biboumi
-Version:  2.0
+Version:  ${RPM_VERSION}
 Release:  1%{?dist}
 Summary:  Lightweight XMPP to IRC gateway
 


@@ 62,6 62,9 @@ make check %{?_smp_mflags}
 
 
 %changelog
+* ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1
+- Build latest git revision
+
 * Wed Jan 13 2016 Le Coz Florent <louiz@louiz.org> - 2.0-2
 - Do not install the systemd unit and configuration files, because
   “make install” does it itself now


@@ 69,12 72,12 @@ make check %{?_smp_mflags}
 * Fri May 29 2015 Le Coz Florent <louiz@louiz.org> - 2.0-1
 - Update to 2.0 sources
 
-* Wed Nov 13 2014 Le Coz Florent <louiz@louiz.org> - 1.1-2
+* Thu Nov 13 2014 Le Coz Florent <louiz@louiz.org> - 1.1-2
 - Use the -DWITH(OUT) cmake flags for all optional dependencies
 - Build with the correct optflags
 - Use hardened_build
 
-* Wed Aug 18 2014 Le Coz Florent <louiz@louiz.org> - 1.1-1
+* Mon Aug 18 2014 Le Coz Florent <louiz@louiz.org> - 1.1-1
 - Update to 1.1 release
 
 * Wed Jun 25 2014 Le Coz Florent <louiz@louiz.org> - 1.0-1