rpms/kdebase3/devel kdebase3.spec,1.1,1.2 sources,1.2,1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1994

Modified Files:
	kdebase3.spec sources 
Log Message:
* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-16
- disable kioslave/smb (f9+, samba-3.2.x/gplv3 ickiness)
- omit kde_settings optionals



Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase3.spec	1 Dec 2007 06:52:52 -0000	1.1
+++ kdebase3.spec	4 Dec 2007 18:26:56 -0000	1.2
@@ -2,7 +2,6 @@
 %define final 1 
 
 %define redhatify 1
-%define kde_settings 1
 
 %define make_cvs 1
 
@@ -13,13 +12,17 @@
 %define libs 1
 %endif
 
-%if 0%{?fedora} <= 8
+%if 0%{?fedora} < 9 
 # make -extras subpkg
 %define extras 1
 %endif
 
+%if 0%{?fedora} < 9
+%define _with_samba --with-samba
+%endif
+
 Version: 3.5.8
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -34,7 +37,6 @@
 Provides: kdebase3 = %{version}-%{release}
 %endif
 
-
 # programs: GPLv2, libs: LGPLv2
 License: GPLv2
 Url: http://www.kde.org
@@ -45,7 +47,6 @@
 Source1: konsole.desktop
 Source2: KDE.session.gnome
 Source3: kde.desktop
-Source4: kde-redhat-config-3.5-fc7-1.tar.bz2
 Source5: kde-np.pamd
 Source6: logrotate-kdm
 Source7: mailsettings.cc
@@ -130,27 +131,21 @@
 Provides:  %{name}-kdm = %{epoch}:%{version}-%{release}
 %endif
 
-%if %{kde_settings}
-Requires: kde-settings
 # FIXME/TODO: Is kde-settings-kdm really not needed in kdebase3?
 %if "%{name}" == "kdebase"
 # when/if -kdm is ever packaged separately
 Requires: kde-settings-kdm
 %endif
-%else
-Requires: xorg-x11-xdm
-Requires: desktop-backgrounds-basic
-Requires: redhat-menus => 6.7.5
-Requires: redhat-artwork-kde >= 7.0.0-8
-%endif
 
 BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: libxslt-devel libxml2-devel
+%if 0%{?_with_samba:1}
 %if 0%{?fedora} > 6
 BuildRequires: libsmbclient-devel
 %else
 BuildRequires: samba 
 %endif
+%endif
 BuildRequires: pam-devel
 BuildRequires: gettext
 BuildRequires: perl
@@ -362,7 +357,8 @@
    --enable-debug \
 %endif
    --includedir=%{_includedir}/kde \
-  %{?_with_hal} %{!?_with_hal:--without-hal}
+  %{?_with_hal} %{!?_with_hal:--without-hal} \
+  %{?_with_samba} %{!?_with_samba:--without-samba}
 
 make %{?_smp_mflags}
 
@@ -413,31 +409,6 @@
 # nuke default kdm setup in favor of our own
 rm -rf  %{buildroot}%{_datadir}/config/kdm
 
-%if ! %{kde_settings}
-# install config files
-pushd %{buildroot}
-tar xjf %{SOURCE4}
-mv etc/skel/kde etc/skel/.kde
-find etc/skel/.kde -type f | xargs chmod 0644
-find etc/skel/.kde -type d | xargs chmod 0755
-popd
-
-# Symlink kdm things to their correct place
-ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
-
-# Replace the kdm default files with symlinks to the shared {kxg}dm ones
-pushd %{buildroot}/etc/kde/kdm
-for i in Xaccess Xservers Xwilling kdmrc; do
-   ln -sf ../../X11/xdm/$i .
-done
-ln -fs ../../X11/xdm/Xsetup_0 Xsetup
-ln -fs ../../X11/xinit/Xsession Xsession
-popd
-
-# kde resource
-install -p -D -m 644 %{SOURCE12} %{buildroot}/etc/kderc
-%endif
-
 # Make symlinks relative
 pushd %{buildroot}/%{_docdir}/HTML/en
 for i in */*/*; do
@@ -719,12 +690,6 @@
 %config(noreplace) /etc/xdg/menus/*
 %config(noreplace) /etc/logrotate.d/kdm
 %{_sysconfdir}/kde/env/*
-%if ! %{kde_settings}
-%dir /etc/skel/.kde
-/etc/skel/.kde/*
-%config(noreplace) /etc/kderc
-%config(noreplace) /etc/X11/xdm/kdmrc
-%endif
 %config(noreplace) /etc/pam.d/*
 %dir %{_libdir}/mozilla
 %dir %{_libdir}/mozilla/plugins
@@ -808,6 +773,10 @@
 
 
 %changelog
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-16
+- disable kioslave/smb (f9+, samba-3.2.x/gplv3 ickiness)
+- omit kde_settings optionals
+
 * Sat Dec 01 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.8-15
 - only set Epoch: 6 when building as kdebase (not kdebase3)
 - only obsolete kdebase-kdm here when building as kdebase


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Dec 2007 06:52:52 -0000	1.2
+++ sources	4 Dec 2007 18:26:56 -0000	1.3
@@ -1,2 +1 @@
-d52f08756a8d3e9df478506bd258a4d8  kde-redhat-config-3.5-fc7-1.tar.bz2
 9990c669229daaaa8fca4c5e354441fd  kdebase-3.5.8.tar.bz2