SPECS (AC-branch): kdenetwork.spec - merge fixes from HEAD

[glen]

Author: glen                         Date: Wed Apr  5 22:25:08 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge fixes from HEAD

---- Files affected:
SPECS:
   kdenetwork.spec (1.212.2.3 -> 1.212.2.4) 

---- Diffs:

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.212.2.3 SPECS/kdenetwork.spec:1.212.2.4
--- SPECS/kdenetwork.spec:1.212.2.3	Mon Apr  3 01:54:26 2006
+++ SPECS/kdenetwork.spec	Thu Apr  6 00:25:02 2006
@@ -1,21 +1,13 @@
 # $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
-# - packaging check:
-#   /usr/share/apps/konqueror/dirtree/remote/lan.desktop
-#   /usr/share/icons/locolor/32x32/apps/krfb.png
-#   /usr/share/mimelnk/application/x-icq.desktop
+# - fix or kill skype support
+# - kill internal libgadu copy
 #
 # Conditional build:
 %bcond_without	xmms
-%bcond_with	skype
 %bcond_with	hidden_visibility	# pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
-#
+%bcond_with	skype			# incomplete!
+
 %define		_state		stable
 %define		_minlibsevr	9:%{version}
 %define		_minbaseevr	9:%{version}
@@ -26,7 +18,7 @@
 Summary(pt_BR):	K Desktop Environment - aplicaçőes de rede
 Name:		kdenetwork
 Version:	3.5.2
-Release:	1
+Release:	2
 Epoch:		10
 License:	GPL
 Group:		X11/Libraries
@@ -62,12 +54,9 @@
 %{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
-#BuildRequires:	unsermake >= 040511
 %{?with_xmms:BuildRequires:	xmms-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_noautoreqdep	libkopete_oscar.so.1
-
 %description
 KDE network applications. Package includes:
 - KDict - Online dictionary client
@@ -1046,8 +1035,8 @@
 %configure \
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
 	%{!?debug:--disable-rpath} \
-	--disable-testbed \
 	--disable-final \
+	--disable-testbed \
 	%{?with_hidden_visibility:--enable-gcc-hidden-visibility} \
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
@@ -1056,28 +1045,18 @@
 	--enable-smpppd \
 	--with-distribution="PLD Linux Distribution" \
 	--with-qt-libraries=%{_libdir} \
-	--with-wifi
-
-%{__make} \
-	%{?with_verbose:VERBOSE=1} \
-	CXXLD=%{_host_cpu}-%{_vendor}-%{_os}-g++ \
-	CCLD=%{_host_cpu}-%{_vendor}-%{_os}-gcc \
-	AM_MAKEFLAGS='CXXLD=$(CXXLD) CCLD=$(CCLD)'
+	--with-wifi \
+	--with%{!?with_xmms:out}-xmms
 
+%{__make}
 
 %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}
 
@@ -1098,6 +1077,10 @@
 EOF
 install %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/winpopup-install.sh
 
+# Messing ones
+rm $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-icq.desktop
+rm $RPM_BUILD_ROOT%{_iconsdir}/locolor/32x32/apps/krfb.png
+
 %find_lang kdict		--with-kde
 %find_lang kget			--with-kde
 %find_lang knewsticker		--with-kde
@@ -1721,8 +1704,7 @@
 %{_datadir}/apps/remoteview/lan.desktop
 %{_datadir}/services/rlan.protocol
 %{_datadir}/services/lan.protocol
-# Messing one!
-# %{_datadir}/apps/konqueror/dirtree/remote/lan.desktop
+%{_datadir}/apps/konqueror/dirtree/remote/lan.desktop
 %{_datadir}/apps/konqsidebartng/virtual_folders/services/lisa.desktop
 %{_datadir}/applnk/.hidden/kcmkiolan.desktop
 %{_datadir}/applnk/.hidden/kcmlisa.desktop
@@ -1766,6 +1748,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212.2.4  2006/04/05 22:25:02  glen
+- merge fixes from HEAD
+
 Revision 1.212.2.3  2006/04/02 23:54:26  glen
 - kopete-tool-nowlistening requires no media player installed (merge from HEAD)
 
================================================================

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