.gitignore

@@ -1 +1,2 @@
-SOURCES/uchardet-0.0.6.tar.xz
+/uchardet-0.0.5.tar.gz
+/uchardet-0.0.6.tar.xz

.uchardet.metadata

@@ -1 +0,0 @@
-c04257ee7fb5ebbae144311d70b42c1d7efe41b9 SOURCES/uchardet-0.0.6.tar.xz

sources

@@ -0,0 +1 @@
+SHA512 (uchardet-0.0.6.tar.xz) = eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5

uchardet.spec

@@ -1,11 +1,9 @@
-%undefine __cmake_in_source_build
-
 Name:          uchardet
 Version:       0.0.6
-Release:       15%{?dist}.2
+Release:       9%{?dist}
 Summary:       An encoding detector library ported from Mozilla
 
-License:       MPLv1.1 or GPLv2+ or LGPLv2+
+License:       MPLv1.1
 URL:           https://www.freedesktop.org/wiki/Software/%{name}
 Source0:       https://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.xz
 
@@ -30,20 +28,25 @@ for developing tools for uchardet.
 
 %prep
 %autosetup
+mkdir build
 
 %build
-%cmake \
+pushd build
+  %cmake .. \
     -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
     -DBUILD_STATIC=OFF
-%cmake_build
+  %make_build
+popd
 
 %install
-%cmake_install
+pushd build
+  %make_install
+popd
 
 %ldconfig_scriptlets
 
 %check
-pushd %{_vpath_builddir}
+pushd build
   ctest -VV \
   %ifarch %{ix86}
     || :
@@ -57,7 +60,7 @@ popd
 %doc AUTHORS
 %{_bindir}/%{name}
 %{_libdir}/lib%{name}.so.*
-%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/%{name}.1.*
 
 %files devel
 %{_includedir}/%{name}/
@@ -65,34 +68,6 @@ popd
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
-* Mon May 23 2022 Akira TAGOH <tagoh@redhat.com> - 0.0.6-15.2
-- Bump a release to make sure shipping uchardet-devel to CRB.
-  Resolves: rhbz#2086260
-
-* Wed Oct  6 2021 Akira TAGOH <tagoh@redhat.com> - 0.0.6-15.1
-- Add CI test.
-  Resolves: rhbz#2011170
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.6-15
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed May 19 2021 Akira TAGOH <tagoh@redhat.com> - 0.0.6-14
-- Correct License field.
-  See COPYING file for more details.
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.6-13
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild