> Am 07.04.2020 um 15:47 schrieb Erich Steinböck <erich.steinbo...@gmail.com>:
>
> I think some changes introduced at a later stage was mistakenly removed by
> that rollback
> Should not some of these settings be restored?
> The roll back was done with a simple svn merge -c -11900,-11899 .
> So I'd assume it to be correct .. can you please specify which change you
> think was rolled back incorrectly?
There is a multitude of instructions for Cpack that I think are missing, hence
the question. Compare before - after below.
This is what I see after installing a package built on CentOS (rpm build)
[osboxes@osboxes workspace]$ dnf list ooRexx
CentOS-8 - AppStream
6.2 MB/s | 6.6 MB 00:01
CentOS-8 - Base
7.5 MB/s | 5.0 MB 00:00
CentOS-8 - Extras
16 kB/s | 4.9 kB 00:00
Installed Packages
ooRexx.x86_64 5.0.0-1
@@commandline
[osboxes@osboxes workspace]$
Before 12051 I think you could see 5.0.0-12050 etc. The bigger problem is that
when I uninstall (dnf remove) version 12051 or newer and install (def install
or using the software install) it reports to have install for instance version
12038 but a rexx -v reports 12054. Thus my conclusion that some of the lines
below are really necessary.
I will try to add this to a local copy of CMakeLists.txt on Fedora and see if
this solves the problem but not being able to go back is really worrying.
>
> Also (but a minor point) should the license not be "CPLv1.0.txt“ ?
> The license is called CPL 1.0. The change from CPACK_RPM_PACKAGE_LICENSE
> "CPL 1.0" to .. "CPL" was made in response to an issue reported by you a few
> months ago.
>
> On Tue, Apr 7, 2020 at 10:32 AM P.O. Jonsson <oor...@jonases.se
> <mailto:oor...@jonases.se>> wrote:
> 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/
> <http://www.oorexx.org/>")
> set(CPACK_PACKAGE_CONTACT "sahana...@users.sf.net
> <mailto: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
> <http://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
> <http://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
> <http://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/
> <http://www.oorexx.org/>")
> set(CPACK_PACKAGE_CONTACT "sahana...@users.sf.net
> <mailto: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 <mailto:oor...@jonases.se>
>
>
>
> _______________________________________________
> Oorexx-devel mailing list
> Oorexx-devel@lists.sourceforge.net <mailto:Oorexx-devel@lists.sourceforge.net>
> https://lists.sourceforge.net/lists/listinfo/oorexx-devel
> <https://lists.sourceforge.net/lists/listinfo/oorexx-devel>
> _______________________________________________
> Oorexx-devel mailing list
> Oorexx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/oorexx-devel
_______________________________________________
Oorexx-devel mailing list
Oorexx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oorexx-devel
