rpms/kdelibs/devel kdelibs.spec,1.223.2.12,1.223.2.13

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Log Message:
omit prefix!=/usr bits.



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.12
retrieving revision 1.223.2.13
diff -u -r1.223.2.12 -r1.223.2.13
--- kdelibs.spec	3 Aug 2007 18:19:59 -0000	1.223.2.12
+++ kdelibs.spec	14 Aug 2007 17:45:48 -0000	1.223.2.13
@@ -1,19 +1,15 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.92.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
-#if 0%{?fedora} > 7
-%if 0
+%if 0%{?fedora} > 8
 Name: kdelibs
 Epoch: 6
-
 Obsoletes: kdelibs4 < %{version}-%{release}
 Provides:  kdelibs4 = %{version}-%{release}
-
 %else
 Name: kdelibs4
-#define _prefix /opt/kde4
 %endif
 
 # FIXME/TODO: there appear to be bits of ARTISTIC, BSD, GPLv2, GFDL (and QPL?) too -- Rex
@@ -23,17 +19,11 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_prefix}" != "/usr"
-# macros sensitive to _prefix mods
-%define __cmake cmake
-%global _qt4_plugindir %(qmake-qt4 -query QT_INSTALL_PLUGINS 2> /dev/null || echo %{_qt4_plugindir} )
-%define _sysconfdir %{_prefix}/etc
-%else
+BuildRequires: kde-filesystem
 Requires: hicolor-icon-theme
 Requires: kde-filesystem
 Requires: shared-mime-info
 #Requires: kde4-settings
-%endif
 
 # use ~/.kde4 instead of ~/.kde
 Patch0: kdelibs-%{version}-kde4home.diff
@@ -104,9 +94,7 @@
 %prep
 %setup -q -n kdelibs-%{version}
 
-%if "%{_prefix}" != "/usr"
-%patch0 -p1 -b .kde4home
-%endif
+#patch0 -p1 -b .kde4home
 %patch1 -p1 -b .conflict-kde3
 
 
@@ -114,9 +102,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
-%cmake \
-  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  ../
+%cmake_kde4 .. 
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -130,7 +116,6 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if "%{_prefix}" == "/usr"
 # see also use-of/patching of XDG_MENU_PREFIX in kdebase
 mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_sysconfdir}/xdg/menus/kde4-applications.menu
@@ -138,19 +123,6 @@
 # Unpackaged files
 rm -rf %{buildroot}%{_datadir}/icons/hicolor
 
-%else
-
-# A symlink doesn't seem to work for this purpose.
-install -D -p \
-  %{buildroot}%{_libdir}/kde4/plugins/designer/kdewidgets.so \
-  %{buildroot}%{_qt4_plugindir}/designer/kdewidgets.so
-
-mkdir -p %{buildroot}/usr/bin
-cd %{buildroot}/usr/bin
-ln -s ../..%{_prefix}/bin/kde4-config .
-
-%endif
-
 
 %post
 /sbin/ldconfig ||:
@@ -171,21 +143,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
 %doc COPYING COPYING-DOCS COPYING.LIB
-%if "%{_prefix}" != "/usr"
-/usr/bin/kde4-config
-%dir %{_prefix}
-%dir %{_bindir}
-%dir %{_datadir}
-%dir %{_datadir}/icons
-%dir %{_datadir}/locale
-%dir %{_datadir}/mime
-%dir %{_datadir}/doc
-%dir %{_libdir}
-%dir %{_sysconfdir}
-%dir %{_sysconfdir}/xdg
-%dir %{_sysconfdir}/xdg/menus
-%{_datadir}/icons/hicolor/
-%endif
 %{_bindir}/*
 %exclude %{_bindir}/checkXML
 %exclude %{_bindir}/kconfig_compiler
@@ -228,9 +185,6 @@
 %{_datadir}/apps/ksgmltools2/
 %{_includedir}/
 %{_libdir}/lib*.so
-%if "%{_prefix}" != "/usr"
-%{_qt4_plugindir}/designer/kdewidgets.so
-%endif
 %exclude %{_libdir}/libkdeinit4_*.so