rpms/kdelibs4/devel kdelibs4.spec,1.17,1.18

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdelibs4.spec 
Log Message:
prepare to flip the kde4->kde switch



Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/devel/kdelibs4.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kdelibs4.spec	20 Nov 2007 18:47:49 -0000	1.17
+++ kdelibs4.spec	21 Nov 2007 19:22:08 -0000	1.18
@@ -90,8 +90,7 @@
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" == "kdelibs4"
-%else
+%if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
@@ -135,6 +134,7 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
+%if "%{name}" != "kdelibs"
 # remove files which conflict with KDE 3
 rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
       %{buildroot}%{_kde4_bindir}/kunittestmodrunner
@@ -142,6 +142,7 @@
       %{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
 rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
 rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages
+%endif
 
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
@@ -199,6 +200,9 @@
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
 %{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
+%if "%{name}" == "kdelibs"
+%{_kde4_datadir}/locale/all_languages/
+%endif
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so