rpms/kdebase-runtime/devel kdebase-runtime.spec,1.5,1.6

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5453

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4 
- disable kioslave/smb (f9+, samba-3.2.x/gplv3 ickiness)



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdebase-runtime.spec	2 Dec 2007 21:13:04 -0000	1.5
+++ kdebase-runtime.spec	4 Dec 2007 18:37:21 -0000	1.6
@@ -1,7 +1,8 @@
 
-# kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
-%if 0%{?fedora} <= 8
+%if 0%{?fedora} < 9
+# # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %define kde3_desktop 1
+%define _with_samba --with-samba
 %endif
 
 Name:          kdebase-runtime
@@ -37,7 +38,7 @@
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: libsmbclient-devel
+%{?_with_samba:BuildRequires: libsmbclient-devel}
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
@@ -48,7 +49,7 @@
 BuildRequires: strigi-devel >= 0.5.7
 BuildRequires: xine-lib-devel
 # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-%if 0%{?fedora} >= 8
+%if 0%{?fedora} > 7 
 BuildRequires:  libxcb-devel
 %endif
 # needed?
@@ -80,7 +81,7 @@
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
+mkdir -p %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # omit gigantic oxygen scalable/svg icons, for now -- Rex
@@ -214,6 +215,9 @@
 
 
 %changelog
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4 
+- disable kioslave/smb (f9+, samba-3.2.x/gplv3 ickiness)
+
 * Sun Dec 02 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-3
 - build without libxcb in F7 as we STILL don't have it (see #373361)