diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-03-19 19:55:58 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-03-19 19:55:58 +0100 |
| commit | d1a8285f818eb7e5c3d6a05709ea21a808490b8c (patch) | |
| tree | 326578f0505cbed07cfe60de530022822dc237ac /distribution/posix | |
| parent | 16e9630b79f0a7a90c6cedb6781175bb8b337dc1 (diff) | |
New upstream version 5.1.0upstream/5.1.0
Diffstat (limited to 'distribution/posix')
| -rw-r--r-- | distribution/posix/CMakeLists.txt | 45 | ||||
| -rw-r--r-- | distribution/posix/xtrkcad.spec | 5 |
2 files changed, 30 insertions, 20 deletions
diff --git a/distribution/posix/CMakeLists.txt b/distribution/posix/CMakeLists.txt index 7a0ee50..96636b0 100644 --- a/distribution/posix/CMakeLists.txt +++ b/distribution/posix/CMakeLists.txt @@ -1,23 +1,32 @@ # Setup packaging ... -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "XTrackCAD is a CAD program for designing model railroad layouts.") -SET(CPACK_GENERATOR "RPM" "STGZ") -SET(CPACK_SOURCE_GENERATOR "TGZ" "TBZ2" "ZIP") -SET(CPACK_PACKAGE_RELEASE 1) -SET(CPACK_RPM_PACKAGE_LICENSE "GPL") -SET(CPACK_RPM_PACKAGE_GROUP "Applications/Engineering") -SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}////xtrkcad-desc.txt") -SET(CPACK_PACKAGE_FILE_NAME "xtrkcad-setup-${XTRKCAD_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") - -SET(CPACK_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ) -SET(CPACK_PACKAGING_INSTALL_PREFIX ${CPACK_INSTALL_PREFIX}) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "XTrackCAD is a CAD program for designing model railroad layouts.") +set(CPACK_GENERATOR "RPM" "STGZ") +set(CPACK_SOURCE_GENERATOR "TGZ" "TBZ2" "ZIP") +set(CPACK_PACKAGE_RELEASE 1) +set(CPACK_RPM_PACKAGE_LICENSE "GPL") +set(CPACK_RPM_PACKAGE_GROUP "Applications/Engineering") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}////xtrkcad-desc.txt") +set(CPACK_PACKAGE_FILE_NAME "xtrkcad-setup-${XTRKCAD_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") + +set(CPACK_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ) +set(CPACK_PACKAGING_INSTALL_PREFIX ${CPACK_INSTALL_PREFIX}) # get the specific configuration for each packager -SET(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/package.txt) +set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/package.txt) + +set(CPACK_PACKAGE_VENDOR "XTrackCAD Fork Project") + +# common dependencies for all Linux builds +set(CPACK_RPM_PACKAGE_REQUIRES "glibc gtk2") + +# Add dependency to webkitgtk if configured +if(NOT XTRKCAD_USE_BROWSER) + set(CPACK_RPM_PACKAGE_REQUIRES + "${CPACK_RPM_PACKAGE_REQUIRES} webkitgtk") +endif() -SET(CPACK_PACKAGE_VENDOR "XTrackCAD Fork Project") -SET(CPACK_RPM_PACKAGE_REQUIRES "glibc gtk2 webkitgtk") -# exclude these directories from the rpm -SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION +# exclude these directories from the rpm +set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/local" "/usr/local/share" "/usr/local/bin" @@ -29,7 +38,7 @@ SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share/pixmaps" ) -SET(CPACK_RPM_CHANGELOG_FILE "${CMAKE_CURRENT_SOURCE_DIR}////changelog.txt") +set(CPACK_RPM_CHANGELOG_FILE "${CMAKE_CURRENT_SOURCE_DIR}////changelog.txt") -INCLUDE(CPack) +include(CPack) diff --git a/distribution/posix/xtrkcad.spec b/distribution/posix/xtrkcad.spec index f94976a..a7f6033 100644 --- a/distribution/posix/xtrkcad.spec +++ b/distribution/posix/xtrkcad.spec @@ -1,7 +1,7 @@ Summary: XTrkCad Name: xtrkcad -Version: 4.2.4a -Release: 4%{?dist} +Version: 4.3.0 +Release: 1%{?dist} License: GPL Group: Applications/Engineering Vendor: XTrkCad Fork Project @@ -37,6 +37,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) +%defattr(755, root, root) /usr/local/share/xtrkcad/xdg-open %{_bindir}/xtrkcad %{_datadir} |