Attachment 1939112 Details for Bug 2160996 – The .spec file difference from Copr build 5239312 to 5251604

[patch] The .spec file difference from Copr build 5239312 to 5251604

spec-from-5239312-to-5251604.diff (text/plain), 2.97 KB, created by Jakub Kadlčík on 2023-01-19 08:39:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Kadlčík

Created: 2023-01-19 08:39:05 UTC

Size: 2.97 KB

patch

obsolete

>--- https://copr.fedorainfracloud.org/coprs/build/5239312
>+++ https://copr.fedorainfracloud.org/coprs/build/5251604
>@@ -1,5 +1,5 @@
> #Disable test
>-%global gtest	0
>+%global gtest	1
> 
> Name:		draco
> Version:	1.5.5
>@@ -9,7 +9,21 @@
> URL:		https://github.com/google/%{name}
> Source0:	%{url}/archive/%{version}/%{name}-%{version}.tar.gz
> 
>+# Downstream-only patch that unconditionally links a system copy of gtest,
>+# rather than expecting a git submodule as upstream prefers (and gtest upstream
>+# would recommend).
>+Patch:		0001-Use-system-gtest.patch
>+
>+# Add a missing include
>+# https://github.com/google/draco/pull/964
>+%if 0%{?fedora} > 37
>+Patch:          %{url}/pull/964.patch
>+%endif
>+
> BuildRequires:	cmake
>+%if %{?gtest}
>+BuildRequires:	cmake(gtest)
>+%endif
> BuildRequires:	gcc
> BuildRequires:	gcc-c++
> BuildRequires:	help2man
>@@ -27,18 +41,18 @@
> %{summary}.
> 
> %prep
>-%autosetup -n %{name}-%{version}
>+%autosetup -p1 -n %{name}-%{version}
> 
> # Remove precompiled CSS and Javascript along binaries
> rm -fr {javascript,maya,docs/assets}
> 
> %build
> %cmake -GNinja \
>+    -DBUILD_SHARED_LIBS=ON \
>     -DCMAKE_BUILD_TYPE=Release \
> %if %{?gtest}
>-    -DDRACO_TESTS=ON \
>+    -DDRACO_TESTS=ON
> %endif
>-    -DBUILD_SHARED_LIBS=ON
> 
> %cmake_build
> 
>@@ -48,21 +62,24 @@
> # remove static file
> rm -f %{buildroot}/%{_libdir}/libdraco.a
> 
>-# Create missing man files
>-mkdir -p %{buildroot}%{_mandir}/{man1,man5}
>-help2man -N -o %{buildroot}%{_mandir}/man1/%{name}_decoder.1 \
>-	--no-discard-stderr  %{buildroot}/%{_bindir}/%{name}_decoder
>-help2man -N -o %{buildroot}%{_mandir}/man1/%{name}_encoder.1 \
>-	--no-discard-stderr  %{buildroot}/%{_bindir}/%{name}_encoder
>-help2man -N -o %{buildroot}%{_mandir}/man1/%{name}_decoder.1 \
>-	--no-discard-stderr  %{buildroot}/%{_bindir}/%{name}_decoder-%{version}
>-help2man -N -o %{buildroot}%{_mandir}/man1/%{name}_encoder.1 \
>-	--no-discard-stderr  %{buildroot}/%{_bindir}/%{name}_encoder-%{version}
>-	
>+# Create missing man files downstream
>+mkdir -p %{buildroot}%{_mandir}/man1
>+help2man -N --version-string=%{version} \
>+	--no-discard-stderr \
>+	-o %{buildroot}%{_mandir}/man1/%{name}_decoder-%{version}.1 \
>+	%{buildroot}/%{_bindir}/%{name}_decoder
>+help2man -N --version-string=%{version} \
>+	--no-discard-stderr \
>+	-o %{buildroot}%{_mandir}/man1/%{name}_encoder-%{version}.1 \
>+	%{buildroot}/%{_bindir}/%{name}_encoder
>+
>+cd %{buildroot}%{_mandir}/man1
>+ln -s %{name}_decoder-%{version}.1 %{name}_decoder.1
>+ln -s %{name}_encoder-%{version}.1 %{name}_encoder.1
> 
> %if %{?gtest}
> %check
>-%ctest
>+%{_vpath_builddir}/draco_tests
> %endif
> 
> %files
>@@ -72,10 +89,12 @@
> %{_bindir}/%{name}_decoder-%{version}
> %{_bindir}/%{name}_encoder
> %{_bindir}/%{name}_encoder-%{version}
>-%{_libdir}/libdraco.so.7
>-%{_libdir}/libdraco.so.7.0.0
>+%{_libdir}/lib%{name}.so.7
>+%{_libdir}/lib%{name}.so.7.0.0
> %{_mandir}/man1/%{name}_decoder.1*
> %{_mandir}/man1/%{name}_encoder.1*
>+%{_mandir}/man1/%{name}_decoder-%{version}.1*
>+%{_mandir}/man1/%{name}_encoder-%{version}.1*
> 
> %files devel
> %{_includedir}/%{name}/

Actions: View | Diff

Attachments on bug 2160996: 1938649 | 1938650 | 1939112 | 1939320 | 1939783 | 1939785 | 1940011