packages: pidgin/pidgin.spec - up to 2.7.2 - add perl bcond, files cleanup

Sat Jul 24 14:56:27 CEST 2010

Author: glen                         Date: Sat Jul 24 12:56:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.7.2
- add perl bcond, files cleanup

---- Files affected:
packages/pidgin:
   pidgin.spec (1.266 -> 1.267) 

---- Diffs:

================================================================
Index: packages/pidgin/pidgin.spec
diff -u packages/pidgin/pidgin.spec:1.266 packages/pidgin/pidgin.spec:1.267

--- packages/pidgin/pidgin.spec:1.266	Fri Jul 23 23:23:18 2010
+++ packages/pidgin/pidgin.spec	Sat Jul 24 14:56:21 2010
@@ -1,5 +1,12 @@
 # $Revision$, $Date$
 # TODO
+# - fix broken linking, see filterout_ld
+# - fix unref symbols:
+#   Unresolved symbols found in: /usr/lib64/purple-2/libjabber.so.0
+#   Unresolved symbols found in: /usr/lib64/purple-2/liboscar.so.0
+#   Unresolved symbols found in: /usr/lib64/purple-2/libymsg.so.0
+# - perl is installed to wrong dir on x8664:
+#   /usr/lib/perl5/x86_64-pld-linux-thread-multi/perllocal.pod
 # - subpackages for
 #  - huge deps (mono...)
 # - kerberos 4 with zephyr support?
@@ -12,6 +19,7 @@
 %bcond_without	dbus		# without D-BUS (for pidgin-remote and others)
 %bcond_without	doc		# do not generate and include documentation
 %bcond_with	dotnet		# build with mono support
+%bcond_without	perl		# build without Perl support
 %bcond_with	evolution	# compile without the Pidgin-Evolution plugin
 %bcond_with	gnutls		# use GnuTLS instead of NSS
 %bcond_without	gtkspell	# without gtkspell support
@@ -33,7 +41,7 @@
 %define		gtk2_ver	2.10.6
 %define		glib2_ver	2.24.0
 
-%include	/usr/lib/rpm/macros.perl
+%{?with_perl:%include	/usr/lib/rpm/macros.perl}
 Summary:	A Gtk+ based multiprotocol instant messaging client
 Summary(de.UTF-8):	Pidgin ist ein Instant Messenger
 Summary(hu.UTF-8):	Az AOL 'Instant Messenger'-ével kompatibilis kliens
@@ -82,10 +90,10 @@
 BuildRequires:	nspr-devel
 BuildRequires:	nss-devel
 %endif
-BuildRequires:	perl-devel
+%{?with_perl:BuildRequires:	perl-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	python-modules >= 1:2.4
-BuildRequires:	rpm-perlprov
+%{?with_perl:BuildRequires:	rpm-perlprov}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.311
 %{?with_silc:BuildRequires:	silc-toolkit-devel >= 1.1}
@@ -116,11 +124,15 @@
 Obsoletes:	gaim-plugin-xmms-remote
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# /usr/bin/ld: gntaccount.o: undefined reference to symbol 'cur_term'
+# /usr/bin/ld: note: 'cur_term' is defined in DSO /lib64/libtinfow.so.6 so try adding it to the linker command line
+# /lib64/libtinfow.so.6: could not read symbols: Invalid operation
+%define		filterout_ld	-Wl,--no-copy-dt-needed-entries
+
 %description
 Pidgin allows you to talk to anyone using a variety of messaging
-protocols including AIM, MSN, Yahoo!, Jabber, Bonjour, Gadu-Gadu,
-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
-Zephyr.
+protocols including AIM, MSN, Yahoo!, Jabber, Bonjour, Gadu-Gadu, ICQ,
+IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and Zephyr.
 
 The protocol plugins are packaged as libpurple-protocol-foo.
 
@@ -531,18 +543,24 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/ca at valencia
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/my{_MM,}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/ms{_MY,}
+%find_lang %{name} --with-gnome
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/finch/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/{,private}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/ca at valencia
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/my{_MM,}
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/ms{_MY,}
 
-%find_lang %{name} --with-gnome
-rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/Pidgin/{,GtkUI}/.packlist}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/purple/ca-certs
 
+%if %{with perl}
+rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/Pidgin/{,GtkUI}/.packlist}
+rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/perl/auto/Pidgin/.packlist
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/perl/auto/Purple/.packlist
+%endif
+
 %if %{with dbus}
 rm $RPM_BUILD_ROOT%{_bindir}/purple-client-example
 rm $RPM_BUILD_ROOT%{_libdir}/purple-2/dbus-example.so
@@ -662,6 +680,7 @@
 %attr(755,root,root) %{_bindir}/purple-url-handler
 %endif
 
+%if %{with perl}
 %files -n libpurple-perl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/purple-2/perl.so
@@ -673,6 +692,7 @@
 %{_libdir}/purple-2/perl/auto/Purple/*.ix
 %attr(755,root,root) %{_libdir}/purple-2/perl/auto/Purple/*.so
 %{_mandir}/man3/Purple.3pm*
+%endif
 
 %files -n libpurple-tcl
 %defattr(644,root,root,755)
@@ -722,6 +742,7 @@
 %{_includedir}/pidgin
 %{_pkgconfigdir}/pidgin.pc
 
+%if %{with perl}
 %files perl
 %defattr(644,root,root,755)
 %dir %{_libdir}/pidgin/perl
@@ -731,6 +752,7 @@
 %{_libdir}/pidgin/perl/auto/Pidgin/*.bs
 %attr(755,root,root) %{_libdir}/pidgin/perl/auto/Pidgin/*.so
 %{_mandir}/man3/Pidgin.3pm*
+%endif
 
 %if %{with evolution}
 %files plugin-evolution
@@ -827,6 +849,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.267  2010/07/24 12:56:21  glen
+- up to 2.7.2
+- add perl bcond, files cleanup
+
 Revision 1.266  2010/07/23 21:23:18  rotom
 - up 2.7.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pidgin/pidgin.spec?r1=1.266&r2=1.267&f=u

