From 634c50ddfbc912d3048af16943b46276fb071a10c0d0d80d2fca659878fc9768 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Mon, 8 Apr 2024 07:31:37 +0000 Subject: [PATCH] Accepting request 1151821 from home:dimstar:rpm4.20:d - Set CMAKE_INSTALL_DOCDIR to work around incompatible changes added to macros.cmake. - Use %autosetup macro. Allows to eliminate the usage of deprecated PatchN. OBS-URL: https://build.opensuse.org/request/show/1151821 OBS-URL: https://build.opensuse.org/package/show/Education/dynamips?expand=0&rev=57 --- dynamips.changes | 12 ++++++++++++ dynamips.spec | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dynamips.changes b/dynamips.changes index f0aa88b..3e631d0 100644 --- a/dynamips.changes +++ b/dynamips.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Feb 26 15:49:13 UTC 2024 - Dominique Leuenberger + +- Set CMAKE_INSTALL_DOCDIR to work around incompatible changes + added to macros.cmake. + +------------------------------------------------------------------- +Mon Feb 26 08:11:24 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + PatchN. + ------------------------------------------------------------------- Thu Jan 12 17:36:33 UTC 2023 - Martin Hauke diff --git a/dynamips.spec b/dynamips.spec index 370e364..3431b5d 100644 --- a/dynamips.spec +++ b/dynamips.spec @@ -1,7 +1,7 @@ # # spec file for package dynamips # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,14 +45,14 @@ simply a complementary tool to real labs for administrators of Cisco networks or people wanting to pass their CCNA/CCNP/CCIE exams. %prep -%setup -q -%patch1 -p1 +%autosetup -p1 %build %cmake \ %ifarch x86_64 -DYNAMIPS_ARCH=amd64 \ %endif + -DCMAKE_INSTALL_DOCDIR:STRING=%{_datadir}/doc/%{name} .. %make_jobs