From 1790083394b83b2746dfb060871282a56afdcbda Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Jun 25 2015 12:11:01 +0000
Subject: merge emacs-libidn with main package (#1234563)


---

diff --git a/libidn.spec b/libidn.spec
index 9360322..97da8c3 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -6,12 +6,16 @@ URL: http://www.gnu.org/software/libidn/
 License: LGPLv2+ and GPLv3+ and GFDL
 Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz
 Group: System Environment/Libraries
-BuildRequires: pkgconfig, gettext
+BuildRequires: pkgconfig gettext emacs
 Requires(post): /sbin/install-info /sbin/ldconfig
 Requires(preun): /sbin/install-info
 Requires(postun): /sbin/ldconfig
 # gnulib is a copylib, bundling is allowed
 Provides: bundled(gnulib)
+# emacs-libidn merged with main package in 1.30-4
+Obsoletes: emacs-libidn < 1.30-4
+Provides: emacs-libidn < 1.30-4
+Requires: emacs-filesystem >= %{_emacs_version}
 
 %description
 GNU Libidn is an implementation of the Stringprep, Punycode and
@@ -29,17 +33,6 @@ Requires: pkgconfig
 This package includes header files and libraries necessary for
 developing programs which use the GNU libidn library.
 
-%package -n emacs-%{name}
-Summary: GNU Emacs libidn support files
-License: GPLv3+
-BuildRequires: emacs
-Requires: %{name} = %{version}-%{release}
-Requires: emacs(bin) >= %{_emacs_version}
-BuildArch: noarch
-
-%description -n emacs-%{name}
-This package includes libidn support files for GNU Emacs.
-
 %package java
 Summary:       Java port of the GNU Libidn library
 BuildRequires: java-devel
@@ -141,6 +134,7 @@ fi
 %{_mandir}/man1/idn.1*
 %{_libdir}/libidn.so.*
 %{_infodir}/%{name}.info.gz
+%{_emacs_sitelispdir}/%{name}
 
 %files devel
 %doc doc/libidn.html examples
@@ -149,9 +143,6 @@ fi
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/*
 
-%files -n emacs-%{name}
-%{_emacs_sitelispdir}/%{name}
-
 %files java -f .mfiles
 %license COPYING* java/LICENSE-2.0.txt