rpms/pidgin/devel pidgin.spec,1.14,1.15
Stu Tomlinson (nosnilmot)
fedora-extras-commits at redhat.com
Thu May 10 00:48:00 UTC 2007
- Previous message (by thread): rpms/pidgin/devel pidgin.spec,1.13,1.14
- Next message (by thread): rpms/monotone/FC-6 .cvsignore, 1.14, 1.15 monotone.init, 1.8, 1.9 monotone.spec, 1.23, 1.24 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nosnilmot
Update of /cvs/extras/rpms/pidgin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13882
Modified Files:
pidgin.spec
Log Message:
Clean up the perl & tcl subpackage support - always provide subpackages
for perl when perl support is enabled, and always provide tcl subpackages.
Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pidgin.spec 10 May 2007 00:00:17 -0000 1.14
+++ pidgin.spec 10 May 2007 00:47:25 -0000 1.15
@@ -1,7 +1,5 @@
-# OPTION: perl integration (FC1+)
-# set to 1 for FC1-FC6, perl included in main packages
-# set to 2 for F7+, perl provided by subpackages
-%define perl_integration 2
+# OPTION: perl split into subpackages (FC1+)
+%define perl_integration 1
# OPTION: krb5 for Zephyr protocol (FC1+)
%define krb_integration 1
# OPTION: gtkspell integration (FC1+)
@@ -26,8 +24,6 @@
%define meanwhile_integration 1
# OPTION: Perl devel separated out (F7+)
%define perl_devel_separated 1
-# OPTION: Tcl/Tk integration (F7+)
-%define tcl_integration 1
Name: pidgin
Version: 2.0.0
@@ -83,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}
@@ -139,11 +137,6 @@
%if %{perl_devel_separated}
BuildRequires: perl-devel
%endif
-# Tcl integration (FC7+)
-%if %{tcl_integration}
-BuildRequires: tcl-devel
-BuildRequires: tk-devel
-%endif
%description
@@ -175,7 +168,7 @@
documentation, and libraries required for development of Pidgin scripts
and plugins.
-%if %{perl_integration} == 2
+%if %{perl_integration}
%package perl
Summary: Perl scripting support for Pidgin
Group: Applications/Internet
@@ -218,7 +211,7 @@
documentation, and libraries required for development of libpurple based
instant messaging clients or plugins for any libpurple based client.
-%if %{perl_integration} == 2
+%if %{perl_integration}
%package -n libpurple-perl
Summary: Perl scripting support for libpurple
Group: Applications/Internet
@@ -230,7 +223,6 @@
%endif
-%if %{tcl_integration}
%package -n libpurple-tcl
Summary: Tcl scripting support for libpurple
Group: Applications/Internet
@@ -239,7 +231,6 @@
%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.
-%endif
%package -n finch
@@ -313,11 +304,6 @@
%else
SWITCHES="$SWITCHES --disable-gstreamer"
%endif
-%if %{tcl_integration}
- SWITCHES="$SWITCHES --enable-tcl --enable-tk"
-%else
- SWITCHES="$SWITCHES --disable-tcl --disable-tk"
-%endif
# FC5+ automatic -fstack-protector-all switch
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
@@ -325,6 +311,7 @@
# gnutls is buggy so use mozilla-nss on all distributions
%configure --enable-gnutls=no --enable-nss=yes --enable-cyrus-sasl \
+ --enable-tcl --enable-tk \
--disable-schemas-install $SWITCHES
make %{?_smp_mflags}
@@ -412,21 +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} == 1
-%{perl_vendorarch}/Pidgin.pm
-%dir %{perl_vendorarch}/auto/Pidgin/
-%{perl_vendorarch}/auto/Pidgin/Pidgin.so
-%endif
-%if %{perl_integration} == 2
+%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
@@ -440,7 +422,6 @@
%files -f pidgin.lang -n libpurple
%{_libdir}/purple-2/
%{_libdir}/libpurple.so.*
-%{_mandir}/man3/Purple*
%{_datadir}/pixmaps/purple/
%{_sysconfdir}/purple/
%if %{dbus_integration}
@@ -453,18 +434,9 @@
#%{_datadir}/dbus-1/services/pidgin.service
%doc libpurple/purple-notifications-example
%endif
-%if %{tcl_integration}
%exclude %{_libdir}/purple-2/tcl.so
-%endif
-%if %{perl_integration} == 2
+%if %{perl_integration}
%exclude %{_libdir}/purple-2/perl.so
-%else
-%if %{perl_integration} == 1
-%{perl_vendorarch}/Purple.pm
-%dir %{perl_vendorarch}/auto/Purple/
-%{perl_vendorarch}/auto/Purple/Purple.so
-%{perl_vendorarch}/auto/Purple/autosplit.ix
-%endif
%endif
%files -n libpurple-devel
@@ -476,19 +448,18 @@
%{_libdir}/libpurple-client.so
%endif
-%if %{perl_integration} == 2
+%if %{perl_integration}
%files -n libpurple-perl
-%exclude %{_libdir}/purple-2/perl.so
+%{_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
-%if %{tcl_integration}
%files -n libpurple-tcl
%{_libdir}/purple-2/tcl.so
-%endif
%files -f pidgin.lang -n finch
%{_bindir}/finch
- Previous message (by thread): rpms/pidgin/devel pidgin.spec,1.13,1.14
- Next message (by thread): rpms/monotone/FC-6 .cvsignore, 1.14, 1.15 monotone.init, 1.8, 1.9 monotone.spec, 1.23, 1.24 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list