diff --git a/packages/Makefile b/packages/Makefile index d23ce1b508..cd711bd058 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -74,7 +74,7 @@ import: %.spk : %.spk.yaml spk info -l $<@source > /dev/null 2>&1 || spk make-source -v $< - spk mkb -dr origin -lv $< + spk mkb -r origin -lv $< spk export $< $@ .PRECIOUS: bootstrap/*.spk.yaml diff --git a/spk.spec b/spk.spec index 26340c6061..8889717ab5 100644 --- a/spk.spec +++ b/spk.spec @@ -8,14 +8,11 @@ Source0: https://github.com/imageworks/spk/archive/refs/tags/v%{version}.tar.gz BuildRequires: gcc BuildRequires: git -BuildRequires: which BuildRequires: gcc-c++ -BuildRequires: chrpath BuildRequires: libcap-devel BuildRequires: openssl-devel BuildRequires: python3-devel BuildRequires: python3-pip -Requires: rsync Requires: bash Requires: spfs >= 0.28.1 @@ -28,34 +25,14 @@ Package manager for SPFS %setup -q -n %{name}-%{version} %build -pip3 install pipenv -export LANG=en_US.UTF-8 -mkdir -p ./build -pipenv sync --dev -source $(pipenv --venv)/bin/activate -python setup.py install -python -m nuitka \ - --standalone \ - --jobs $(nproc) \ - --follow-imports \ - --output-dir=./build \ - --include-package='sentry_sdk.integrations.stdlib' \ - --include-package='sentry_sdk.integrations.excepthook' \ - --include-package='sentry_sdk.integrations.dedupe' \ - --include-package='sentry_sdk.integrations.atexit' \ - --include-package='sentry_sdk.integrations.logging' \ - --include-package='sentry_sdk.integrations.argv' \ - --include-package='sentry_sdk.integrations.modules' \ - --include-package='sentry_sdk.integrations.threading' \ - spk +cargo build --release %install mkdir -p %{buildroot}/usr/local/bin -mkdir -p %{buildroot}/opt/spk.dist -rsync -rvapog --chmod 755 %{_builddir}/%{name}-%{version}/build/spk.dist/* %{buildroot}/opt/spk.dist/ +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/spk %{buildroot}/usr/local/bin/spk-%{version} %files -/opt/spk.dist/ +/usr/local/bin/spk-%{version} %preun [ -e /usr/local/bin/spk ] && unlink /usr/local/bin/spk @@ -63,4 +40,4 @@ rsync -rvapog --chmod 755 %{_builddir}/%{name}-%{version}/build/spk.dist/* %{bui %posttrans # must run at the absolute end in case we are updating # and the uninstallation of the old version removes the symlink -ln -sf /opt/spk.dist/spk /usr/local/bin/spk +ln -sf spk-%{version} /usr/local/bin/spk