Author: glen Date: Thu Oct 18 17:25:51 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - ac-branch merge; rel 1 as it's usable
---- Files affected: SPECS: pidgin.spec (1.196 -> 1.197) ---- Diffs: ================================================================ Index: SPECS/pidgin.spec diff -u SPECS/pidgin.spec:1.196 SPECS/pidgin.spec:1.197 --- SPECS/pidgin.spec:1.196 Wed Oct 17 13:51:22 2007 +++ SPECS/pidgin.spec Thu Oct 18 19:25:46 2007 @@ -5,9 +5,7 @@ # - kerberos 4 with zephyr support? # - external zephyr? # http://packages.qa.debian.org/z/zephyr.html -# - obsoletes for gaim # - move mono related files to -libs? -# - unpackaged certificates /usr/share/purple/ca-certs/*_CA.pem # - add NetworkManager support # %bcond_without cap # without Contact Availability Prediction @@ -29,7 +27,7 @@ Summary(pt_BR.UTF-8): Um cliente para o AOL Instant Messenger (AIM) Name: pidgin Version: 2.2.1 -Release: 0.2 +Release: 1 License: GPL Group: Applications/Communications Source0: http://dl.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2 @@ -84,9 +82,9 @@ %{?with_sasl:Requires(hint): cyrus-sasl-digest-md5} Requires(post,preun): GConf2 >= 2.16.0 Requires: %{name}-libs = %{version}-%{release} -# weird: it *should* break after DynaLoader's version change, but it doesn't -#Requires: perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION') +Obsoletes: gaim Obsoletes: gaim-ui +Obsoletes: gaim-ui-gtk BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -264,6 +262,7 @@ %find_lang %{name} --with-gnome rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/Pidgin/{,GtkUI}/.packlist} +rm -rf $RPM_BUILD_ROOT%{_datadir}/purple/ca-certs %if %{with dbus} rm $RPM_BUILD_ROOT%{_bindir}/purple-client-example @@ -281,12 +280,6 @@ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%triggerpostun -- gaim < 1:1.3.1-1.10 -%banner -e %{name} <<EOF -The Ximian Evolution and pidgin-remote plugins have been separated to separate packages. -If you need then please install %{name}-plugin-evolution and %{name}-plugin-remote -EOF - %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog{,.API} HACKING NEWS PLUGIN_HOWTO README* @@ -295,7 +288,6 @@ %attr(755,root,root) %{_libdir}/purple-2/autoaccept.so %attr(755,root,root) %{_libdir}/purple-2/buddynote.so %if %{with cap} -#%attr(755,root,root) %{_libdir}/pidgin/autoreply.so %attr(755,root,root) %{_libdir}/pidgin/cap.so %endif %if %{with dotnet} @@ -303,14 +295,12 @@ %attr(755,root,root) %{_libdir}/purple-2/mono.so %endif %attr(755,root,root) %{_libdir}/pidgin/convcolors.so -#%attr(755,root,root) %{_libdir}/pidgin/docklet.so %attr(755,root,root) %{_libdir}/pidgin/extplacement.so %attr(755,root,root) %{_libdir}/pidgin/pidginrc.so %attr(755,root,root) %{_libdir}/pidgin/gestures.so %attr(755,root,root) %{_libdir}/pidgin/gtkbuddynote.so %attr(755,root,root) %{_libdir}/pidgin/history.so %attr(755,root,root) %{_libdir}/pidgin/iconaway.so -#%attr(755,root,root) %{_libdir}/pidgin/liboscar.so %attr(755,root,root) %{_libdir}/pidgin/markerline.so %attr(755,root,root) %{_libdir}/pidgin/notify.so %attr(755,root,root) %{_libdir}/pidgin/relnot.so @@ -363,7 +353,6 @@ %attr(755,root,root) %{_bindir}/purple-send %attr(755,root,root) %{_bindir}/purple-send-async %attr(755,root,root) %{_libdir}/pidgin/musicmessaging.so -#%{_datadir}/dbus-1/services/pidgin.service %endif %{_sysconfdir}/gconf/schemas/purple.schemas %{_datadir}/sounds/purple @@ -400,10 +389,8 @@ %if %{with text} %attr(755,root,root) %{_libdir}/libgnt.so %{_libdir}/libgnt.la -#%dir %{_includedir}/pidgin/gnt %dir %{_includedir}/gnt %dir %{_includedir}/finch -#%{_includedir}/pidgin/gnt/*.h %{_includedir}/gnt/*.h %{_includedir}/finch/*.h %endif @@ -414,18 +401,12 @@ %{perl_vendorarch}/*.pm %dir %{perl_vendorarch}/auto/Pidgin %dir %{perl_vendorarch}/auto/Purple -#%{perl_vendorarch}/auto/Pidgin/*.ix %{perl_vendorarch}/auto/Pidgin/*.bs %{perl_vendorarch}/auto/Purple/*.ix %{perl_vendorarch}/auto/Purple/*.bs %attr(755,root,root) %{perl_vendorarch}/auto/Purple/Purple.so %{perl_vendorarch}/auto/Purple/.packlist -#%dir %{perl_vendorarch}/auto/Pidgin/GtkUI -#%{perl_vendorarch}/auto/Pidgin/GtkUI/*.bs -#%dir %{perl_vendorarch}/Pidgin -#%{perl_vendorarch}/Pidgin/*.pm %attr(755,root,root) %{perl_vendorarch}/auto/Pidgin/*.so -#%attr(755,root,root) %{perl_vendorarch}/auto/Pidgin/GtkUI/*.so %files tcl %defattr(644,root,root,755) @@ -455,6 +436,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.197 2007/10/18 17:25:46 glen +- ac-branch merge; rel 1 as it's usable + Revision 1.196 2007/10/17 11:51:22 glen - dotnet needs /proc - cosmetics @@ -529,7 +513,7 @@ Revision 1.176 2007/06/27 13:21:17 czarny - Suggests: cyrus-sasl-digetst-md5; won't connect to PLD's jabber -without it + without it Revision 1.175 2007/05/28 13:25:16 patrys - 2.0.1 @@ -586,7 +570,7 @@ - version 2.0.0 beta6 - bcond --without cap - removed -desktop.patch (+- applied) -- update %%files (so it can be built using misc --without) +- update %files (so it can be built using misc --without) Revision 1.154.2.23 2007/01/12 13:25:35 radek - release 0._pre.2: bcond_without text for text ui @@ -605,7 +589,7 @@ - reverted bogus change Revision 1.154.2.18 2006/08/15 22:53:23 czarny - - BR dbus-glib-devel => dbus-devel +- BR dbus-glib-devel => dbus-devel Revision 1.154.2.17 2006/08/10 21:12:39 freetz - rel.2, bleeding edge deps, libadd patch added ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pidgin.spec?r1=1.196&r2=1.197&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
