rpms/kpilot/devel kpilot.spec,1.1,1.2

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kpilot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21135/devel

Modified Files:
	kpilot.spec 
Log Message:
* Tue Dec 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.3.0-2
- shorten Summary and add linebreak in %description
- Conflicts with old versions of kdepim (F12-)
- split out -libs subpackage


Index: kpilot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpilot/devel/kpilot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kpilot.spec	22 Dec 2009 07:57:21 -0000	1.1
+++ kpilot.spec	22 Dec 2009 08:06:34 -0000	1.2
@@ -1,7 +1,7 @@
 Name:    kpilot
-Summary: Utility to synchronize PIM (Personal Information Management) data with PalmOS devices
+Summary: Sync PIM data with PalmOS devices
 Version: 5.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # no pilot-link on S/390
 ExcludeArch: s390 s390x
@@ -20,11 +20,22 @@ BuildRequires: pilot-link-devel >= 0.12
 BuildRequires: qca2-devel
 BuildRequires: desktop-file-utils
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
+%if 0%{?fedora} < 13
+Conflicts: kdepim < 6:4.3.80
+%endif
 
 %description
+Utility to synchronize PIM (Personal Information Management) data with
+PalmOS devices.
+
+
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+
+%description libs
 %{summary}.
 
 
@@ -70,7 +81,6 @@ done
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans
@@ -78,13 +88,16 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 update-desktop-database -q &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %clean
 rm -rf %{buildroot}
@@ -96,10 +109,6 @@ rm -rf %{buildroot}
 %doc kpilot/README kpilot/AUTHORS kpilot/ChangeLog kpilot/NEWS kpilot/TODO
 %{_kde4_bindir}/kpilot
 %{_kde4_bindir}/kpilotDaemon
-%{_kde4_libdir}/libkpilot.so.*
-%{_kde4_libdir}/libkpilot_*.so
-%{_kde4_libdir}/kde4/kcm_kpilot.so
-%{_kde4_libdir}/kde4/kpilot_conduit_*.so
 %{_kde4_datadir}/applications/kde4/kpilot*.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
@@ -109,7 +118,19 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/kpilot/
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkpilot.so.*
+%{_kde4_libdir}/libkpilot_*.so
+%{_kde4_libdir}/kde4/kcm_kpilot.so
+%{_kde4_libdir}/kde4/kpilot_conduit_*.so
+
 
 %changelog
+* Tue Dec 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.3.0-2
+- shorten Summary and add linebreak in %%description
+- Conflicts with old versions of kdepim (F12-)
+- split out -libs subpackage
+
 * Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.3.0-1
 - new specfile for KPilot, split out of kdepim 4.3.4