diff --git a/packaging/Makefile b/packaging/Makefile index a59d6c91..8f597737 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -1,6 +1,6 @@ # Makefile # -# Copyright (c) 2021-2022 Bartek Kryza +# Copyright (c) 2021-2023 Bartek Kryza # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packaging/README.md b/packaging/README.md index 4fec115a..03387c38 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -26,7 +26,7 @@ dput ppa:bkryza/clang-uml *.changes ```bash docker run -v $PWD:$PWD fedora:37 bash -dnf install fedora-packager rpmdevtools gcc cmake git clang-devel clang-tools-extra ccache yaml-cpp llvm-devel wget +dnf install fedora-packager rpmdevtools gcc cmake git clang-devel clang-tools-extra ccache yaml-cpp llvm-devel wget yaml-cpp-devel rpmdev-setuptree cd /root/rpmbuild/SOURCES wget https://github.com/bkryza/clang-uml/archive/refs/heads/v0.3.0.zip diff --git a/packaging/debian/control.focal b/packaging/debian/control.focal index 53bd81fd..d33dae0f 100644 --- a/packaging/debian/control.focal +++ b/packaging/debian/control.focal @@ -8,6 +8,7 @@ Vcs-Browser: https://github.com/bkryza/clang-uml Vcs-Git: https://github.com/bkryza/clang-uml.git Homepage: https://github.com/bkryza/clang-uml + Package: clang-uml Architecture: any Section: utils diff --git a/packaging/debian/control.jammy b/packaging/debian/control.jammy index 24318484..71e085fe 100644 --- a/packaging/debian/control.jammy +++ b/packaging/debian/control.jammy @@ -8,6 +8,7 @@ Vcs-Browser: https://github.com/bkryza/clang-uml Vcs-Git: https://github.com/bkryza/clang-uml.git Homepage: https://github.com/bkryza/clang-uml + Package: clang-uml Architecture: any Section: utils diff --git a/packaging/debian/control.kinetic b/packaging/debian/control.kinetic index 61f3c089..24333b58 100644 --- a/packaging/debian/control.kinetic +++ b/packaging/debian/control.kinetic @@ -8,6 +8,7 @@ Vcs-Browser: https://github.com/bkryza/clang-uml Vcs-Git: https://github.com/bkryza/clang-uml.git Homepage: https://github.com/bkryza/clang-uml + Package: clang-uml Architecture: any Section: utils diff --git a/packaging/debian/copyright b/packaging/debian/copyright index bd54f076..6723034b 100644 --- a/packaging/debian/copyright +++ b/packaging/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: clang-uml Source: https://github.com/bkryza/clang-uml Files: * -Copyright: 2021-2022 Bartek Kryza +Copyright: 2021-2023 Bartek Kryza License: apache Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packaging/debian/rules b/packaging/debian/rules index 99626ef6..d56f75bd 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -7,8 +7,14 @@ export CLANGUML_GIT_BRANCH={{GIT_BRANCH}} export CLANGUML_GIT_COMMIT={{GIT_COMMIT}} override_dh_auto_configure: - dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr -DGIT_VERSION={{VERSION}} + dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DGIT_VERSION={{VERSION}} \ + -DBUILD_TESTS=OFF +override_dh_strip: + dh_strip --dbgsym-migration='clang-uml-dbg (<<0.3.0-1~)' %: dh $@ diff --git a/packaging/fedora/clang-uml.spec b/packaging/fedora/clang-uml.spec index 7d1788e6..d67766b1 100644 --- a/packaging/fedora/clang-uml.spec +++ b/packaging/fedora/clang-uml.spec @@ -36,7 +36,14 @@ generated in PlantUML format. %setup -q -n clang-uml-%{version} %build -cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow" -DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON -DCMAKE_INSTALL_PREFIX=%{_exec_prefix} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DGIT_VERSION=%{version} -DBUILD_TESTS=OFF +cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow" \ + -DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \ + -DCMAKE_INSTALL_PREFIX=%{_exec_prefix} \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DGIT_VERSION=%{version} \ + -DBUILD_TESTS=OFF + make %{_smp_mflags} clang-uml %install @@ -54,7 +61,7 @@ fi %files %{_bindir}/clang-uml -%doc CHANGELOG.md README.md +%doc CHANGELOG.md README.md AUTHORS.md %license LICENSE.md %changelog