From ccd178b52f4f5c63f29c446372c7ce44c607557a Mon Sep 17 00:00:00 2001 From: Ilya Gradina Date: Sun, 7 Feb 2016 13:19:09 +0100 Subject: [PATCH 01/15] import Signed-off-by: Ilya Gradina --- .gitignore | 1 + sources | 1 + uchardet.spec | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 uchardet.spec diff --git a/.gitignore b/.gitignore index e69de29..aac174f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/uchardet-0.0.5.tar.gz diff --git a/sources b/sources index e69de29..e1f8145 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +2421993e7b098366bd008d81385150b6 uchardet-0.0.5.tar.gz diff --git a/uchardet.spec b/uchardet.spec new file mode 100644 index 0000000..b973900 --- /dev/null +++ b/uchardet.spec @@ -0,0 +1,98 @@ +Name: uchardet +Version: 0.0.5 +Release: 1%{?dist} +Summary: An encoding detector library ported from Mozilla + +License: MPLv1.1 +URL: https://github.com/BYVoid/%{name} +Source0: https://github.com/BYVoid/uchardet/archive/v%{version}/%{name}-%{version}.tar.gz + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: cmake + +%description +Uchardet is a C language binding of the original C++ implementation of the +universal charset detection library by Mozilla. Uchardet is an encoding +detector library, which takes a sequence of bytes in an unknown character +encoding without any additional information, and attempts to determine the +encoding of the text. + +%package devel +Summary: Development files for ${name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains headers and shared libraries +for developing tools for uchardet. + +%prep +%autosetup +mkdir build + +%build +pushd build + %cmake .. -DCMAKE_INSTALL_LIBDIR=%{_libdir} + %make_build +popd + +%install +pushd build + %make_install +popd + +# remove static library +rm -f %{buildroot}%{_libdir}/lib%{name}.a + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%check +pushd build + ctest -VV +popd + +%files +%license COPYING +%doc AUTHORS +%{_bindir}/%{name} +%{_libdir}/lib%{name}.so.* +%{_mandir}/man1/%{name}.1.* + +%files devel +%{_includedir}/%{name}/ +%{_libdir}/lib%{name}.so +%{_libdir}/pkgconfig/%{name}.pc + +%changelog +* Sat Feb 6 2016 Ilya Gradina - 0.0.5-1 +- update version to 0.0.5 + +* Fri Nov 20 2015 Ilya Gradina - 0.0.3-1 +- update version to 0.0.3 +- add tests + +* Thu Oct 1 2015 Ilya Gradina - 0.0.1-5 +- remove macros srcname and sum + +* Mon Sep 21 2015 Ilya Gradina - 0.0.1-4 +- fix enable debug packages +- fix add flag verbose for make +- fix change in build +- fix remove in libs from files +- fix add change for libs in post/postun +- fix version on 0.0.1 from git +- added macros + +* Mon Sep 21 2015 Ilya Gradina - 0.0.0-3 +- fix description and summary for libs and libs-devel + +* Mon Sep 21 2015 Ilya Gradina - 0.0.0-2 +- fix version on 0.0.0 +- fix license path +- remove static lib +- fix description +- fix number packages + +* Mon Sep 21 2015 Ilya Gradina - 0.0.0-1 +- Initial package From 5fd9172205af3d6205c02c95876ac28080b8ef13 Mon Sep 17 00:00:00 2001 From: Ilya Gradina Date: Sun, 7 Feb 2016 14:56:33 +0100 Subject: [PATCH 02/15] change_v1 --- uchardet.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/uchardet.spec b/uchardet.spec index b973900..dc7db03 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -6,6 +6,7 @@ Summary: An encoding detector library ported from Mozilla License: MPLv1.1 URL: https://github.com/BYVoid/%{name} Source0: https://github.com/BYVoid/uchardet/archive/v%{version}/%{name}-%{version}.tar.gz +ExcludeArch: i686 BuildRequires: gcc BuildRequires: gcc-c++ @@ -32,7 +33,9 @@ mkdir build %build pushd build - %cmake .. -DCMAKE_INSTALL_LIBDIR=%{_libdir} + %cmake .. \ + -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ + -DBUILD_STATIC=OFF %make_build popd @@ -41,9 +44,6 @@ pushd build %make_install popd -# remove static library -rm -f %{buildroot}%{_libdir}/lib%{name}.a - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig From a7fa9480bae1f9cb176c45532055f4eef88ad154 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 8 Feb 2016 23:14:08 +0100 Subject: [PATCH 03/15] Fix building on i686 properly Signed-off-by: Igor Gnatenko --- uchardet.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/uchardet.spec b/uchardet.spec index dc7db03..9c8e6a4 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,12 +1,11 @@ Name: uchardet Version: 0.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 URL: https://github.com/BYVoid/%{name} Source0: https://github.com/BYVoid/uchardet/archive/v%{version}/%{name}-%{version}.tar.gz -ExcludeArch: i686 BuildRequires: gcc BuildRequires: gcc-c++ @@ -49,7 +48,12 @@ popd %check pushd build - ctest -VV + ctest -VV \ + %ifarch %{ix86} + || : + %else + ; + %endif popd %files @@ -65,6 +69,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Feb 08 2016 Igor Gnatenko - 0.0.5-2 +- Fix building on i686 properly + * Sat Feb 6 2016 Ilya Gradina - 0.0.5-1 - update version to 0.0.5 From d17bad47476ac7eaabf0cd78383d65c246015a88 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 12 Feb 2016 13:12:27 +0100 Subject: [PATCH 04/15] Fixup summary in devel subpkg Signed-off-by: Igor Gnatenko --- uchardet.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/uchardet.spec b/uchardet.spec index 9c8e6a4..6f8748d 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,6 +1,6 @@ Name: uchardet Version: 0.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 @@ -19,7 +19,7 @@ encoding without any additional information, and attempts to determine the encoding of the text. %package devel -Summary: Development files for ${name} +Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -33,8 +33,8 @@ mkdir build %build pushd build %cmake .. \ - -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ - -DBUILD_STATIC=OFF + -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ + -DBUILD_STATIC=OFF %make_build popd @@ -69,6 +69,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Feb 12 2016 Igor Gnatenko - 0.0.5-3 +- Fixup summary in devel subpkg + * Mon Feb 08 2016 Igor Gnatenko - 0.0.5-2 - Fix building on i686 properly From f3dabc85f671f0c77e40b5e3ce31f460b1d26116 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 7 Jul 2016 09:02:10 +0200 Subject: [PATCH 05/15] Rebuild for f23 to fix i686 Signed-off-by: Igor Gnatenko --- uchardet.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/uchardet.spec b/uchardet.spec index 6f8748d..721df37 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,15 +1,15 @@ Name: uchardet Version: 0.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 URL: https://github.com/BYVoid/%{name} -Source0: https://github.com/BYVoid/uchardet/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: cmake +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: cmake %description Uchardet is a C language binding of the original C++ implementation of the @@ -18,11 +18,11 @@ detector library, which takes a sequence of bytes in an unknown character encoding without any additional information, and attempts to determine the encoding of the text. -%package devel +%package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -%description devel +%description devel The %{name}-devel package contains headers and shared libraries for developing tools for uchardet. @@ -69,6 +69,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 07 2016 Igor Gnatenko - 0.0.5-4 +- Rebuild for f23 to fix i686 + * Fri Feb 12 2016 Igor Gnatenko - 0.0.5-3 - Fixup summary in devel subpkg From bebcb3ff8b103c2cd0a88dbcbb8622432c052e20 Mon Sep 17 00:00:00 2001 From: Ilya Gradina Date: Thu, 22 Dec 2016 02:53:31 +0300 Subject: [PATCH 06/15] update to new version --- uchardet.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/uchardet.spec b/uchardet.spec index 721df37..f707ec3 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,11 +1,11 @@ Name: uchardet -Version: 0.0.5 -Release: 4%{?dist} +Version: 0.0.6 +Release: 1%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 -URL: https://github.com/BYVoid/%{name} -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +URL: https://www.freedesktop.org/wiki/Software/%{name} +Source0: https://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.xz BuildRequires: gcc BuildRequires: gcc-c++ @@ -69,6 +69,10 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Dec 22 2016 Ilya Gradina - 0.0.6-1 +- update version to 0.0.6 +- changed upstream url + * Thu Jul 07 2016 Igor Gnatenko - 0.0.5-4 - Rebuild for f23 to fix i686 From a3811c61c42bbf48996c9e7a3fdc538b2a3599c1 Mon Sep 17 00:00:00 2001 From: Ilya Gradina Date: Tue, 27 Dec 2016 23:44:12 +0300 Subject: [PATCH 07/15] add new source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index aac174f..3a6a00d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /uchardet-0.0.5.tar.gz +/uchardet-0.0.6.tar.xz diff --git a/sources b/sources index e1f8145..ddefc4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2421993e7b098366bd008d81385150b6 uchardet-0.0.5.tar.gz +SHA512 (uchardet-0.0.6.tar.xz) = eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 From 814443c6fdc4778e79d2b5bd1bae84e2f6ab1e92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:36:11 +0000 Subject: [PATCH 08/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index f707ec3..2a4d5c3 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,6 +1,6 @@ Name: uchardet Version: 0.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 @@ -69,6 +69,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Dec 22 2016 Ilya Gradina - 0.0.6-1 - update version to 0.0.6 - changed upstream url From 8c1697139a40a532ff4a8affabd139e533643fb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 20:51:54 +0000 Subject: [PATCH 09/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index 2a4d5c3..e881380 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,6 +1,6 @@ Name: uchardet Version: 0.0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 @@ -69,6 +69,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.0.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 8e58db9b51e5c462e22eac846dabf11f0acd3a52 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:41:49 +0000 Subject: [PATCH 10/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index e881380..f612ea7 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,6 +1,6 @@ Name: uchardet Version: 0.0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 @@ -69,6 +69,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 1d0b58c48c8db898c2b3e49f78cef6b29cafa891 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 3 Feb 2018 12:51:24 +0100 Subject: [PATCH 11/15] Switch to %ldconfig_scriptlets Signed-off-by: Igor Gnatenko --- uchardet.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/uchardet.spec b/uchardet.spec index f612ea7..490a9a9 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,6 +1,6 @@ Name: uchardet Version: 0.0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 @@ -43,8 +43,7 @@ pushd build %make_install popd -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %check pushd build @@ -69,6 +68,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Feb 03 2018 Igor Gnatenko - 0.0.6-5 +- Switch to %%ldconfig_scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 0.0.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 501e3577a5a64621b6b4416f76df15982b0beed7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 19:50:56 +0000 Subject: [PATCH 12/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index 490a9a9..12ff73e 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,6 +1,6 @@ Name: uchardet Version: 0.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 @@ -68,6 +68,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.0.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Feb 03 2018 Igor Gnatenko - 0.0.6-5 - Switch to %%ldconfig_scriptlets From 838b87b76ccb0d6165b2c177f3ef0ff8ffe1f852 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:07:41 +0000 Subject: [PATCH 13/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index 12ff73e..e982cf7 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,6 +1,6 @@ Name: uchardet Version: 0.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 @@ -68,6 +68,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.0.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 318d794efbb7aa5bf26c14ea7dd560050b1f4d63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:38:28 +0000 Subject: [PATCH 14/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index e982cf7..c77e7f2 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,6 +1,6 @@ Name: uchardet Version: 0.0.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 @@ -68,6 +68,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.0.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.0.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9ec6e3b06b084f7b816ef9be8b163c9b023bd486 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:17:43 +0000 Subject: [PATCH 15/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index c77e7f2..d5ffe27 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,6 +1,6 @@ Name: uchardet Version: 0.0.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An encoding detector library ported from Mozilla License: MPLv1.1 @@ -68,6 +68,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.0.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.0.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild