rpms/kdesdk/F-9 kdesdk.spec,1.100,1.101

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6289

Modified Files:
	kdesdk.spec 
Log Message:
* Wed Jul 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-2
- fix -utils dep issues



Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-9/kdesdk.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kdesdk.spec	23 Jun 2008 05:18:46 -0000	1.100
+++ kdesdk.spec	23 Jul 2008 17:56:49 -0000	1.101
@@ -1,27 +1,22 @@
 
 Name:           kdesdk
-Version:        4.0.5
-Release:        3%{?dist}
+Version:        4.0.99
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
 # FIXME/TODO: Check license
 License:        GPLv2
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://bugzilla.redhat.com/433399, kate missing Category=Utility
-Patch1: kdesdk-4.0.1-rh#433399.patch
-# backport http://websvn.kde.org/?view=rev&revision=775583 from 4.1
-# (#452054 "Use of the Symbol Viewer plugin crashes kate", kde#156559)
-Patch100: kdesdk-4.0.5-kde#156559.patch
-
 BuildRequires:  kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
+BuildRequires:  strigi-devel
 BuildRequires:  cmake
 BuildRequires:  flex
 BuildRequires:  giflib-devel
@@ -33,6 +28,7 @@
 BuildRequires:  libXtst-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  subversion-devel
+BuildRequires:  boost-devel
 # for libiberty (used by kmtrace for cp_demangle)
 # IMPORTANT: check licensing from time to time, currently libiberty is still
 #            GPLv2+/LGPLv2+
@@ -48,6 +44,10 @@
 # not *strictly* required -- Rex
 Requires(hint): %{name}-utils = %{version}-%{release}
 
+Provides:      kaider = %{version}-%{release}
+Obsoletes:     kaider < %{version}-%{release}
+# TODO: Shouldn't we Provides: lokalize too/instead?
+
 %description
 A collection of applications and tools used by developers, including:
 * cervisia: a CVS frontend
@@ -56,6 +56,7 @@
 * kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
 * kompare: diff tool
 * kuiviewer: displays designer's UI files
+* lokalize: computer-aided translation system focusing on productivity and performance
 * umbrello: UML modeller and UML diagram tool
 
 %package libs
@@ -65,12 +66,12 @@
 %{summary}.
 
 %package devel
-Summary:  Header files for %{name}
+Summary:  Developer files for %{name}
 Group:    Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel kdepimlibs-devel
 %description devel
-Header files for developing applications using %{name}.
+Files for developing applications using %{name}.
 
 %package utils
 Summary: Text utilities from %{name}
@@ -78,41 +79,39 @@
 %description utils
 %{summary}, including:
 po2xml
+split2po
+swappo
 xml2pot
 
 
 %prep
 %setup -q
 
-%patch1 -p1 -b .rh#433399
-%patch100 -p0 -b .kde#156559
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-
 make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
+
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+# unpackaged files
+rm -f %{buildroot}%{_kde4_libdir}/libantlr.so
+
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
 pushd %{buildroot}%{_kde4_libdir}
 for i in lib*.so
 do
   case "$i" in
-    # all these are not symlinks
-    libkdeinit4_*.so|libkomparedialogpages.so|libkomparediff2.so)
-      ;;
-    *)
+    libkateinterfaces.so)
       linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
@@ -128,10 +127,12 @@
 %post
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
 
 %postun
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -139,10 +140,12 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB COPYING-DOCS README
+%doc COPYING COPYING.LIB COPYING.DOC README
 %{_kde4_bindir}/*
-# moved to -utils
+# -utils
 %exclude %{_kde4_bindir}/po2xml
+%exclude %{_kde4_bindir}/split2po
+%exclude %{_kde4_bindir}/swappo
 %exclude %{_kde4_bindir}/xml2pot
 %{_kde4_configdir}/*
 %{_kde4_appsdir}/cervisia/
@@ -154,10 +157,12 @@
 %{_kde4_appsdir}/kbugbuster/
 %{_kde4_appsdir}/kcachegrind/*
 %{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/kdevappwizard/
 %{_kde4_appsdir}/kmtrace/
 %{_kde4_appsdir}/kompare/
 %{_kde4_appsdir}/kuiviewer/*
 %{_kde4_appsdir}/kuiviewerpart/*
+%{_kde4_appsdir}/lokalize/
 %{_kde4_appsdir}/umbrello/
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
@@ -172,45 +177,81 @@
 %{_kde4_docdir}/HTML/en/kcachegrind/
 %{_kde4_docdir}/HTML/en/kdesvn-build/
 %{_kde4_docdir}/HTML/en/kompare/
+%{_kde4_docdir}/HTML/en/lokalize/
 %{_kde4_docdir}/HTML/en/umbrello/
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/locolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_mandir}/man1/*
 %{_kde4_libdir}/libkdeinit4*.so
-%{_kde4_libdir}/strigi/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/libkomparedialogpages.so
+%{_kde4_libdir}/libkomparediff2.so
+%{_kde4_libdir}/strigi/*.so
+%{_kde4_datadir}/strigi/fieldproperties/
+%{_kde4_libdir}/kde4/*.so
+# -devel
 %exclude %{_kde4_libdir}/kde4/devel/
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
-%{_kde4_libdir}/libkomparedialogpages.so
-%{_kde4_libdir}/libkomparediff2.so
+# -utils
+%exclude %{_kde4_libdir}/libantlr.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
-%{_kde4_libdir}/kde4/devel/*
+%{_kde4_libdir}/lib*.so
+%exclude %{_kde4_libdir}/libkomparedialogpages.so
+%exclude %{_kde4_libdir}/libkomparediff2.so
+%{_kde4_libdir}/kde4/devel/lib*.so
 
 %files utils
 %defattr(-,root,root,-)
 %{_kde4_bindir}/po2xml
+%{_kde4_bindir}/split2po
+%{_kde4_bindir}/swappo
 %{_kde4_bindir}/xml2pot
-
+%{_kde4_libdir}/libantlr.so.*
 
 
 %changelog
-* Mon Jun 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.5-3
-- backport fix for Kate symbol viewer crash from 4.1 (#452054, kde#156559)
+* Wed Jul 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-2
+- fix -utils dep issues
+
+* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-1
+- 4.0.99
+
+* Fri Jul 11 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-1
+- 4.0.98
+
+* Sun Jul 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.85-1
+- 4.0.85
+
+* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.84-1
+- 4.0.84
+
+* Sat Jun 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.83-2
+- drop upstreamed rh#433399 patch
+
+* Thu Jun 19 2008 Than Ngo <than at redhat.com> 4.0.83-1
+- 4.0.83 (beta2)
+
+* Sun Jun 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.82-1
+- 4.0.82
 
-* Sun Jun 01 2008 Than Ngo <than at redhat.com> 4.0.5-2
-- 4.0.5
+* Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
+- 4.1 beta1
 
-* Fri May 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.4-2
+* Fri May 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.72-2
 - %%description: +kate
 
-* Tue May 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.4-1
-- kde-4.0.4
+* Tue May 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
+- update to 4.0.72
+- Obsoletes/Provides kaider (now part of kdesdk, renamed to lokalize)
+- add lokalize to description and file list
+- add BR strigi-devel for lokalize
+- add BR boost-devel (now needed by Umbrello)
 
 * Fri Apr 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-5
 - Requires: kdesdk-utils