SPECS: pidgin.spec - bconded silc (1.1 isn't compatible) - fixed %doc

[apollotiger]

Author: apollotiger                  Date: Thu May 10 21:14:26 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bconded silc (1.1 isn't compatible)
- fixed %doc

---- Files affected:
SPECS:
   pidgin.spec (1.170 -> 1.171) 

---- Diffs:

================================================================
Index: SPECS/pidgin.spec
diff -u SPECS/pidgin.spec:1.170 SPECS/pidgin.spec:1.171
--- SPECS/pidgin.spec:1.170	Thu May 10 08:29:03 2007
+++ SPECS/pidgin.spec	Thu May 10 23:14:21 2007
@@ -6,6 +6,7 @@
 # - external zephyr?
 #   http://packages.qa.debian.org/z/zephyr.html
 # - obsoletes for gaim
+# - port to silc 1.1 or package silc 1.0
 #
 %bcond_without	cap		# without Contact Availability Prediction
 %bcond_without	dbus		# without dbus (for pidgin-remote and others)
@@ -14,6 +15,7 @@
 %bcond_without	gtkspell	# without gtkspell support
 %bcond_without	meanwhile	# without meanwhile support
 %bcond_without	text		# don't build text UI
+%bcond_with 	silc		# Build with SILC libraries
 #
 %include	/usr/lib/rpm/macros.perl
 Summary:	A client compatible with AOL's 'Instant Messenger'
@@ -58,7 +60,7 @@
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.177
-BuildRequires:	silc-toolkit-devel
+%{?with_silc:BuildRequires:	silc-toolkit-devel < 1.1}
 BuildRequires:	tcl-devel
 BuildRequires:	tk-devel
 %{?with_text:BuildRequires:	ncurses-ext-devel}
@@ -222,6 +224,8 @@
 	--disable-nas \
 	--enable-nss=no \
 	--with-perl-lib=vendor \
+	--with-silc-includes=%{?with_silc:yes}%{!?with_silc:no} \
+	--with-silc-libs=%{?with_silc:yes}%{!?with_silc:no} \
 	--%{?with_cap:en}%{!?with_cap:dis}able-cap \
 	%{?with_dbus:--enable-dbus --with-dbus-session-dir=/usr/share/dbus-1/services} \
 	%{!?with_dbus:--disable-dbus} \
@@ -262,7 +266,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog{,.API} HACKING NEWS PLUGIN_HOWTO PROGRAMMING_NOTES README* doc/FAQ
+%doc AUTHORS ChangeLog{,.API} HACKING NEWS PLUGIN_HOWTO README*
 %attr(755,root,root) %{_bindir}/pidgin
 %attr(755,root,root) %{_bindir}/finch
 %dir %{_libdir}/pidgin
@@ -420,6 +424,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.171  2007/05/10 21:14:21  apollotiger
+- bconded silc (1.1 isn't compatible)
+- fixed %doc
+
 Revision 1.170  2007/05/10 06:29:03  qboosh
 - some files fixes (not sure about bconds)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pidgin.spec?r1=1.170&r2=1.171&f=u