!2 remove cvt subpackage

From: @zhang__3125 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301
This commit is contained in:
openeuler-ci-bot 2022-07-28 08:03:44 +00:00 committed by Gitee
commit d026c90d3f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1,6 +1,8 @@
%global enable_cvt 0
Name: libxcvt Name: libxcvt
Version: 0.1.1 Version: 0.1.1
Release: 1 Release: 2
Summary: VESA CVT standard timing modelines generator Summary: VESA CVT standard timing modelines generator
License: MIT License: MIT
URL: https://gitlab.freedesktop.org/xorg/lib/libxcvt/ URL: https://gitlab.freedesktop.org/xorg/lib/libxcvt/
@ -21,6 +23,7 @@ Requires: pkgconfig
The %{name}-devel package contains libraries and header files for The %{name}-devel package contains libraries and header files for
developing applications that use %{name}. developing applications that use %{name}.
%if %{enable_cvt}
%package -n cvt %package -n cvt
Summary: Command line tool to calculate VESA CVT mode lines Summary: Command line tool to calculate VESA CVT mode lines
Conflicts: xorg-x11-server-Xorg < 1.21 Conflicts: xorg-x11-server-Xorg < 1.21
@ -29,11 +32,16 @@ Conflicts: xorg-x11-server-Xorg < 1.21
A standalone version of the command line tool cvt copied from the Xorg A standalone version of the command line tool cvt copied from the Xorg
implementation and is meant to be a direct replacement to the version implementation and is meant to be a direct replacement to the version
provided by the Xorg server. provided by the Xorg server.
%endif
%prep %prep
%autosetup -n %{name}-%{version} %autosetup -n %{name}-%{version}
%build %build
%if !%{enable_cvt}
sed -i "/subdir('cvt')/d" meson.build
%endif
%meson %meson
%meson_build %meson_build
@ -50,10 +58,18 @@ provided by the Xorg server.
%{_includedir}/libxcvt/*.h %{_includedir}/libxcvt/*.h
%{_libdir}/libxcvt.so %{_libdir}/libxcvt.so
%if %{enable_cvt}
%files -n cvt %files -n cvt
%{_bindir}/cvt %{_bindir}/cvt
%{_mandir}/man1/cvt.1* %{_mandir}/man1/cvt.1*
%else
%exclude %{_mandir}/man1/cvt.1*
%endif
%changelog %changelog
* Wed Jul 27 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 0.1.1-2
- remove cvt subpackage
- fix issue #I5J3LC
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 0.1.1-1 * Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 0.1.1-1
- Initial Packaging - Initial Packaging