rpms/kdebase/devel kdebase.spec,1.263.2.8,1.263.2.9

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
* note file (/usr/bin/plasma) conflict with rss-glx
* fix file conflict with kdelibs (acroread/wine icons)
* fix/update filelist
* fix %%buildroot appearing in some installed files



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.8
retrieving revision 1.263.2.9
diff -u -r1.263.2.8 -r1.263.2.9
--- kdebase.spec	29 Jul 2007 22:58:52 -0000	1.263.2.8
+++ kdebase.spec	30 Jul 2007 11:53:10 -0000	1.263.2.9
@@ -21,6 +21,9 @@
 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
+Conflicts:  rss-glx < 0.8.1.p-7 
+
 # FIXME/TODO: consider using patched/hard-coded XDG_MENU_PREFIX  
 # don't rely on env (same goes for kde3) -- Rex
 Source1: kde4-opt.sh
@@ -52,6 +55,7 @@
 BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel
 BuildRequires: gettext
+BuildRequires: glib2-devel
 BuildRequires: hal-devel dbus-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -62,12 +66,11 @@
 BuildRequires: libraw1394-devel
 %endif
 BuildRequires: libusb-devel
-BuildRequires: libxklavier-devel >= 2.91 glib2-devel
-BuildRequires: libXcomposite-devel libXcursor-devel libXdamage-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
-BuildRequires: libXxf86misc-devel
+BuildRequires: libXScrnSaver-devel libXtst-devel libXxf86misc-devel
+BuildRequires: libxklavier-devel
 BuildRequires: lm_sensors-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: openldap-devel
@@ -105,7 +108,7 @@
 Requires: libXScrnSaver-devel libXtst-devel
 Requires: libXinerama-devel libfontenc-devel
 Requires: cyrus-sasl-devel libart_lgpl-devel openssl-devel
-Requires: hal-devel NetworkManager-devel bluez-libs-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}.
@@ -144,6 +147,10 @@
 install -D -m644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/kde/env/
 %endif
 
+## nuke default kdm setup in favor of our own
+#rm -rf  %{buildroot}%{_datadir}/config/kdm/
+sed -i -e "s|%{buildroot}||g" %{buildroot}%{_datadir}/config/kdm/*
+
 sed -i \
   -e "s|@@PREFIX@@|%{_prefix}|" \
   -e "s|@@BINDIR@@|%{_bindir}|" \
@@ -162,6 +169,10 @@
 ln -s %{_datadir}/apps/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}.*
+
 
 %clean
 rm -rf %{buildroot}
@@ -190,7 +201,7 @@
 %endif
 /usr/share/xsessions/*.desktop
 %{_sysconfdir}/kde/env/*
-%{_sysconfdir}/kde/shutdown/*
+#{_sysconfdir}/kde/shutdown/*
 %{_bindir}/*
 %{_datadir}/applications/kde4/*
 %{_datadir}/apps/*
@@ -206,9 +217,8 @@
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
 %{_datadir}/locale/*
-%{_datadir}/sounds/
-%{_datadir}/templates/
-%{_datadir}/wallpapers/
+%{_datadir}/sounds/*
+%{_datadir}/wallpapers/*
 %{_datadir}/doc/HTML/en/
 %{_libdir}/lib*.so.*
 %{_libdir}/libkdeinit4_*.so