rpms/kdebase/devel kdebase.spec, 1.263.2.17, 1.263.2.18 kde4-opt.sh, 1.1.2.1, NONE kde4-xdg_menu_prefix.sh, 1.1.2.2, NONE kdebase-3.91.0-consolekit-kdm.patch, 1.1.2.1, NONE kdebase-3.92.0-kde4home.diff, 1.1.2.2, NONE kdebase-3.92.0-redhat-startkde.patch, 1.1.2.2, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Removed Files:
      Tag: kdebase-kde4-branch
	kde4-opt.sh kde4-xdg_menu_prefix.sh 
	kdebase-3.91.0-consolekit-kdm.patch 
	kdebase-3.92.0-kde4home.diff 
	kdebase-3.92.0-redhat-startkde.patch 
Log Message:
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop KDM ConsoleKit patch (KDM is now in kdebase-workspace)
- remove kdebase-kdm Obsoletes/Provides (for the same reason)
- remove KDM (and KDM session) setup code (for the same reason)
- remove rss-glx conflict (Plasma is now in kdebase-workspace)
- remove redhat-startkde patch (startkde is now in kdebase-workspace)
- remove kde4-opt.sh (all the code in it is commented out)
- remove kde4-xdg_menu_prefix.sh (only needed for kdebase-workspace)
- remove bogus BRs on automake and libtool
- remove workspace-only BRs
- add BR qimageblitz-devel, xine-lib-devel (all), libxcb-devel (F8+)
- remove workspace files and directories
- handle icons (moved from kdelibs4)
- add mkdir %%{buildroot} in %%install


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.17
retrieving revision 1.263.2.18
diff -u -r1.263.2.17 -r1.263.2.18
--- kdebase.spec	17 Aug 2007 10:22:04 -0000	1.263.2.17
+++ kdebase.spec	12 Sep 2007 02:54:14 -0000	1.263.2.18
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
-Version:       3.92.0
-Release:       4%{?dist}
+Version:       3.93.0
+Release:       1%{?dist}
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -20,20 +20,6 @@
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# /usr/bin/plasma (#250180)
-Conflicts:  rss-glx < 0.8.1.p-8
-
-# FIXME/TODO: consider using patched/hard-coded XDG_MENU_PREFIX  
-# don't rely on env (same goes for kde3) -- Rex
-Source1: kde4-opt.sh
-Source2: kde4-xdg_menu_prefix.sh
-
-# use ~/.kde4 instead of ~/.kde
-Patch0: kdebase-%{version}-kde4home.diff
-Patch1: kdebase-%{version}-redhat-startkde.patch
-# see http://bugzilla.redhat.com/228111 , http://bugs.kde.org/147790
-Patch2: kdebase-3.91.0-consolekit-kdm.patch
-
 BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): /sbin/ldconfig xdg-utils
@@ -44,47 +30,28 @@
 Requires: eject
 %endif
 
-Obsoletes: %{name}-kdm < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  %{name}-kdm = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# FIXME/TODO
-#BuildRequires: libcaptury-devel
-
-BuildRequires: automake libtool
-BuildRequires: bluez-libs-devel
 BuildRequires: bzip2-devel
+# needed?
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: cmake
 BuildRequires: cyrus-sasl-devel
-BuildRequires: dbus-devel
 BuildRequires: doxygen
-BuildRequires: imake
 BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
 BuildRequires: gettext
-BuildRequires: glib2-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
+# needed?
 BuildRequires: libart_lgpl-devel
+# needed?
 BuildRequires: libfontenc-devel
-BuildRequires: libpng-devel
-%ifnarch s390 s390x
-BuildRequires: libraw1394-devel
-%endif
 BuildRequires: libusb-devel
-BuildRequires: libXcomposite-devel libXcursor-devel libXdamage-devel 
-BuildRequires: libXext-devel libXfixes-devel libXinerama-devel
-BuildRequires: libXrandr-devel libXrender-devel libXres-devel
-BuildRequires: libXScrnSaver-devel libXtst-devel libXxf86misc-devel
-BuildRequires: libxklavier-devel
-BuildRequires: lm_sensors-devel
-BuildRequires: NetworkManager-devel
 BuildRequires: OpenEXR-devel
+# needed?
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
-BuildRequires: pam-devel
 BuildRequires: pkgconfig
+BuildRequires: qimageblitz-devel
 # samba support
 %if 0%{?fedora} > 6 || 0%{?rhel} > 5
 BuildRequires: libsmbclient-devel
@@ -93,7 +60,14 @@
 %endif
 BuildRequires: soprano-devel
 BuildRequires: strigi-devel
-BuildRequires: xorg-x11-font-utils xorg-x11-proto-devel
+BuildRequires: xine-lib-devel
+# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
+%if 0%{?fedora} >= 8
+BuildRequires:  libxcb-devel
+%endif
+# needed?
+BuildRequires: xorg-x11-font-utils
+BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
 # extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
 BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel
@@ -112,15 +86,6 @@
 Provides:  kdebase4-devel = %{version}-%{release}
 %endif
 Requires: kdelibs4-devel kdepimlibs4-devel
-## FIXME/TODO: trim these down -- Rex
-#Requires: libXcomposite-devel libXdamage-devel
-#Requires: libXcursor-devel libXfixes-devel libXxf86misc-devel libXrender-devel
-#Requires: libXrandr-devel libXext-devel libusb-devel libXres-devel
-#Requires: libXScrnSaver-devel libXtst-devel
-#Requires: libXinerama-devel libfontenc-devel
-#Requires: cyrus-sasl-devel libart_lgpl-devel openssl-devel
-#Requires: hal-devel bluez-libs-devel
-#Requires: strigi-devel zlib-devel bzip2-devel libpng-devel
 %description devel
 Header files for developing applications using %{name}.
 WARNING: This is a beta version. It probably has many bugs left.
@@ -130,9 +95,6 @@
 %prep
 %setup -q -n kdebase-%{version}
 
-%patch1 -p1 -b .redhat-startkde
-%patch2 -p1 -b .consolekit_kdm
-
 
 %build
 
@@ -146,44 +108,17 @@
 
 %install
 rm -rf %{buildroot}
+mkdir %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-install -d %{buildroot}%{_sysconfdir}/kde/{env,shutdown}
-install -D -m644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/
-install -D -m644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/kde/env/
-
-# setup %{_kde4_appsdir}/kdm/faces
-mkdir -p %{buildroot}%{_kde4_appsdir}/kdm/faces
-pushd %{buildroot}%{_kde4_appsdir}/kdm/faces
-ln -sf ../pics/users/default1.png .default.face.icon
-popd
-
-# nuke default kdm setup in favor of our own (not yet, FIXME: update kde-settings)
-#rm -rf  %{buildroot}%{_datadir}/config/kdm/
-# FIXME/TODO: kdmrc default values reference %%buildroot
-sed -i -e "s|%{buildroot}||g" %{buildroot}%{_datadir}/config/kdm/* ||:
-
-sed -i \
-  -e "s|@@PREFIX@@|%{_kde4_prefix}|" \
-  -e "s|@@BINDIR@@|%{_kde4_bindir}|" \
-  -e "s|@@LIBDIR@@|%{_kde4_libdir}|" \
-  -e "s|@@SYSCONFDIR@@|%_kde4_sysconfdir}|" \
-  %{buildroot}%{_kde4_sysconfdir}/kde/env/*.sh
-
-mkdir -p %{buildroot}/usr/share/xsessions
-## kde->kde4 xsession
-%if "%{name}" != "kdebase"
-mv %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde.desktop \
-   %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde4.desktop
-sed -i -e "s|^Name=KDE$|Name=KDE4|" %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde4.desktop
-ln -s %{_kde4_appsdir}/kdm/sessions/kde4.desktop %{buildroot}/usr/share/xsessions/kde4.desktop
-%else
-ln -s %{_kde4_appsdir}/kdm/sessions/kde.desktop  %{buildroot}/usr/share/xsessions/kde.desktop
-%endif
-
-## Unpackaged files
-# Conflicts with kdelibs (ick)
-rm -f %{buildroot}%{_datadir}/icons/oxygen/*/*/{acroread,wine}.*
+## unpackaged files
+# these conflict with KDE 3 too -- Kevin
+rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
+# omit gigantic oxygen scalable/svg icons, for now -- Rex
+#rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/*/*  ||:
+find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
+# omit emoticons, which conflict with kdelibs3 (for now) -- Rex
+rm -rf %{buildroot}%{_datadir}/emoticons
 
 
 %clean
@@ -193,23 +128,18 @@
 %post
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %files
 %defattr(-,root,root,-)
-/usr/share/xsessions/*.desktop
-%{_kde4_sysconfdir}/kde/env/*
-#{_kde4_sysconfdir}/kde/shutdown/*
 %{_kde4_bindir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_appsdir}/*
@@ -220,20 +150,15 @@
 %{_datadir}/dbus-1/services/*
 %{_kde4_datadir}/desktop-directories/*
 %{_kde4_iconsdir}/crystalsvg/
-%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/locale/*
 %{_kde4_datadir}/sounds/*
-%{_kde4_datadir}/wallpapers/*
 %{_kde4_docdir}/HTML/en/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/kconf_update_bin/*
 %{_kde4_libdir}/kde4/*
-%{_libdir}/strigi/*
-%config %{_kde4_sysconfdir}/*rc
 %{_kde4_sysconfdir}/xdg/menus/*.menu
 
 %files devel
@@ -244,6 +169,23 @@
 
 
 %changelog
+* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
+- update to 3.93.0
+- drop kde4home patch (no longer applied)
+- drop KDM ConsoleKit patch (KDM is now in kdebase-workspace)
+- remove kdebase-kdm Obsoletes/Provides (for the same reason)
+- remove KDM (and KDM session) setup code (for the same reason)
+- remove rss-glx conflict (Plasma is now in kdebase-workspace)
+- remove redhat-startkde patch (startkde is now in kdebase-workspace)
+- remove kde4-opt.sh (all the code in it is commented out)
+- remove kde4-xdg_menu_prefix.sh (only needed for kdebase-workspace)
+- remove bogus BRs on automake and libtool
+- remove workspace-only BRs
+- add BR qimageblitz-devel, xine-lib-devel (all), libxcb-devel (F8+)
+- remove workspace files and directories
+- handle icons (moved from kdelibs4)
+- add mkdir %%{buildroot} in %%install
+
 * Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
 - use macros.kde4
 - License: GPLv2


--- kde4-opt.sh DELETED ---


--- kde4-xdg_menu_prefix.sh DELETED ---


--- kdebase-3.91.0-consolekit-kdm.patch DELETED ---


--- kdebase-3.92.0-kde4home.diff DELETED ---


--- kdebase-3.92.0-redhat-startkde.patch DELETED ---