[SCM] UID Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  e00f045 Bump version to 1.2.6
       via  3cc0798 gitlab-ci: Also test installation
       via  7125f43 cmake: Fix cmake config files install
       via  ac31f4d doc: Fix manpage installation
       via  68d81c6 Bump version to 1.2.5
      from  e9f1f5f doc: Document UID_WRAPPER_DISABLE_DEEPBIND

https://git.samba.org/?p=uid_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e00f04550d077fe30ea4e817709e21c3ec7a143f
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jul 15 10:57:31 2019 +0200

    Bump version to 1.2.6
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 3cc0798c1519333150a7e09c7636ff6c4c98d292
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jul 15 10:56:27 2019 +0200

    gitlab-ci: Also test installation
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 7125f437f8c340f8a2744cf00ce2136dfc4679b3
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jul 15 10:53:53 2019 +0200

    cmake: Fix cmake config files install
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit ac31f4d88db4307042cc78f820b999af52cdd3e2
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jul 15 10:53:32 2019 +0200

    doc: Fix manpage installation
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 68d81c63f4864c2d3337b93a0417ac6dcbcb66b0
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jul 15 08:15:22 2019 +0200

    Bump version to 1.2.5
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 .gitlab-ci.yml     | 3 ++-
 CMakeLists.txt     | 6 +++---
 ChangeLog          | 7 +++++++
 doc/CMakeLists.txt | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f516947..34466ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,10 +29,11 @@ fedora/x86_64:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - mkdir -p obj && cd obj && cmake
+    -DCMAKE_INSTALL_PREFIX=/tmp/local
     -DCMAKE_BUILD_TYPE=RelWithDebInfo
     -DPICKY_DEVELOPER=ON
     -DUNIT_TESTING=ON .. &&
-    make -j$(nproc) && ctest --output-on-failure
+    make -j$(nproc) && ctest --output-on-failure && make install
   tags:
   - shared
   except:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdebea6..40c1ded 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 include(DefineCMakeDefaults)
 include(DefineCompilerFlags)
 
-project(uid_wrapper VERSION 1.1.5 LANGUAGES C)
+project(uid_wrapper VERSION 1.2.6 LANGUAGES C)
 
 # global needed variables
 set(APPLICATION_NAME ${PROJECT_NAME})
@@ -23,7 +23,7 @@ set(APPLICATION_NAME ${PROJECT_NAME})
 #     Increment AGE. Set REVISION to 0
 #   If the source code was changed, but there were no interface changes:
 #     Increment REVISION.
-set(LIBRARY_VERSION "0.0.6")
+set(LIBRARY_VERSION "0.0.7")
 set(LIBRARY_SOVERSION "0")
 
 # add definitions
@@ -75,7 +75,7 @@ install(
         ${CMAKE_CURRENT_BINARY_DIR}/uid_wrapper-config-version.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/uid_wrapper-config.cmake
     DESTINATION
-        ${CMAKE_INSTALL_LIBDIR}/uid_wrapper
+        ${CMAKE_INSTALL_LIBDIR}/cmake/uid_wrapper
     COMPONENT
         devel
 )
diff --git a/ChangeLog b/ChangeLog
index b57d876..8260f35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 ChangeLog
 ==========
 
+version 1.2.6 (released 2019-07-15)
+  * Fix manpage installation
+  * Fix cmake-config installation
+
+version 1.2.5 (released 2019-07-15)
+  * Fixed running with sanitizers
+
 version 1.2.4 (released 2017-07-24)
   * Added deadlock workaround for glibc < 2.24
   * Fixed a possible deadlock bug if uid_wrapper is turned off
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 7ce0e22..9255c5c 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
 install(FILES
             uid_wrapper.1
         DESTINATION
-            ${MAN_INSTALL_DIR}/man1)
+            ${CMAKE_INSTALL_MANDIR}/man1)


-- 
UID Wrapper Repository