diff pidgin.spec.in @ 20407:1122d47583a1

explicit merge of 'd42ad2da81f881b2fbd2fb080cc70a843bc70d02' and '8582c561c020d2d1e8d358e2e7cd9e3da113ed9e' to branch 'im.pidgin.cpw.khc.msnp14'

--- a/pidgin.spec.in	Sun Apr 15 20:12:06 2007 +0000
+++ b/pidgin.spec.in	Wed May 02 05:25:27 2007 +0000
@@ -18,11 +18,9 @@
 Name:       @PACKAGE@
 Version:    %pidginver
 Release:    0%{?beta:.beta%{beta}}
-Epoch:      0
 License:    GPL
 Group:      Applications/Internet
 URL:        http://pidgin.im/
-Packager:   %{packager}
 Source:     %{name}-@VERSION@.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 
@@ -34,8 +32,8 @@
 %{?_with_meanwhile:BuildRequires: meanwhile-devel}
 %{?_with_mono:BuildRequires: mono-devel}
 %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
-%{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h}
-%{?_with_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h}
+%{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+%{!?_without_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h}
 %{!?_without_text:BuildRequires: ncurses-devel}
 
 %if "%{_vendor}" == "suse"
@@ -68,68 +66,63 @@
 
 # For some reason perl isn't always automatically detected as a requirement :(
 Requires: perl
-# Gadu-Gadu support was split out temporarily (only as gaim)
-Provides: gaim-gadugadu = %{epoch}:%{version}-%{release}
+
+Obsoletes: gaim
+Provides: gaim
 
 %package devel
 Summary:    Development headers, documentation, and libraries for Pidgin
 Group:      Applications/Internet
-Requires:   pkgconfig, pidgin = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version}
+Requires:   pidgin = %{version}, libpurple-devel = %{version}
+Requires:   pkgconfig
+Obsoletes:  gaim-devel
+Provides:   gaim-devel
 
 %package -n libpurple
 Summary:    libpurple library for IM clients like Pidgin and Finch
 Group:      Applications/Internet
+Obsoletes:  gaim-silc
+Obsoletes:  gaim-tcl
+Obsoletes:  gaim-gadugadu
 
 %package -n libpurple-devel
 Summary:    Development headers, documentation, and libraries for libpurple
 Group:      Applications/Internet
-Requires:	libpurple = %{epoch}:%{version}
+Requires:   libpurple = %{version}
+Requires:   pkgconfig
 
 %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
 %package -n libpurple-bonjour
 Summary:    Bonjour plugin for Pidgin
 Group:      Applications/Internet
-Requires:   libpurple = %{epoch}:%{version}
+Requires:   libpurple = %{version}
 %endif
 
 %if 0%{?_with_meanwhile:1}
 %package -n libpurple-meanwhile
 Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
 Group:      Applications/Internet
-Requires:   libpurple = %{epoch}:%{version}
+Requires:   libpurple = %{version}
 %endif
 
 %if 0%{?_with_mono:1}
 %package -n libpurple-mono
 Summary:    Mono .NET plugin support for Pidgin
 Group:      Applications/Internet
-Requires:   libpurple = %{epoch}:%{version}
-%endif
-
-%if 0%{?_with_silc:1}
-%package -n libpurple-silc
-Summary:    SILC (Secure Internet Live Conferencing) plugin for Pidgin
-Group:      Applications/Internet
-Requires:   libpurple = %{epoch}:%{version}
-%endif
-
-%if 0%{?_with_tcl:1}
-%package -n libpurple-tcl
-Summary:    Tcl scripting support for Pidgin
-Group:      Applications/Internet
-Requires:   libpurple = %{epoch}:%{version}
+Requires:   libpurple = %{version}
 %endif
 
 %if 0%{!?_without_text:1}
 %package -n finch
 Summary:    A text-based user interface for Pidgin
 Group:      Applications/Internet
-Requires:   libpurple = %{epoch}:%{version}
+Requires:   libpurple = %{version}
 
 %package -n finch-devel
-Summary:	Headers etc. for finch stuffs
+Summary:    Headers etc. for finch stuffs
 Group:      Applications/Internet
-Requires:   finch = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version}
+Requires:   finch = %{version}, libpurple-devel = %{version}
+Requires:   pkgconfig
 %endif
 
 %description
@@ -152,10 +145,17 @@
 and plugins.
 
 %description -n libpurple
-someone write a good description of libpurple please
+libpurple contains the core IM support for IM clients such as Pidgin
+and Finch.
+
+libpurple supports a variety of messaging protocols including AIM, MSN,
+Yahoo!, Jabber, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+Lotus Sametime, SILC, Simple and Zephyr.
 
 %description -n libpurple-devel
-someone write a good description of libpurple-devel please
+The libpurple-devel package contains the header files, developer
+documentation, and libraries required for development of libpurple based
+instant messaging clients or plugins for any libpurple based client.
 
 %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
 %description -n libpurple-bonjour
@@ -173,26 +173,17 @@
 use Pidgin plugins written in the .NET programming language.
 %endif
 
-%if 0%{?_with_silc:1}
-%description -n libpurple-silc
-SILC (Secure Internet Live Conferencing) plugin for Pidgin.
-%endif
-
-%if 0%{!?without_text:1}
+%if 0%{!?_without_text:1}
 %description -n finch
-A text-based user interface for Pidgin.  This can be run from a
+A text-based user interface for using libpurple.  This can be run from a
 standard text console or from a terminal within X Windows.  It
 uses ncurses and our homegrown gnt library for drawing windows
 and text.
 
 %description -n finch-devel
-Finch devel blah blah
-%endif
-
-%if 0%{?_with_tcl:1}
-%description -n libpurple-tcl
-Tcl plugin loader for Pidgin.  This package will allow you to write or
-use Pidgin plugins written in the Tcl programming language.
+The finch-devel package contains the header files, developer
+documentation, and libraries required for development of Finch scripts
+and plugins.
 %endif
 
 %prep
@@ -214,9 +205,9 @@
                                     %{?_with_perlmakehack:--with-perl-lib=%{buildroot}%{_prefix}} \
                                     %{!?_with_perlmakehack:--with-perl-lib=%{_prefix}} \
                                     %{?_with_sasl:--enable-cyrus-sasl} \
-                                    %{?_with_silc:--with-silc-includes=%{_includedir}/silc} \
-                                    %{?_with_silc:--with-silc-libs=%{_libdir}/silc} \
-                                    %{!?_with_tcl:--disable-tcl} \
+                                    %{!?_without_silc:--with-silc-includes=%{_includedir}/silc} \
+                                    %{!?_without_silc:--with-silc-libs=%{_libdir}/silc} \
+                                    %{?_without_tcl:--disable-tcl} \
                                     %{?_without_text:--disable-consoleui}
 
 make %{?_smp_mflags}
@@ -242,9 +233,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}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/libbonjour.so
@@ -259,11 +247,11 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/*.dll
 %endif
 
-%if 0%{!?_with_silc:1}
+%if 0%{?_without_silc:1}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/libsilcpurple.so
 %endif
 
-%if 0%{!?_with_tcl:1}
+%if 0%{?_without_tcl:1}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/tcl.so
 %endif
 
@@ -278,12 +266,9 @@
 find $RPM_BUILD_ROOT%{_libdir}/libpurple -xtype f -print | \
         sed "s@^$RPM_BUILD_ROOT@@g" | \
         grep -v /libbonjour.so | \
-        grep -v /libsilcpurple.so | \
         grep -v /libsametime.so | \
         grep -v /mono.so | \
-        grep -v /tcl.so | \
-        grep -v ".dll$" | \
-        grep -v ".tcl$" > %{name}-%{version}-purpleplugins
+        grep -v ".dll$" > %{name}-%{version}-purpleplugins
 
 find $RPM_BUILD_ROOT%{_libdir}/pidgin -xtype f -print | \
         sed "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-pidginplugins
@@ -314,7 +299,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
@@ -324,7 +312,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)
@@ -335,8 +325,7 @@
 %doc ChangeLog
 %doc NEWS
 %doc README
-%doc README.SVN
-%doc doc/FAQ
+%doc README.MTN
 %doc doc/the_penguin.txt
 %doc %{_mandir}/man1/pidgin.*
 %doc %{_mandir}/man3*/*
@@ -348,7 +337,6 @@
 
 %{_bindir}/pidgin
 %{_datadir}/pixmaps/pidgin
-%{_datadir}/pixmaps/pidgin.svg
 %dir %{_datadir}/sounds/pidgin
 %{_datadir}/sounds/pidgin/*
 %{_datadir}/applications/*
@@ -374,7 +362,6 @@
 %{_bindir}/purple-send-async
 %{_bindir}/purple-url-handler
 %{_libdir}/libpurple-client.so.*
-%{_datadir}/dbus-1/services/gaim.service
 %doc README.dbus
 %doc libpurple/purple-notifications-example
 %endif
@@ -425,20 +412,6 @@
 %{_libdir}/libpurple/*.dll
 %endif
 
-%if 0%{?_with_silc:1}
-%files -n libpurple-silc
-%defattr(-, root, root)
-
-%{_libdir}/libpurple/libsilcpurple.*
-%endif
-
-%if 0%{?_with_tcl:1}
-%files -n libpurple-tcl
-%defattr(-, root, root)
-
-%{_libdir}/libpurple/tcl.so
-%endif
-
 %if 0%{!?_without_text:1}
 %files -f %{name}-%{version}-finchplugins -n finch
 %defattr(-, root, root)
@@ -460,6 +433,26 @@
 %endif
 
 %changelog
+* Sun Apr 22 2007 Stu Tomlinson <[e-mail]>
+- Remove Epoch because it's gone in Fedora now
+- Add virtual provides for gaim & gaim-devel
+
+* 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
+
+* Sun Apr 15 2007 Stu Tomlinson <[e-mail]>
+- Fix for building without Finch
+- Drop -tcl & -silc sub-packages, include them in the main libpurple
+  package (--without tcl and --without silc can be used to build libpurple
+  without support for these).
+
 * Thu Apr 12 2007 Stu Tomlinson <[e-mail]>
 - Actually move libpurple.so.* to the libpurple RPM
 
@@ -520,7 +513,7 @@
 - Fix SILC build requirements to work across more distros
 
 * Mon Oct 11 2004 John Jolly <[e-mail]>
-- Added if "%{_vendor}" == "suse" to handle GnuTLS libraries for SuSE
+- Added if "%%{_vendor}" == "suse" to handle GnuTLS libraries for SuSE
 
 * Sat Oct  2 2004 Stu Tomlinson <[e-mail]>
 - If --with tcl or silc are not specified, make sure the plugins don't
@@ -545,7 +538,7 @@
 
 * Sun Jul 20 2003 Bjoern Voigt <[e-mail]>
 - Added pkgconfig build dependency.
-- if "%{_vendor}" != "MandrakeSoft" now also works with rpm 3.x.
+- if "%%{_vendor}" != "MandrakeSoft" now also works with rpm 3.x.
 - Added Gaim-specific directories to list of Gaim's files.
 
 * Wed Jul 16 2003 Ethan Blanton <[e-mail]>