rpms/kdebase/devel kdebase.spec,1.263.2.18,1.263.2.19

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
- remove files which conflict with KDE 3
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- Conflicts with KDE 3 versions of dolphin pre d3lphin rename


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.18
retrieving revision 1.263.2.19
diff -u -r1.263.2.18 -r1.263.2.19
--- kdebase.spec	12 Sep 2007 02:54:14 -0000	1.263.2.18
+++ kdebase.spec	12 Sep 2007 06:52:23 -0000	1.263.2.19
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
 Version:       3.93.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -30,6 +30,9 @@
 Requires: eject
 %endif
 
+# should not conflict with d3lphin, but does with old Dolphin
+Conflicts:     dolphin <= 0.8.2
+
 BuildRequires: bzip2-devel
 # needed?
 BuildRequires: cdparanoia-devel cdparanoia
@@ -111,14 +114,97 @@
 mkdir %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-## 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
+
+# remove files which conflict with KDE 3
+rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
+rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
 rm -rf %{buildroot}%{_datadir}/emoticons
+rm -rf %{buildroot}%{_kde4_datadir}/locale
+rm -rf %{buildroot}%{_kde4_datadir}/autostart
+rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
+rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
+rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
+rm -rf %{buildroot}%{_kde4_datadir}/config
+rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
+rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
+# binaries: conflict with kdebase
+rm -f %{buildroot}%{_kde4_bindir}/drkonqi
+rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
+rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
+rm -f %{buildroot}%{_kde4_bindir}/kdeeject
+rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
+rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
+rm -f %{buildroot}%{_kde4_bindir}/kdesu
+rm -f %{buildroot}%{_kde4_bindir}/kdesud
+rm -f %{buildroot}%{_kde4_bindir}/kdialog
+rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
+rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
+rm -f %{buildroot}%{_kde4_bindir}/kfind
+rm -f %{buildroot}%{_kde4_bindir}/kfmclient
+rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
+rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
+rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
+rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
+rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
+rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
+rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
+rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
+rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
+rm -f %{buildroot}%{_kde4_bindir}/knetattach
+rm -f %{buildroot}%{_kde4_bindir}/konqueror
+rm -f %{buildroot}%{_kde4_bindir}/konsole
+rm -f %{buildroot}%{_kde4_bindir}/kprinter
+rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
+rm -f %{buildroot}%{_kde4_bindir}/kstart
+rm -f %{buildroot}%{_kde4_bindir}/ktrash
+rm -f %{buildroot}%{_kde4_bindir}/kwrite
+rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
+rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
+rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
+# binaries: conflict with kdelibs
+rm -f %{buildroot}%{_kde4_bindir}/kcmshell
+rm -f %{buildroot}%{_kde4_bindir}/kfile
+rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
+rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
+rm -f %{buildroot}%{_kde4_bindir}/kioexec
+rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
+# binaries: conflict with kdebase-extras
+rm -f %{buildroot}%{_kde4_bindir}/kappfinder
+# do not strictly conflict, but we removed the corresponding binaries:
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kcmshell.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
+# we also removed the binaries for these:
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop
+
+# move devel symlinks
+mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
+pushd %{buildroot}%{_kde4_libdir}
+for i in lib*.so
+do
+  case "$i" in
+    libkdeinit4_*.so)
+      ;;
+    *)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+  esac
+done
+popd
 
 
 %clean
@@ -127,13 +213,11 @@
 
 %post
 /sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 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 oxygen 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
@@ -143,32 +227,31 @@
 %{_kde4_bindir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_appsdir}/*
-%{_kde4_datadir}/autostart/*
-%{_kde4_datadir}/config/
 %{_kde4_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/services/*
-%{_kde4_datadir}/desktop-directories/*
-%{_kde4_iconsdir}/crystalsvg/
 %{_kde4_iconsdir}/oxygen/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/locale/*
 %{_kde4_datadir}/sounds/*
 %{_kde4_docdir}/HTML/en/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/*
-%{_kde4_sysconfdir}/xdg/menus/*.menu
+%exclude %{_kde4_libdir}/kde4/devel/
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
-%{_kde4_libdir}/lib*.so
-%exclude %{_kde4_libdir}/libkdeinit4_*.so
+%{_kde4_libdir}/kde4/devel/lib*.so
 
 
 %changelog
+* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
+- remove files which conflict with KDE 3
+- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
+- Conflicts with KDE 3 versions of dolphin pre d3lphin rename
+
 * 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)