diff options
| -rw-r--r-- | plugins/dexela/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | plugins/dexela/changelog.txt | 2 | ||||
| -rw-r--r-- | plugins/dexela/ucadexela.spec.in | 43 | ||||
| -rw-r--r-- | plugins/package-plugin.sh.in | 2 |
4 files changed, 9 insertions, 47 deletions
diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt index 03ff968..60350cf 100644 --- a/plugins/dexela/CMakeLists.txt +++ b/plugins/dexela/CMakeLists.txt @@ -6,7 +6,12 @@ find_package(DEXELA) if (DEXELA_FOUND) set(UCA_CAMERA_NAME "dexela") - set(PLUGIN_SPECIFIC_FLAGS "-D CMAKE_CURRENT_BINARY_DIR=`pwd` -D CPACK_RPM_USER_BINARY_SPECFILE=${CMAKE_CURRENT_BINARY_DIR}/ucadexela.spec") + set(PLUGIN_REVISION "2") + set(PLUGIN_VERSION "1.0.0") + set(PLUGIN_CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt") + set(PLUGIN_REQUIRES "libuca = 1.1.0, libdexela >= 0.9.2") + set(PLUGIN_SPECIFIC_FLAGS + "-D CPACK_PACKAGE_NAME=\"uca-plugin-dexela\" -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}") set(CPACK_PACKAGE_VERSION ${VERSION}) set(CPACK_GENERATOR "RPM") @@ -16,8 +21,6 @@ if (DEXELA_FOUND) set(CPACK_PACKAGE_VENDOR "ANKA Computing Group") set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ucadexela.spec.in - ${CMAKE_CURRENT_BINARY_DIR}/ucadexela.spec) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh) diff --git a/plugins/dexela/changelog.txt b/plugins/dexela/changelog.txt new file mode 100644 index 0000000..8b84fa5 --- /dev/null +++ b/plugins/dexela/changelog.txt @@ -0,0 +1,2 @@ +* Thu Mar 7 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.0-2 +- add changelog and improve package metadata diff --git a/plugins/dexela/ucadexela.spec.in b/plugins/dexela/ucadexela.spec.in deleted file mode 100644 index 6ca4d3d..0000000 --- a/plugins/dexela/ucadexela.spec.in +++ /dev/null @@ -1,43 +0,0 @@ -# -*- rpm-spec -*- -Buildroot: $CMAKE_CURRENT_BINARY_DIR/_CPack_Packages/Linux/RPM/@CPACK_PACKAGE_FILE_NAME@ -Summary: Dexela Plugin for libuca -Name: @CPACK_PACKAGE_NAME@ -Version: @CPACK_PACKAGE_VERSION@ -Release: @CPACK_PACKAGE_RELEASE@ -License: GPL -Group: Development/Libraries -Vendor: @CPACK_PACKAGE_VENDOR@ -Prefix: @CPACK_PACKAGING_INSTALL_PREFIX@ -Requires: libuca = @UCA_VERSION_STRING@ - -%define _rpmdir $RPM_BUILD_ROOT -%define _rpmfilename @CPACK_PACKAGE_FILE_NAME@.rpm -%define _unpackaged_files_terminate_build 0 -%define _topdir $CMAKE_CURRENT_BINARY_DIR/_CPack_Packages/Linux/RPM - -%description -Dexela Plugin for libuca - -# This is a shortcutted spec file generated by CMake RPM generator -# we skip _install step because CPack does that for us. -# We do only save CPack installed tree in _prepr -# and then restore it in build. -%prep -echo $RPM_BUILD_ROOT -echo @CMAKE_CURRENT_BINARY_DIR@ -mv $RPM_BUILD_ROOT @CMAKE_CURRENT_BINARY_DIR@/_CPack_Packages/Linux/RPM/tmpBBroot - -%install -if [ -e $RPM_BUILD_ROOT ]; -then - rm -Rf $RPM_BUILD_ROOT -fi -mv "@CMAKE_CURRENT_BINARY_DIR@/_CPack_Packages/Linux/RPM/tmpBBroot" $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -@CPACK_PACKAGING_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/* - -%changelog -* Thu Feb 21 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.2-1 -- let MCS flush input buffer on startup too diff --git a/plugins/package-plugin.sh.in b/plugins/package-plugin.sh.in index ea96404..bfd1eb3 100644 --- a/plugins/package-plugin.sh.in +++ b/plugins/package-plugin.sh.in @@ -1 +1 @@ -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_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}" ${PLUGIN_SPECIFIC_FLAGS} +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_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}-${PLUGIN_VERSION}-${PLUGIN_REVISION}" ${PLUGIN_SPECIFIC_FLAGS} |