From 1746aafbfd1e604a183966bf18f5f1609b2875fb Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Thu, 25 Jun 2015 14:08:15 +0200
Subject: [PATCH] 1.30-4

---
 libidn.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libidn.spec b/libidn.spec
index 97da8c3..4f89fd5 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -1,7 +1,7 @@
 Summary: Internationalized Domain Name support library
 Name: libidn
 Version: 1.30
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnu.org/software/libidn/
 License: LGPLv2+ and GPLv3+ and GFDL
 Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz
@@ -150,6 +150,9 @@ fi
 %license COPYING* java/LICENSE-2.0.txt
 
 %changelog
+* Thu Jun 25 2015 Miroslav Lichvar <mlichvar@redhat.com> - 1.30-4
+- merge emacs-libidn with main package (#1234563)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.30-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild