rpms/pidgin/devel pidgin.spec,1.87,1.88

Warren Togami 砥上勇 wtogami at fedoraproject.org
Tue Jul 28 01:58:20 UTC 2009


Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31701

Modified Files:
	pidgin.spec 
Log Message:
Fix libidn build failure



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- pidgin.spec	27 Jul 2009 19:00:15 -0000	1.87
+++ pidgin.spec	28 Jul 2009 01:58:20 -0000	1.88
@@ -30,6 +30,8 @@
 %define api_docs		0
 %define krb4_removed		0
 %define nss_md2_disabled	0
+%define vv_support		0
+%define libidn_support		0
 
 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer
 %if 0%{?fedora} < 5
@@ -61,7 +63,7 @@
 %define perl_embed_separated	1
 %define api_docs		1
 %endif
-# F11+: New NSS (3.12.3) disables weaker MD2 algorithm
+# F10+: New NSS (3.12.3) disables weaker MD2 algorithm
 %if 0%{?fedora} >= 10
 %define nss_md2_disabled	1
 %endif
@@ -69,6 +71,10 @@
 %if 0%{?fedora} >= 11
 %define vv_support	1
 %endif
+# F11+: libidn for punycode domain support
+%if 0%{?fedora} >= 11
+%define libidn_support	1
+%endif
 # F12+: krb4 removed
 %if 0%{?fedora} >= 12
 %define krb4_removed	1
@@ -77,7 +83,7 @@
 Name:		pidgin
 Version:	2.6.0
 %define snapshot 20090727
-Release:	0.7.%{snapshot}%{?dist}
+Release:	0.8.%{snapshot}%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -208,6 +214,10 @@ BuildRequires:  perl(ExtUtils::Embed)
 %if %{vv_support}
 BuildRequires:  farsight2-devel
 %endif
+# libidn punycode domain support (F11+)
+%if %{libidn_support}
+BuildRequires:  libidn-devel
+%endif
 
 %if %{api_docs}
 BuildRequires: doxygen
@@ -402,6 +412,9 @@ SWITCHES="--with-extraversion=%{release}
 %if ! %{meanwhile_integration}
 	SWITCHES="$SWITCHES --disable-meanwhile"
 %endif
+%if ! %{libidn_support}
+	SWITCHES="$SWITCHES --disable-idn"
+%endif
 
 # FC5+ automatic -fstack-protector-all switch
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
@@ -600,7 +613,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Mon Jul 27 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.7.20090727
+* Mon Jul 27 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.8.20090727
 - new snapshot
 
 * Mon Jul 27 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.0-0.6.20090721




More information about the fedora-extras-commits mailing list