* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4

- -devel: omit most (hopefully) extraneous Requires:
- use macros.kde4
- -devel: Conflicts: kdelibs-devel (in %_bindir,%_libdir)
- License clarification

kdelibs.spec

@@ -1,4 +1,7 @@
 
+# TODO:
+# 1. package some noarch bits separately: apidocs, oxygen(icons).
+
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.92.0
 Release: 4%{?dist}
@@ -12,16 +15,20 @@ Provides:  kdelibs4 = %{version}-%{release}
 Name: kdelibs4
 %endif
 
-# FIXME/TODO: there appear to be bits of ARTISTIC, BSD, GPLv2, GFDL (and QPL?) too -- Rex
-License: LGPLv2
+# LGPLv2: everything, except (see below)
+# BSD: kdoctools/
+# GFDL: kdoctools/customization ?
+License: LGPLv2 and BSD
 URL:     http://www.kde.org/
 Group:   System Environment/Libraries
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# for macros.kde4
 BuildRequires: kde-filesystem
 Requires: hicolor-icon-theme
 Requires: kde-filesystem
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
 #Requires: kde4-settings
 
@@ -29,6 +36,7 @@ Requires: shared-mime-info
 Patch0: kdelibs-%{version}-kde4home.diff
 # purpose of this patch?  -- Rex
 Patch1: kdelibs-3.92.0-conflict-kde3.patch
+
 Source1: kde4.sh
 Source2: kde4.csh
 
@@ -72,18 +80,21 @@ Also, the API and ABI are NOT fully stable yet (soft freeze only).
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" != "kdelibs4"
+%if "%{name}" == "kdelibs4"
+# Yes, we still have conflicts, in _bindir, _libdir
+Conflicts: kdelibs-devel
+%else
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
 Requires: qt4-devel
-# FIXME/TODO: trim these down  -- Rex
-Requires: libxslt-devel aspell-devel giflib-devel
-Requires: libpng-devel bzip2-devel openssl-devel libacl-devel gettext-devel
-Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
-Requires: zlib-devel krb5-devel libattr-devel gamin-devel strigi-devel
-Requires: alsa-lib-devel avahi-devel
-
+Requires: openssl-devel
+## FIXME/TODO: trim these down  -- Rex
+#Requires: libxslt-devel aspell-devel giflib-devel
+#Requires: libpng-devel bzip2-devel libacl-devel gettext-devel
+#Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
+#Requires: zlib-devel krb5-devel libattr-devel gamin-devel strigi-devel
+#Requires: alsa-lib-devel avahi-devel
 %description devel
 This package includes the header files you will need to compile
 applications for KDE 4.
@@ -102,10 +113,10 @@ Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
-%cmake_kde4 .. 
+%cmake_kde4 ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 # FIXME/TODO: apidocs
 # doc/api/doxygen.sh --doxdatadir=doc/common .
@@ -117,22 +128,27 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # 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
+mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
+   %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
-# Unpackaged files
-rm -rf %{buildroot}%{_datadir}/icons/hicolor
+## unpackaged files
+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
 
 
 %post
 /sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+%{_kde4_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun 
 /sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+%{_kde4_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %clean
@@ -143,53 +159,58 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
 %doc COPYING COPYING-DOCS COPYING.LIB
-%{_bindir}/*
-%exclude %{_bindir}/checkXML
-%exclude %{_bindir}/kconfig_compiler
-%exclude %{_bindir}/ksvgtopng
-%exclude %{_bindir}/kunittestmodrunner
+%{_kde4_bindir}/*
+%exclude %{_kde4_bindir}/checkXML
+%exclude %{_kde4_bindir}/kconfig_compiler
+%exclude %{_kde4_bindir}/ksvgtopng
+%exclude %{_kde4_bindir}/kunittestmodrunner
+%{_kde4_appsdir}/*
 # kdewidgets
-%exclude %{_bindir}/makekdewidgets
-%exclude %{_datadir}/apps/kdewidgets/
-%exclude %{_libdir}/kde4/plugins/designer/kdewidgets.*
-%{_datadir}/apps/*
-%exclude %{_datadir}/apps/ksgmltools2/
-%{_datadir}/config/*
+%exclude %{_kde4_bindir}/makekdewidgets
+%exclude %{_kde4_appsdir}/kdewidgets/
+%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
+# ksgmltools2
+%exclude %{_kde4_appsdir}/ksgmltools2/
+%{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
-%{_datadir}/emoticons/*
-%{_datadir}/kde4/*
-# consider omitting (or packaging separately) scalable icons, since they take ~60% of the space -- Rex
-%{_datadir}/icons/oxygen/
-%{_datadir}/locale/all_languages/
-%{_datadir}/mime/packages/*
-%dir %{_datadir}/doc/HTML
-%dir %{_datadir}/doc/HTML/en
-%{_datadir}/doc/HTML/en/*
-%{_libdir}/lib*.so.*
-%{_libdir}/libkdeinit4_*.so
-%{_libdir}/kde4/
-%{_sysconfdir}/xdg/menus/*applications.menu
+%{_kde4_datadir}/mime/packages/*
+%{_kde4_iconsdir}/oxygen/
+#{_kde4_sharedir}/emoticons/*
+%{_kde4_sharedir}/locale/all_languages/
+%{_kde4_sharedir}/kde4/services/*
+%{_kde4_sharedir}/kde4/servicetypes/*
+%{_kde4_docdir}/HTML/en/*
+%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libkdeinit4_*.so
+%{_kde4_libdir}/kde4/
+%{_kde4_sysconfdir}/xdg/menus/*.menu
 
 %files devel
 %defattr(-,root,root,-)
 %doc KDE4PORTING.html
-%{_bindir}/checkXML
-%{_bindir}/kconfig_compiler
-%{_bindir}/ksvgtopng
-%{_bindir}/kunittestmodrunner
-%{_bindir}/makekdewidgets
-%{_bindir}/makekdewidgets
-%{_datadir}/apps/kdewidgets/
-%dir %{_libdir}/kde4/plugins/designer
-%{_libdir}/kde4/plugins/designer/kdewidgets.*
-%{_datadir}/apps/ksgmltools2/
-%{_includedir}/
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit4_*.so
+%{_kde4_bindir}/checkXML
+%{_kde4_bindir}/kconfig_compiler
+%{_kde4_bindir}/ksvgtopng
+%{_kde4_bindir}/kunittestmodrunner
+%{_kde4_bindir}/makekdewidgets
+%{_kde4_bindir}/makekdewidgets
+%{_kde4_appsdir}/kdewidgets/
+%dir %{_kde4_libdir}/kde4/plugins/designer
+%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
+%{_kde4_appsdir}/ksgmltools2/
+%{_kde4_includedir}/*
+%{_kde4_libdir}/lib*.so
+%exclude %{_kde4_libdir}/libkdeinit4_*.so
 
 
 
 %changelog
+* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
+- -devel: omit most (hopefully) extraneous Requires:
+- use macros.kde4
+- -devel: Conflicts: kdelibs-devel (in %%_bindir,%%_libdir)
+- License clarification
+
 * Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-3
 - name kdelibs4, don't mess with %%_prefix (for now)
 - move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,