I have compared CMakeLists.txt from before and after the rollback. I think some
changes introduced at a later stage was mistakenly removed by that rollback
In this section around set(CPACK_RPM_PACKAGE_LICENSE "CPL“) I found
differences:
Before rollback
set(CPACK_RPM_PACKAGE_VERSION ${ORX_VERSION})
set(CPACK_RPM_PACKAGE_RELEASE ${CPACK_PACKAGE_RELEASE})
set(CPACK_RPM_PACKAGE_LICENSE "CPL")
set(CPACK_RPM_PACKAGE_URL "http://www.oorexx.org/";)
set(CPACK_PACKAGE_CONTACT "sahana...@users.sf.net")
set(CPACK_RPM_PACKAGE_GROUP "Development/Languages")
set(CPACK_RPM_PACKAGE_VENDOR "Rexx Language Association")
set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
# remove 'csh'-dependency as it doesn't seem to be required
# set(CPACK_RPM_PACKAGE_REQUIRES "csh")
set(CPACK_RPM_PACKAGE_REQUIRES "hicolor-icon-theme")
set(CPACK_RPM_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.rpm)
set(CPACK_RPM_PACKAGE_SUMMARY
"Open Object Rexx is an object-oriented scripting language.")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${ORX_PLATFORM_DIR}/oorexx.spec.in
${CMAKE_CURRENT_SOURCE_DIR}/${ORX_PLATFORM_DIR}/oorexx.spec)
set(CPACK_RPM_USER_BINARY_SPECFILE
"${CMAKE_CURRENT_SOURCE_DIR}/${ORX_PLATFORM_DIR}/oorexx.spec")
# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${ORX_PLATFORM_DIR}/rpm_post.in
${CMAKE_CURRENT_SOURCE_DIR}/${ORX_PLATFORM_DIR}/rpm_post)
# set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/${ORX_PLATFORM_DIR}/rpm_post")
#
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${ORX_PLATFORM_DIR}/rpm_postun.in
${CMAKE_CURRENT_SOURCE_DIR}/${ORX_PLATFORM_DIR}/rpm_postun)
# set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/${ORX_PLATFORM_DIR}/rpm_postun")
after rollback
set(CPACK_RPM_PACKAGE_LICENSE "CPL")
set(CPACK_RPM_PACKAGE_URL "http://www.oorexx.org/";)
set(CPACK_PACKAGE_CONTACT "sahana...@users.sf.net")
set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
# remove 'csh'-dependency as it doesn't seem to be required
# set(CPACK_RPM_PACKAGE_REQUIRES "csh“)
Should not some of these settings be restored?
Also (but a minor point) should the license not be "CPLv1.0.txt“ ?
Hälsningar/Regards/Grüsse,
P.O. Jonsson
oor...@jonases.se
_______________________________________________
Oorexx-devel mailing list
Oorexx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oorexx-devel
