pidgin/pidgin

merge of '86051d2c303f072b84abd0c006f6ca4e7bd9cea7'
release-2.2.1
2007-10-01, Luke Schierer
4d3a417f3d02
merge of '86051d2c303f072b84abd0c006f6ca4e7bd9cea7'
and 'd698a51b3942fded75c51a242afa92541254da2d'
--- a/pidgin.spec.in Mon Oct 01 17:47:06 2007 +0000
+++ b/pidgin.spec.in Mon Oct 01 17:47:45 2007 +0000
@@ -363,6 +363,8 @@
%{_bindir}/pidgin
%{_datadir}/pixmaps/pidgin
%{_datadir}/icons/hicolor/*/apps/pidgin.*
+%dir %{_datadir}/sounds/pidgin
+%{_datadir}/sounds/pidgin/*
%{_datadir}/applications/*
%{_sysconfdir}/gconf/schemas/purple.schemas
@@ -372,8 +374,6 @@
%{_libdir}/libpurple.so.*
%dir %{_libdir}/purple-2
-%{_datadir}/purple
-%{_datadir}/sounds/purple
%attr(755, root, root) %{perl_vendorarch}/Purple.pm
%attr(755, root, root) %{perl_vendorarch}/auto/Purple
@@ -427,7 +427,7 @@
%endif
%if 0%{?_with_mono:1}
-%files -n libpurple-mono
+%files libpurple-mono
%defattr(-, root, root)
%{_libdir}/purple-2/mono.so
@@ -457,9 +457,6 @@
%endif
%changelog
-* Fri Sep 14 2007 Stu Tomlinson <stu@nosnilmot.com>
-- Fix spec file for moved sounds & new CA certificates
-
* 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