rpms/pidgin/FC-6 .cvsignore, 1.4, 1.5 pidgin.spec, 1.14, 1.15 sources, 1.4, 1.5

[Stu Tomlinson (nosnilmot)]

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11793

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
Pidgin 2.0.1 has been released



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pidgin/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 May 2007 17:11:26 -0000	1.4
+++ .cvsignore	29 May 2007 01:52:18 -0000	1.5
@@ -1 +1 @@
-pidgin-2.0.0.tar.bz2
+pidgin-2.0.1.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/FC-6/pidgin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pidgin.spec	7 May 2007 17:09:04 -0000	1.14
+++ pidgin.spec	29 May 2007 01:52:18 -0000	1.15
@@ -1,4 +1,4 @@
-# OPTION: perl integration (FC1+)
+# OPTION: perl split into subpackages (FC1+)
 %define perl_integration	1
 # OPTION: krb5 for Zephyr protocol (FC1+)
 %define krb_integration		1
@@ -26,8 +26,8 @@
 %define perl_devel_separated    0
 
 Name:		pidgin
-Version:	2.0.0
-Release:	2%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://pidgin.im/
@@ -79,6 +79,8 @@
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
 BuildRequires:  ncurses-devel
+BuildRequires:  tcl-devel
+BuildRequires:  tk-devel
 
 # krb5 needed for Zephyr (FC1+)
 %if %{krb_integration}
@@ -166,6 +168,18 @@
 documentation, and libraries required for development of Pidgin scripts
 and plugins.
 
+%if %{perl_integration}
+%package perl
+Summary:    Perl scripting support for Pidgin
+Group:      Applications/Internet
+Requires:   libpurple = %{version}-%{release}
+Requires:   libpurple-perl = %{version}-%{release}
+
+%description perl
+Perl plugin loader for Pidgin. This package will allow you to write or
+use Pidgin plugins written in the Perl programming language.
+%endif
+
 
 %package -n libpurple
 Summary:    libpurple library for IM clients like Pidgin and Finch
@@ -177,7 +191,6 @@
 # Bug #212817 Jabber needs cyrus-sasl plugins for authentication
 Requires: cyrus-sasl-plain, cyrus-sasl-md5
 
-
 %description -n libpurple
 libpurple contains the core IM support for IM clients such as Pidgin
 and Finch.
@@ -198,6 +211,27 @@
 documentation, and libraries required for development of libpurple based
 instant messaging clients or plugins for any libpurple based client.
 
+%if %{perl_integration}
+%package -n libpurple-perl
+Summary:    Perl scripting support for libpurple
+Group:      Applications/Internet
+Requires:   libpurple = %{version}-%{release}
+
+%description -n libpurple-perl
+Perl plugin loader for libpurple. This package will allow you to write or
+use libpurple plugins written in the Perl programming language.
+%endif
+
+
+%package -n libpurple-tcl
+Summary:    Tcl scripting support for libpurple
+Group:      Applications/Internet
+Requires:   libpurple = %{version}-%{release}
+
+%description -n libpurple-tcl
+Tcl plugin loader for libpurple. This package will allow you to write or
+use libpurple plugins written in the Tcl programming language.
+
 
 %package -n finch
 Summary:    A text-based user interface for Pidgin
@@ -276,9 +310,8 @@
 export CFLAGS="$RPM_OPT_FLAGS"
 
 # gnutls is buggy so use mozilla-nss on all distributions
-# disable tcl and tk (at least until we split them out)
-%configure --disable-tcl --disable-tk \
-           --enable-gnutls=no --enable-nss=yes --enable-cyrus-sasl \
+%configure --enable-gnutls=no --enable-nss=yes --enable-cyrus-sasl \
+           --enable-tcl --enable-tk \
            --disable-schemas-install $SWITCHES
 
 make %{?_smp_mflags}
@@ -366,13 +399,16 @@
 %{_bindir}/gaim
 %{_libdir}/pidgin/
 %{_mandir}/man1/pidgin.*
-%{_mandir}/man3/Pidgin*
 %{_datadir}/applications/pidgin.desktop
 %{_datadir}/pixmaps/pidgin/
 %{_datadir}/icons/hicolor/*/apps/pidgin.*
 %{_datadir}/sounds/pidgin/
 %{_sysconfdir}/gconf/schemas/purple.schemas
+
 %if %{perl_integration}
+%files perl
+%defattr(-,root,root,-)
+%{_mandir}/man3/Pidgin*
 %{perl_vendorarch}/Pidgin.pm
 %dir %{perl_vendorarch}/auto/Pidgin/
 %{perl_vendorarch}/auto/Pidgin/Pidgin.so
@@ -386,15 +422,8 @@
 %files -f pidgin.lang -n libpurple
 %{_libdir}/purple-2/
 %{_libdir}/libpurple.so.*
-%{_mandir}/man3/Purple*
 %{_datadir}/pixmaps/purple/
 %{_sysconfdir}/purple/
-%if %{perl_integration}
-%{perl_vendorarch}/Purple.pm
-%dir %{perl_vendorarch}/auto/Purple/
-%{perl_vendorarch}/auto/Purple/Purple.so
-%{perl_vendorarch}/auto/Purple/autosplit.ix
-%endif
 %if %{dbus_integration}
 %{_bindir}/purple-client-example
 %{_bindir}/purple-remote
@@ -405,6 +434,10 @@
 #%{_datadir}/dbus-1/services/pidgin.service
 %doc libpurple/purple-notifications-example
 %endif
+%exclude %{_libdir}/purple-2/tcl.so
+%if %{perl_integration}
+%exclude %{_libdir}/purple-2/perl.so
+%endif
 
 %files -n libpurple-devel
 %{_datadir}/aclocal/purple.m4
@@ -415,6 +448,19 @@
 %{_libdir}/libpurple-client.so
 %endif
 
+%if %{perl_integration}
+%files -n libpurple-perl
+%{_mandir}/man3/Purple*
+%{_libdir}/purple-2/perl.so
+%{perl_vendorarch}/Purple.pm
+%dir %{perl_vendorarch}/auto/Purple/
+%{perl_vendorarch}/auto/Purple/Purple.so
+%{perl_vendorarch}/auto/Purple/autosplit.ix
+%endif
+
+%files -n libpurple-tcl
+%{_libdir}/purple-2/tcl.so
+
 %files -f pidgin.lang -n finch
 %{_bindir}/finch
 %{_libdir}/finch/
@@ -429,6 +475,13 @@
 
 
 %changelog
+* Mon May 28 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.1-1
+- 2.0.1
+
+* Wed May 9 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.0-3
+- Split out Perl plugin support into subpackages
+- Add Tcl plugin support in a subpackage
+
 * Sun May 6 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.0-2
 - Silence errors when gconfd-2 is not running
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pidgin/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 May 2007 17:11:26 -0000	1.4
+++ sources	29 May 2007 01:52:18 -0000	1.5
@@ -1 +1 @@
-132355d7e236d9c2820a2668621eef43  pidgin-2.0.0.tar.bz2
+51062e232c1ba5429d8be43623983fdf  pidgin-2.0.1.tar.bz2