Attachment 14554 Details for Bug 33254 – spec patch

[patch] spec patch

glm.spec.patch (text/plain), 3.09 KB, created by Aurelian R on 2024-05-30 15:22:38 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-05-30 15:22:38 CEST

Size: 3.09 KB

patch

obsolete

>--- glm/glm.spec	2024-05-29 17:28:49.038545720 +0300
>+++ SPECS/glm.spec	2024-05-30 16:16:52.837562498 +0300
>@@ -1,20 +1,23 @@
> # The library consists of headers only
> %global debug_package %{nil}
> 
>+%bcond_without  tests
>+
> Name:           glm
>-Version:        0.9.9.8
>-Release:        %mkrel 2
>+Version:        1.0.1
>+Release:        %mkrel 0.1
> Summary:        C++ mathematics library for graphics programming
> Group:          Development/C++
> License:        MIT
> URL:            https://glm.g-truc.net/
>-Source0:        https://github.com/g-truc/glm/releases/download/%{version}/%{name}-%{version}.7z
>-Patch0:         glm-0.9.7.2-secondary.patch
>-Patch1:         glm-0.9.9.8-install.patch
>+Source0:        https://github.com/g-truc/glm/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
>+#Patches https://src.fedoraproject.org/rpms/glm/raw/rawhide
>+Patch0:         glm-1.0.1-noarch.patch
>+#Patch1:         glm-1.0.1-without-werror.patch
>+
>+BuildArch:      noarch
> 
> BuildRequires:  cmake
>-BuildRequires:  dos2unix
>-BuildRequires:  p7zip
> 
> %description
> GLM is a C++ library for doing mathematics operations
>@@ -39,41 +42,27 @@ there is no matching run time package.
> %package        doc
> Summary:        Documentation for %{name}-devel
> Group:          Documentation
>-BuildArch:      noarch
> 
> %description    doc
> The %{name}-doc package contains reference documentation and
> a programming manual for the %{name}-devel package.
> 
> %prep
>-%setup -q -n glm
>-
>-# There are tons of files with CRLF line endings
>-find . -type f -exec dos2unix "{}" +;
>-
>-# These are just for being able to apply the patch that
>-# was exported from git.
>-sed -i 's/\r//' glm/simd/platform.h
>-sed -i 's/\r//' test/core/core_setup_message.cpp
>-
>-%ifnarch %{ix86} x86_64
>-#patch0 -p1 -b .secondary
>-%endif
>-%patch1 -p1 -b .cmakelists
>+%autosetup -p1
> 
> %build
> export CXXFLAGS="%{build_cxxflags} -fno-strict-aliasing"
>-%cmake -DGLM_TEST_ENABLE=ON
>+%cmake -DGLM_TEST_ENABLE=ON \
>+       -DGLM_BUILD_LIBRARY=OFF \
>+       -DCMAKE_INSTALL_DATAROOTDIR=%{_datadir}/cmake
> %cmake_build
> 
> %install
> %cmake_install
> 
>-find %{buildroot} -name CMakeLists.txt -delete
>-
> # Dirty hack to provide .pc file. Needed bc of upstream stupidity.
>-mkdir -p %{buildroot}%{_libdir}/pkgconfig/
>-cat << EOF > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc
>+mkdir -p %{buildroot}%{_datadir}/pkgconfig/
>+cat << EOF > %{buildroot}%{_datadir}/pkgconfig/%{name}.pc
> prefix=%{_prefix}
> includedir=${prefix}/include
> 
>@@ -84,24 +73,14 @@ Cflags: -I${includedir}
> EOF
> 
> %check
>-export CXXFLAGS="%{build_cxxflags} -fno-strict-aliasing"
>-cd build
>- 
>-# Some tests are disabled due to failing tests (to be reported)
>-# - test-core_func_common fails on aarch64
>-# - packing test might fail on i586
>-%ifarch aarch64
>-ctest --output-on-failure -E '(test-core_func_common)'
>-%else
>-ctest --output-on-failure
>-%endif
>+%{?with_tests:%ctest}
> 
> %files devel
> %doc readme.md
>+%license copying.txt
> %{_includedir}/%{name}/
>-%{_libdir}/cmake/%{name}/
>-%{_libdir}/pkgconfig/%{name}.pc
>+%{_datadir}/cmake/%{name}/
>+%{_datadir}/pkgconfig/%{name}.pc
> 
> %files doc
>-%doc doc/manual/
>-%doc doc/api/
>+%doc doc/manual.pdf doc/api/

--- glm/glm.spec	2024-05-29 17:28:49.038545720 +0300
+++ SPECS/glm.spec	2024-05-30 16:16:52.837562498 +0300
@@ -1,20 +1,23 @@
 # The library consists of headers only
 %global debug_package %{nil}
 
+%bcond_without  tests
+
 Name:           glm
-Version:        0.9.9.8
-Release:        %mkrel 2
+Version:        1.0.1
+Release:        %mkrel 0.1
 Summary:        C++ mathematics library for graphics programming
 Group:          Development/C++
 License:        MIT
 URL:            https://glm.g-truc.net/
-Source0:        https://github.com/g-truc/glm/releases/download/%{version}/%{name}-%{version}.7z
-Patch0:         glm-0.9.7.2-secondary.patch
-Patch1:         glm-0.9.9.8-install.patch
+Source0:        https://github.com/g-truc/glm/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+#Patches https://src.fedoraproject.org/rpms/glm/raw/rawhide
+Patch0:         glm-1.0.1-noarch.patch
+#Patch1:         glm-1.0.1-without-werror.patch
+
+BuildArch:      noarch
 
 BuildRequires:  cmake
-BuildRequires:  dos2unix
-BuildRequires:  p7zip
 
 %description
 GLM is a C++ library for doing mathematics operations
@@ -39,41 +42,27 @@ there is no matching run time package.
 %package        doc
 Summary:        Documentation for %{name}-devel
 Group:          Documentation
-BuildArch:      noarch
 
 %description    doc
 The %{name}-doc package contains reference documentation and
 a programming manual for the %{name}-devel package.
 
 %prep
-%setup -q -n glm
-
-# There are tons of files with CRLF line endings
-find . -type f -exec dos2unix "{}" +;
-
-# These are just for being able to apply the patch that
-# was exported from git.
-sed -i 's/\r//' glm/simd/platform.h
-sed -i 's/\r//' test/core/core_setup_message.cpp
-
-%ifnarch %{ix86} x86_64
-#patch0 -p1 -b .secondary
-%endif
-%patch1 -p1 -b .cmakelists
+%autosetup -p1
 
 %build
 export CXXFLAGS="%{build_cxxflags} -fno-strict-aliasing"
-%cmake -DGLM_TEST_ENABLE=ON
+%cmake -DGLM_TEST_ENABLE=ON \
+       -DGLM_BUILD_LIBRARY=OFF \
+       -DCMAKE_INSTALL_DATAROOTDIR=%{_datadir}/cmake
 %cmake_build
 
 %install
 %cmake_install
 
-find %{buildroot} -name CMakeLists.txt -delete
-
 # Dirty hack to provide .pc file. Needed bc of upstream stupidity.
-mkdir -p %{buildroot}%{_libdir}/pkgconfig/
-cat << EOF > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc
+mkdir -p %{buildroot}%{_datadir}/pkgconfig/
+cat << EOF > %{buildroot}%{_datadir}/pkgconfig/%{name}.pc
 prefix=%{_prefix}
 includedir=${prefix}/include
 
@@ -84,24 +73,14 @@ Cflags: -I${includedir}
 EOF
 
 %check
-export CXXFLAGS="%{build_cxxflags} -fno-strict-aliasing"
-cd build
- 
-# Some tests are disabled due to failing tests (to be reported)
-# - test-core_func_common fails on aarch64
-# - packing test might fail on i586
-%ifarch aarch64
-ctest --output-on-failure -E '(test-core_func_common)'
-%else
-ctest --output-on-failure
-%endif
+%{?with_tests:%ctest}
 
 %files devel
 %doc readme.md
+%license copying.txt
 %{_includedir}/%{name}/
-%{_libdir}/cmake/%{name}/
-%{_libdir}/pkgconfig/%{name}.pc
+%{_datadir}/cmake/%{name}/
+%{_datadir}/pkgconfig/%{name}.pc
 
 %files doc
-%doc doc/manual/
-%doc doc/api/
+%doc doc/manual.pdf doc/api/

Actions: View | Diff

Attachments on bug 33254: 14554