From 939a1388ab246f6fdbb118d3844cd77cb40aeb6d Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 2 Apr 2018 10:14:43 +0100
Subject: [PATCH] Split cli utilities out into a sub package, Spec file
 cleanups

---
 libidn2.spec | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/libidn2.spec b/libidn2.spec
index c7fcb94..d25d850 100644
--- a/libidn2.spec
+++ b/libidn2.spec
@@ -1,15 +1,17 @@
 Summary:          Library to support IDNA2008 internationalized domain names
 Name:             libidn2
 Version:          2.0.4
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          (GPLv2+ or LGPLv3+) and GPLv3+
-Group:            System Environment/Libraries
 URL:              https://www.gnu.org/software/libidn/#libidn2
+
 Source0:          https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz
 Source1:          https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz.sig
 Patch0:           libidn2-2.0.0-rpath.patch
 Patch1:           libidn2-2.0.4-std3-ascii-rules.patch
 Patch2:           libidn2-2.0.4-idn2-iconv-fail.patch
+
+BuildRequires:    gcc
 BuildRequires:    libunistring-devel
 Requires(post):   /sbin/install-info, /sbin/ldconfig
 Requires(preun):  /sbin/install-info
@@ -23,13 +25,19 @@ Libidn2 is an implementation of the IDNA2008 specifications in RFC
 
 %package devel
 Summary:          Development files for libidn2
-Group:            Development/Libraries
 Requires:         %{name}%{?_isa} = %{version}-%{release}, pkgconfig
 
 %description devel
 The libidn2-devel package contains libraries and header files for
 developing applications that use libidn2.
 
+%package utils
+Summary:          Command line utilities for libidn2
+Requires:         %{name}%{?_isa} = %{version}-%{release}, pkgconfig
+
+%description utils
+The libidn2-utils package contains command line utilities for the libidn2 library.
+
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
@@ -49,7 +57,6 @@ touch -c -r lib/register.c.idn2-iconv-fail lib/register.c
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
 # Clean-up examples for documentation
@@ -77,13 +84,8 @@ fi
 %postun -p /sbin/ldconfig
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LESSERv3 COPYING.unicode COPYINGv2
-%doc AUTHORS NEWS README.md
-%{_bindir}/idn2
-%{_mandir}/man1/idn2.1*
 %{_libdir}/%{name}.so.*
-%{_infodir}/%{name}.info*
 
 %files devel
 %doc doc/%{name}.html examples
@@ -93,7 +95,17 @@ fi
 %{_mandir}/man3/*
 %{_datadir}/gtk-doc/
 
+%files utils
+%doc AUTHORS NEWS README.md
+%{_bindir}/idn2
+%{_mandir}/man1/idn2.1*
+%{_infodir}/%{name}.info*
+
 %changelog
+* Mon Apr  2 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2.0.4-5
+- Split cli utilities out into a sub package
+- Spec file cleanups
+
 * Fri Mar 30 2018 Robert Scheck <robert@fedoraproject.org> 2.0.4-4
 - Added upstream patch to fix silently transliterated decoded
   domain names (#1556954)