SPECS: kdenetwork.spec - Fixed xmms bcond - Removed unneeded files...

[adgor]

Author: adgor                        Date: Mon Apr  3 10:51:15 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Fixed xmms bcond
- Removed unneeded files
- Updated TODO
- Release 2

---- Files affected:
SPECS:
   kdenetwork.spec (1.216 -> 1.217) 

---- Diffs:

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.216 SPECS/kdenetwork.spec:1.217
--- SPECS/kdenetwork.spec:1.216	Mon Apr  3 00:38:36 2006
+++ SPECS/kdenetwork.spec	Mon Apr  3 12:51:09 2006
@@ -2,10 +2,6 @@
 # TODO
 # - fix or kill skype support
 # - kill internal libgadu copy
-# - 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
 #
 # Conditional build:
 %bcond_without	xmms
@@ -22,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
@@ -1040,8 +1036,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 \
@@ -1050,7 +1046,8 @@
 	--enable-smpppd \
 	--with-distribution="PLD Linux Distribution" \
 	--with-qt-libraries=%{_libdir} \
-	--with-wifi
+	--with-wifi \
+	--with{!?with_xmms:out}-xmms
 
 %{__make} \
 	%{?with_verbose:VERBOSE=1} \
@@ -1092,6 +1089,11 @@
 EOF
 install %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/winpopup-install.sh
 
+# Messing ones
+rm $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/dirtree/remote/lan.desktop
+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
@@ -1759,6 +1761,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.217  2006/04/03 10:51:09  adgor
+- Fixed xmms bcond
+- Removed unneeded files
+- Updated TODO
+- Release 2
+
 Revision 1.216  2006/04/02 22:38:36  adgor
 - xmms not needed for nowlisting kopete plugin
 
================================================================

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