diff pidgin.spec.in @ 16269:c14a05c00484

merge of '6b7a5fb8f33d3f1801a33540b42b5fb01b69511a' and '7d305ece871339300b733aa498ca247d21b5aa41'

--- a/pidgin.spec.in	Fri Apr 20 00:47:25 2007 +0000
+++ b/pidgin.spec.in	Fri Apr 20 00:47:30 2007 +0000
@@ -18,7 +18,7 @@
 Name:       @PACKAGE@
 Version:    %pidginver
 Release:    0%{?beta:.beta%{beta}}
-Epoch:      0
+Epoch:      2
 License:    GPL
 Group:      Applications/Internet
 URL:        http://pidgin.im/
@@ -72,7 +72,8 @@
 %package devel
 Summary:    Development headers, documentation, and libraries for Pidgin
 Group:      Applications/Internet
-Requires:   pkgconfig, pidgin = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version}
+Requires:   pidgin = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version}
+Requires:   pkgconfig
 Obsoletes:  gaim-devel
 
 %package -n libpurple
@@ -86,6 +87,7 @@
 Summary:    Development headers, documentation, and libraries for libpurple
 Group:      Applications/Internet
 Requires:   libpurple = %{epoch}:%{version}
+Requires:   pkgconfig
 
 %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
 %package -n libpurple-bonjour
@@ -118,6 +120,7 @@
 Summary:    Headers etc. for finch stuffs
 Group:      Applications/Internet
 Requires:   finch = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version}
+Requires:   pkgconfig
 %endif
 
 %description
@@ -228,8 +231,6 @@
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
-# do we want to ship the nullclient ?
-rm -f $RPM_BUILD_ROOT%{_bindir}/nullclient
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gaim.svg
 
 %if 0%{!?_with_howl:1} && 0%{!?_with_avahi:1}
@@ -297,7 +298,10 @@
         %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
     killall -HUP gconfd-2 || :
 fi
-/sbin/ldconfig
+
+%post -n libpurple -p /sbin/ldconfig
+
+%post -n finch -p /sbin/ldconfig
 
 %preun
 if [ "$1" -eq 0 -a -n "`which gconftool-2 2>/dev/null`" ]; then
@@ -307,7 +311,9 @@
     killall -HUP gconfd-2 || :
 fi
 
-%postun -p /sbin/ldconfig
+%postun -n libpurple -p /sbin/ldconfig
+
+%postun -n finch -p /sbin/ldconfig
 
 %files -f %{name}-%{version}-pidginplugins
 %defattr(-, root, root)
@@ -330,7 +336,6 @@
 
 %{_bindir}/pidgin
 %{_datadir}/pixmaps/pidgin
-%{_datadir}/pixmaps/pidgin.svg
 %dir %{_datadir}/sounds/pidgin
 %{_datadir}/sounds/pidgin/*
 %{_datadir}/applications/*
@@ -427,6 +432,12 @@
 %endif
 
 %changelog
+* Thu Apr 19 2007 Stu Tomlinson <[e-mail]>
+- Fix pkgconfig Requires
+- Add ldconfig in pre/post scripts for libpurple & finch
+- Bump Epoch to 2 because Fedora unfortunately forgot to drop the Epoch
+  during the rename :(
+
 * Tue Apr 17 2007 Stu Tomlinson <[e-mail]>
 - Add some Obsolete:s to help upgrades
 - Remove explicit Packager: %%{packager} from spec, it was redundant