6 files changed, 17 insertions, 6 deletions
diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt
index d98644c..e853b53 100644
--- a/plugins/dexela/CMakeLists.txt
+++ b/plugins/dexela/CMakeLists.txt
@@ -6,17 +6,13 @@ find_package(DEXELA)
 
 if (DEXELA_FOUND)
     set(UCA_CAMERA_NAME "dexela")
-    set(PLUGIN_REVISION "3")
+    set(PLUGIN_REVISION "4")
     set(PLUGIN_VERSION "1.0.0")
     set(PLUGIN_SUMMARY "Dexela plugin for libuca")
     set(PLUGIN_CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt")
     set(PLUGIN_DESCRIPTION "Plugin for the Dexela 1207 detector.")
     set(PLUGIN_REQUIRES "libuca = 1.1.0, libdexela >= 0.9.2")
-
-    set(CPACK_GENERATOR "RPM")
-    set(CPACK_PACKAGE_NAME "uca-plugin-dexela")
     set(PLUGIN_VENDOR "ANKA Computing Group")
-    set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
                    ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh)
diff --git a/plugins/mock/CMakeLists.txt b/plugins/mock/CMakeLists.txt
index d5b6771..40118b9 100644
--- a/plugins/mock/CMakeLists.txt
+++ b/plugins/mock/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8)
 project(ucamock C)
 
 set(UCA_CAMERA_NAME "mock")
+set(PLUGIN_VERSION "1.0.0")
+set(PLUGIN_REVISION "0")
+set(PLUGIN_REQUIRES "libuca >= 1.1.0")
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
                ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh)
diff --git a/plugins/package-plugin.sh.in b/plugins/package-plugin.sh.in
index 796517e..cdbd4dd 100644
--- a/plugins/package-plugin.sh.in
+++ b/plugins/package-plugin.sh.in
@@ -1 +1,4 @@
-cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;${UCA_CAMERA_NAME};/" -D CPACK_PACKAGE_FILE_NAME="uca-plugin-${UCA_CAMERA_NAME}-${UCA_VERSION_STRING}-${PLUGIN_VERSION}-${PLUGIN_REVISION}" -D CPACK_PACKAGE_NAME="uca-plugin-${UCA_CAMERA_NAME}" -D CPACK_RPM_PACKAGE_SUMMARY="${PLUGIN_SUMMARY}" -D CPACK_PACKAGE_VERSION="${PLUGIN_VERSION}" -D CPACK_RPM_PACKAGE_RELEASE="${PLUGIN_REVISION}" -D CPACK_RPM_CHANGELOG_FILE=${PLUGIN_CHANGELOG} -D CPACK_RPM_PACKAGE_REQUIRES="${PLUGIN_REQUIRES}" -D CPACK_RPM_PACKAGE_DESCRIPTION="${PLUGIN_DESCRIPTION}" -D CPACK_RPM_PACKAGE_VENDOR="${PLUGIN_VENDOR}"
+FILE_NAME_FLAG="-D CPACK_PACKAGE_FILE_NAME=uca-plugin-${UCA_CAMERA_NAME}-${UCA_VERSION_STRING}-${PLUGIN_VERSION}-${PLUGIN_REVISION}"
+PACKAGE_NAME_FLAG="-D CPACK_PACKAGE_NAME=uca-plugin-${UCA_CAMERA_NAME}"
+
+cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;${UCA_CAMERA_NAME};/" $FILE_NAME_FLAG $PACKAGE_NAME_FLAG -D CPACK_RPM_PACKAGE_SUMMARY="${PLUGIN_SUMMARY}" -D CPACK_PACKAGE_VERSION=${PLUGIN_VERSION} -D CPACK_RPM_PACKAGE_RELEASE=${PLUGIN_REVISION} -D CPACK_RPM_CHANGELOG_FILE=${PLUGIN_CHANGELOG} -D CPACK_RPM_PACKAGE_REQUIRES="${PLUGIN_REQUIRES}" -D CPACK_RPM_PACKAGE_DESCRIPTION="${PLUGIN_DESCRIPTION}" -D CPACK_RPM_PACKAGE_VENDOR="${PLUGIN_VENDOR}"
diff --git a/plugins/pco/CMakeLists.txt b/plugins/pco/CMakeLists.txt
index a526f4d..040026f 100644
--- a/plugins/pco/CMakeLists.txt
+++ b/plugins/pco/CMakeLists.txt
@@ -7,6 +7,9 @@ find_package(ClSerMe4)
 
 if (PCO_FOUND AND CLSERME4_FOUND AND FGLIB5_FOUND)
     set(UCA_CAMERA_NAME "pco")
+    set(PLUGIN_VERSION "1.0.0")
+    set(PLUGIN_REVISION "0")
+    set(PLUGIN_REQUIRES "libuca >= 1.1.0")
 
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
                    ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh)
diff --git a/plugins/pf/CMakeLists.txt b/plugins/pf/CMakeLists.txt
index ef11f8f..6abfcdf 100644
--- a/plugins/pf/CMakeLists.txt
+++ b/plugins/pf/CMakeLists.txt
@@ -7,6 +7,9 @@ find_package(ClSerMe4)
 
 if (PF_FOUND AND CLSERME4_FOUND AND FGLIB5_FOUND)
     set(UCA_CAMERA_NAME "pco")
+    set(PLUGIN_VERSION "1.0.0")
+    set(PLUGIN_REVISION "0")
+    set(PLUGIN_REQUIRES "libuca >= 1.1.0")
 
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
                    ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh)
diff --git a/plugins/ufo/CMakeLists.txt b/plugins/ufo/CMakeLists.txt
index c7fd21b..3162e12 100644
--- a/plugins/ufo/CMakeLists.txt
+++ b/plugins/ufo/CMakeLists.txt
@@ -5,6 +5,9 @@ find_package(IPE)
 
 if (IPE_FOUND)
     set(UCA_CAMERA_NAME "ufo")
+    set(PLUGIN_VERSION "1.0.0")
+    set(PLUGIN_REVISION "0")
+    set(PLUGIN_REQUIRES "libuca >= 1.1.0")
 
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
                    ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh)