libpsl.spec

@@ -1,14 +1,18 @@
 Name:		libpsl
-Version:	0.21.2
+Version:	0.21.1
-Release:	1
+Release:        2
 Summary:	C library to handle the Public Suffix List
 License:	MIT
 URL:		https://github.com/rockdaboot/libpsl
 Source0:	https://github.com/rockdaboot/libpsl/releases/download/%{version}/libpsl-%{version}.tar.gz
 
-BuildRequires:	gcc gtk-doc glib2-devel libxslt python3-devel
+BuildRequires:	gcc git gtk-doc glib2-devel libxslt python3-devel
 BuildRequires:	libicu-devel libidn2-devel publicsuffix-list libunistring-devel 
 Requires:	publicsuffix-list
+Provides:       psl = %{version}-%{release}
+Obsoletes:      psl <= %{version}-%{release}
+Provides:       psl-make-dafsa = %{version}-%{release}
+Obsoletes:      psl-make-dafsa <= %{version}-%{release}
 
 %description
 Libpsl is a C library to handle the Public Suffix List. A Public Suffix List is a
@@ -44,24 +48,8 @@ Requires:	man
 %description 	help
 The %{name}-help package contains doc files for %{name}.
 
-%package -n     psl
-Summary:        Commandline utility to explore the Public Suffix List
-
-%description -n psl
-This package contains a commandline utility to explore the Public Suffix List,
-for example it checks if domains are public suffixes, checks if cookie-domain
-is acceptable for domains and so on.
-
-%package -n     psl-make-dafsa
-Summary:        Compiles the Public Suffix List into DAFSA form
-
-%description -n psl-make-dafsa
-This script produces C/C++ code or an architecture-independent binary object
-which represents a Deterministic Acyclic Finite State Automaton (DAFSA)
-from a plain text Public Suffix List.
-
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -n %{name}-%{version} -p1 -S git
 sed -i -e "1s|#!.*|#!%{__python3}|" src/psl-make-dafsa
 
 %build
@@ -94,6 +82,8 @@ make check
 %files
 %license COPYING AUTHORS
 %{_libdir}/%{name}.so.*
+%{_bindir}/psl
+%{_bindir}/psl-make-dafsa
 
 %files devel
 %{_includedir}/%{name}.h
@@ -106,31 +96,7 @@ make check
 %{_mandir}/man*/*
 %{_datadir}/gtk-doc/html/%{name}
 
-%files -n psl
-%doc AUTHORS NEWS
-%license COPYING
-%{_bindir}/psl
-
-%files -n psl-make-dafsa
-%license COPYING
-%{_bindir}/psl-make-dafsa
-
 %changelog
-* Tue Jan 17 2023 fuanan <fuanan3@h-partners.com> - 0.21.2-1
-- Type:update
-- ID: NA
-- SUG: NA
-- DESC:update version to 0.21.2
-
-* Tue Oct 18 2022 gaoruoshu <gaoruoshu@huawei.com> - 0.21.1-5
-- change release
-
-* Thu Feb 17 2022 fushanqing <fushanqing@kylinos.cn> - 0.21.1-4
-- add subpackage psl-make-dafsa and psl
-
-* Mon Jul 26 2021 panxiaohe <panxiaohe@huawei.com> - 0.21.1-3
-- Remove unnecessary BuildRequires:git
-
 * Tue Jul 20 2021 fuanan <fuanan3@huawei.com> - 0.21.1-2
 - Remove redundant gdb from BuildRequires
 
@@ -146,7 +112,7 @@ make check
 - SUG: NA
 - DESC: docs: don't include the type hierarchy 
 
-* Wed Nov 6 2019 luhuaxin <luhuaxin@huawei.com> - 0.20.2-9
+* Wed Oct 10 2019 luhuaxin <luhuaxin@huawei.com> - 0.20.2-9
 - Type: enhancement
 - ID: NA
 - SUG: NA