SPECS/libxcvt.spec

@@ -1,10 +1,6 @@
-%if !0%{?rhel}
-%global with_cvt   1
-%endif
-
 Name:      libxcvt
 Version:   0.1.2
-Release:   2%{?dist}
+Release:   1%{?dist}
 Summary:   VESA CVT standard timing modelines generator
 
 URL:       https://gitlab.freedesktop.org/xorg/lib/libxcvt/
@@ -23,13 +19,11 @@ implementation of the VESA CVT standard timing modelines generator.
 %package devel
 Summary: Development package
 Requires: pkgconfig
-Requires: %{name} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%if 0%{?with_cvt}
 %package -n cvt
 Summary: Command line tool to calculate VESA CVT mode lines
 Conflicts: xorg-x11-server-Xorg < 1.21
@@ -38,7 +32,6 @@ Conflicts: xorg-x11-server-Xorg < 1.21
 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
 provided by the Xorg server.
-%endif
 
 %prep
 %autosetup -S git_am -n %{name}-%{version}
@@ -49,10 +42,6 @@ provided by the Xorg server.
 
 %install
 %meson_install
-%if !0%{?with_cvt}
-rm -vf %{buildroot}%{_bindir}/cvt
-rm -vf %{buildroot}%{_mandir}/man1/cvt.1*
-%endif
 
 %files
 %doc COPYING
@@ -64,17 +53,11 @@ rm -vf %{buildroot}%{_mandir}/man1/cvt.1*
 %{_includedir}/libxcvt/*.h
 %{_libdir}/libxcvt.so
 
-%if 0%{?with_cvt}
 %files -n cvt
 %{_bindir}/cvt
 %{_mandir}/man1/cvt.1*
-%endif
 
 %changelog
-* Thu Dec 22 2022 Olivier Fourdan <ofourdan@redhat.com> - 0.1.2-2
-- Add explicit package version requirement for the devel package
-  for rpminspect.
-
 * Tue Jul 19 2022 Olivier Fourdan <ofourdan@redhat.com> - 0.1.2-1
 - Update to 0.1.2