rpms/kdepimlibs/devel kdepimlibs.spec, 1.6, 1.7 kdepimlibs-3.92.0-kde4home.diff, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdepimlibs.spec 
Removed Files:
	kdepimlibs-3.92.0-kde4home.diff 
Log Message:
- update to 3.93.0
- drop kde4home patch (no longer applied)
- list BR strigi-devel only once
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdepimlibs.spec	16 Aug 2007 20:55:39 -0000	1.6
+++ kdepimlibs.spec	9 Sep 2007 12:24:54 -0000	1.7
@@ -1,8 +1,8 @@
 
 Name: kdepimlibs
 
-Version: 3.92.0
-Release: 3%{?dist}
+Version: 3.93.0
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -12,9 +12,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# use ~/.kde4 instead of ~/.kde
-Patch0: kdepimlibs-%{version}-kde4home.diff
-
 # probably don't need to keep this, it was very short-lived -- Rex
 Obsoletes: kdepimlibs4 < %{version}-%{release}
 Provides:  kdepimlibs4 = %{version}-%{release}
@@ -28,7 +25,6 @@
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel libXtst-devel
 BuildRequires: openldap-devel
-BuildRequires: strigi-devel
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 # extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
 BuildRequires: libacl-devel bzip2-devel gamin-devel strigi-devel zlib-devel
@@ -72,6 +68,23 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+# move devel symlinks
+mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
+pushd %{buildroot}%{_kde4_libdir}
+for i in lib*.so
+do
+  case "$i" in
+    libkdeinit4_*.so)
+      ;;
+    *)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+  esac
+done
+popd
+
 
 %post -p /sbin/ldconfig
 
@@ -94,14 +107,21 @@
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
+%exclude %{_kde4_libdir}/kde4/devel/
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
-%{_kde4_libdir}/lib*.so
+%{_kde4_libdir}/kde4/devel/lib*.so
 
 
 %changelog
+* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
+- update to 3.93.0
+- drop kde4home patch (no longer applied)
+- list BR strigi-devel only once
+- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
+
 * Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
 - use macros.kde4
 - License: LGPLv2


--- kdepimlibs-3.92.0-kde4home.diff DELETED ---