changeset 18514:ad12ae61bb2c

merge of '0adbd7ac0c14d3a1d56a31f03baa87c9af63cbe6' and '4d48aaa6c979334ad9d29d964f2a4c30dc60a2d3'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Fri, 13 Jul 2007 10:51:25 +0000
parents 602e8264266a (diff) 0cb139b20d65 (current diff)
children 3b19fa8d0177
files
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin.spec.in	Fri Jul 13 10:50:43 2007 +0000
+++ b/pidgin.spec.in	Fri Jul 13 10:51:25 2007 +0000
@@ -225,8 +225,6 @@
                                     %{?_with_perlmakehack:--with-perl-lib=%{buildroot}%{_prefix}} \
                                     %{!?_with_perlmakehack:--with-perl-lib=%{_prefix}} \
                                     %{?_with_sasl:--enable-cyrus-sasl} \
-                                    %{!?_without_silc:--with-silc-includes=%{_includedir}/silc} \
-                                    %{!?_without_silc:--with-silc-libs=%{_libdir}/silc} \
                                     %{?_without_tcl:--disable-tcl} \
                                     %{?_without_text:--disable-consoleui}
 
@@ -458,6 +456,11 @@
 %endif
 
 %changelog
+* Thu Jul 12 2007 Stu Tomlinson <stu@nosnilmot.com>
+- Don't hardcode silc header locations, rely on pkg-config for those,
+  because I think I broke non-pkg-config detection of older silc
+  toolkit.
+
 * Tue Jun 5 2007 Stu Tomlinson <stu@nosnilmot.com>
 - Add missing Requires for gtk2-devel, dbus-devel & ncurses-devel to
   appropriate -devel subpackages