rpms/kdesdk/devel kdesdk.spec,1.111,1.112

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdesdk.spec 
Log Message:
forward-port F-9 branch fix: fix -utils dep issues



Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- kdesdk.spec	23 Jul 2008 15:16:24 -0000	1.111
+++ kdesdk.spec	23 Jul 2008 18:00:34 -0000	1.112
@@ -1,3 +1,4 @@
+
 Name:           kdesdk
 Version:        4.1.0
 Release:        1%{?dist}
@@ -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,6 +79,8 @@
 %description utils
 %{summary}, including:
 po2xml
+split2po
+swappo
 xml2pot
 
 
@@ -99,16 +102,16 @@
 
 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"
@@ -139,8 +142,10 @@
 %defattr(-,root,root,-)
 %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/
@@ -179,33 +184,44 @@
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_mandir}/man1/*
 %{_kde4_libdir}/libkdeinit4*.so
-%{_kde4_libdir}/strigi/*
-%{_kde4_datadir}/strigi/fieldproperties/strigi_translation.fieldproperties
-%{_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
 * Wed Jul 23 2008 Than Ngo <than at redhat.com> 4.1.0-1
 - 4.1.0
 
+* 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