Attachment 1985675 Details for Bug 2232864 – The .spec file difference from Copr build 6335139 to 6349692

[patch] The .spec file difference from Copr build 6335139 to 6349692

spec-from-6335139-to-6349692.diff (text/plain), 2.75 KB, created by Fedora Review Service on 2023-08-28 15:49:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fedora Review Service

Created: 2023-08-28 15:49:54 UTC

Size: 2.75 KB

patch

obsolete

>--- https://copr.fedorainfracloud.org/coprs/build/6335139
>+++ https://copr.fedorainfracloud.org/coprs/build/6349692
>@@ -1,21 +1,17 @@
>+%global commit      de85758a0a54712010a862d8a94e1bdaaec4cf75
>+%global shortcommit %(c=%{commit}; echo ${c:0:7})
>+
> Name:           libarcus-lulzbot
>-Version:        3.6.21
>+Version:        20221013
> Release:        %autorelease
> Summary:        Communication library between Cura components, Lulzbot fork
> License:        LGPL-3.0-or-later
> URL:            https://gitlab.com/lulzbot3d/cura-le/libarcus
>-# git clone https://gitlab.com/lulzbot3d/cura-le/libarcus.git
>-# cd libarcus
>-# git checkout v3.6.21
>-## CANNOT use git archive here, because we need to scrape the hash for version
>-# cd ..
>-# mv arcus libarcus-lulzbot-3.6.21
>-# tar cvfz libarcus-lulzbot-3.6.21.tar.gz libarcus-lulzbot-3.6.21
>-Source0:        %{name}-%{version}.tar.gz
>+Source0:        https://gitlab.com/lulzbot3d/cura-le/libarcus/-/archive/%{commit}/libarcus-%{commit}.tar.bz2
> 
>-# Gonna make this our fork
>-Patch2:         libArcus-3.6.12-lulzbot.patch
>-Patch3:         libarcus-lulzbot-3.6.12-find-sip.patch
>+Conflicts:      libarcus
>+
>+# Support new protobuf.
> Patch4:         libarcus-lulzbot-3.6.21-new-protobuf.patch
> 
> BuildRequires:  protobuf-devel
>@@ -26,9 +22,6 @@
> BuildRequires:  cmake
> BuildRequires:  gcc-c++
> BuildRequires:  git-core
>-
>-# Get Fedora 33++ behavior on anything older
>-%undefine __cmake_in_source_build
> 
> %description
> Arcus library contains C++ code and Python 3 bindings for creating a socket in
>@@ -54,11 +47,7 @@
> 
> %package -n     python3-arcus-lulzbot
> Summary:        Python 3 libArcus bindings, Lulzbot fork
>-%if 0%{?fedora} >= 31
> Requires:       python3-pyqt5-sip
>-%else
>-Requires:       python3-sip
>-%endif
> %{?python_provide:%python_provide python3-arcus-lulzbot}
> 
> %description -n python3-arcus-lulzbot
>@@ -68,7 +57,7 @@
> between Cura and its backend and similar code. This is the Lulzbot fork.
> 
> %prep
>-%setup -q -n libarcus-lulzbot-%{version}
>+%setup -q -n libarcus-%{commit}
> %autopatch -p1
> 
> %build
>@@ -77,18 +66,17 @@
> 
> %install
> %cmake_install
>-mv %{buildroot}%{_libdir}/cmake/Arcus-lulzbot/ArcusConfig.cmake %{buildroot}%{_libdir}/cmake/Arcus-lulzbot/Arcus-lulzbotConfig.cmake
> 
> %files
> %license LICENSE
> %doc README.md TODO.md
>-%{_libdir}/libArcus-lulzbot.so.*
>+%{_libdir}/libArcus.so.*
> 
> %files devel
> %license LICENSE cmake/COPYING-CMAKE-SCRIPTS
> %doc examples/example.cpp examples/example.proto
>-%{_libdir}/libArcus-lulzbot.so
>-%{_includedir}/Arcus-lulzbot
>+%{_libdir}/libArcus.so
>+%{_includedir}/Arcus
> # Own the dir not to depend on cmake:
> %{_libdir}/cmake
> 
>@@ -96,7 +84,7 @@
> %license LICENSE
> %doc README.md TODO.md
> %doc examples/example.py
>-%{python3_sitearch}/Arcus-lulzbot.so
>+%{python3_sitearch}/Arcus.so
> 
> %changelog
> %autochangelog

Actions: View | Diff

Attachments on bug 2232864: 1984664 | 1985675