SPECS: kdenetwork.spec - useful message about missing qt-plugin-qc...

[glen]

Author: glen                         Date: Wed Feb 15 11:49:23 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- useful message about missing qt-plugin-qca-tls plugin (#5683)
- ccache friendly build
- rel 2, STBR

---- Files affected:
SPECS:
   kdenetwork.spec (1.208 -> 1.209) 

---- Diffs:

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.208 SPECS/kdenetwork.spec:1.209
--- SPECS/kdenetwork.spec:1.208	Wed Feb 15 10:19:44 2006
+++ SPECS/kdenetwork.spec	Wed Feb 15 12:49:17 2006
@@ -1,10 +1,16 @@
 # $Revision$, $Date$
+# TODO
+# - find & fix missing BR:
+# RPM build errors:
+#    File not found by glob: /home/glen/tmp/kdenetwork-3.5.1-root-glen/usr/lib/kde3/kopete*meanwhile*.la
+#    File not found by glob: /home/glen/tmp/kdenetwork-3.5.1-root-glen/usr/lib/kde3/kopete*meanwhile*.so
+#    File not found by glob: /home/glen/tmp/kdenetwork-3.5.1-root-glen/usr/share/apps/kopete/icons/crystalsvg/*/*/meanwhile*
+#    File not found: /home/glen/tmp/kdenetwork-3.5.1-root-glen/usr/share/services/kopete_meanwhile.desktop
+#
+# Conditional build:
 %bcond_without	xmms
 %bcond_with	skype
-%bcond_with	hidden_visibility	# pass '--fvisibility=hidden'
-					# & '--fvisibility-inlines-hidden'
-					# to g++
-#
+%bcond_with	hidden_visibility	# pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
 %define		_state		stable
 %define		_kdever		3.5.1
 %define		_ver		3.5.1
@@ -18,7 +24,7 @@
 Summary(pt_BR):	K Desktop Environment - aplicaçőes de rede
 Name:		kdenetwork
 Version:	%{_ver}
-Release:	1
+Release:	2
 Epoch:		10
 License:	GPL
 Group:		X11/Libraries
@@ -33,6 +39,7 @@
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-use_sendmail.patch
 Patch2:		%{name}-libgadu.patch
+Patch3:		%{name}-kopete-qca-tls.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_hidden_visibility:BuildRequires:	gcc-c++ >= 5:4.1.0-0.20051206r108118.1}
@@ -328,6 +335,7 @@
 Summary(pl):	Wtyczka Kopete dodająca obsługę protokołu Groupwise
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
+#Suggests:	qt-plugin-qca-tls
 
 %description kopete-protocol-groupwise
 Kopete plugin which adds Groupwise protocol support.
@@ -365,6 +373,7 @@
 Summary(pl):	Wtyczka Kopete dodająca obsługę protokołu Jabber
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
+#Suggests:	qt-plugin-qca-tls
 
 %description kopete-protocol-jabber
 Kopete plugin which adds Jabber protocol support.
@@ -988,6 +997,7 @@
 #%patch100 -p0
 %patch0 -p1
 %patch1 -p1
+%patch3 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Network;FileTransfer;/' \
 	-e 's/Terminal=0/Terminal=false/' -e '/\[Desktop Entry\]/aEncoding=UTF-8' \
@@ -1048,15 +1058,26 @@
 	--with-qt-libraries=%{_libdir} \
 	--with-wifi
 
-%{__make}
+%{__make} \
+	%{?with_verbose:VERBOSE=1} \
+	CXXLD=%{_host_cpu}-%{_vendor}-%{_os}-g++ \
+	CCLD=%{_host_cpu}-%{_vendor}-%{_os}-gcc \
+	AM_MAKEFLAGS='CXXLD=$(CXXLD) CCLD=$(CCLD)'
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+	CXXLD=%{_host_cpu}-%{_vendor}-%{_os}-g++ \
+	CCLD=%{_host_cpu}-%{_vendor}-%{_os}-gcc \
+	AM_MAKEFLAGS='CXXLD=$(CXXLD) CCLD=$(CCLD)' \
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir}
 %{__make} -C kopete/protocols/winpopup install \
+	CXXLD=%{_host_cpu}-%{_vendor}-%{_os}-g++ \
+	CCLD=%{_host_cpu}-%{_vendor}-%{_os}-gcc \
+	AM_MAKEFLAGS='CXXLD=$(CXXLD) CCLD=$(CCLD)' \
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir}
 
@@ -1739,6 +1760,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.209  2006/02/15 11:49:17  glen
+- useful message about missing qt-plugin-qca-tls plugin (#5683)
+- ccache friendly build
+- rel 2, STBR
+
 Revision 1.208  2006/02/15 09:19:44  glen
 - duplicate
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdenetwork.spec?r1=1.208&r2=1.209&f=u