rpms/kdepim/F-7 .cvsignore, 1.36, 1.37 kdepim.spec, 1.129, 1.130 sources, 1.42, 1.43

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14255

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
sync w/ devel/, kde-3.5.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	8 Oct 2007 13:34:46 -0000	1.36
+++ .cvsignore	25 Oct 2007 10:01:01 -0000	1.37
@@ -3,3 +3,4 @@
 cr32-app-kandy.png
 cr48-app-kandy.png
 kdepim-enterprise-svn20070926.tar.bz2
+kdepim-enterprise-svn20071013.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/kdepim.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kdepim.spec	8 Oct 2007 13:34:46 -0000	1.129
+++ kdepim.spec	25 Oct 2007 10:01:01 -0000	1.130
@@ -1,8 +1,8 @@
 
 
 # enterprise branch
-%define ent_date 20070926
-%define ent_rev 714749
+%define ent_date 20071013
+%define ent_rev 724979
 
 #define debug 1 
 ## --enable-final requires > 1GB VM, sometimes kills fedora's builders 
@@ -13,10 +13,15 @@
 %define _with_gnokii --with-gnokii
 %define _with_mal --with-mal
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 3.5.7
+Version: 3.5.8
 
 License: GPLv2
 Group: Applications/Productivity
@@ -25,9 +30,9 @@
 
 %if 0%{?ent_date} > 0
 Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
-Release: 10.svn%{ent_date}.ent%{?dist}
+Release: 3.svn%{ent_date}.ent%{?dist}
 %else
-Release: 8%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
 Source1: cr48-app-kandy.png
@@ -39,7 +44,13 @@
 
 Provides: kdepim3 = %{version}-%{release}
 
-Requires: kdelibs3 >= %{version}
+%if 0%{?libs}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -105,12 +116,24 @@
 Summary: Development files for %{name} 
 Group: Development/Libraries
 Provides: kdepim3-devel = %{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 Requires: kdelibs3-devel
 %description devel
 %{summary}.
 Install %{name}-devel if you want to write or compile %{name} plugins.
 
+%if 0%{?libs}
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: kdelibs3 >= %{version}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description libs
+%{summary}.
+%endif
+
+
 %prep
 %setup -q %{?ent_date: -n %{name}}
 
@@ -173,7 +196,7 @@
 
 
 %post
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
 for i in crystalsvg hicolor locolor ; do
  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
@@ -181,13 +204,19 @@
 %{_bindir}/update-desktop-database >& /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
 for i in crystalsvg hicolor locolor ; do
  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
 done
 %{_bindir}/update-desktop-database >& /dev/null ||:
 
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
 
 %clean
 rm -rf %{buildroot}
@@ -197,8 +226,6 @@
 %defattr(-,root,root,-)
 %doc README korganizer/COPYING
 %{_bindir}/*
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
 %{_libdir}/libakregatorprivate.so
 %{_libdir}/libkmailprivate.so
 %{_libdir}/libknodecommon.so
@@ -220,6 +247,13 @@
 %{_datadir}/servicetypes/*
 %{_docdir}/HTML/en/*
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
@@ -230,6 +264,16 @@
 
 
 %changelog
+* Sun Oct 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-3.20071013.ent
+- -libs: %%post/%%postun /sbin/ldconfig
+- -libs conditional (f8+)
+
+* Sun Oct 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-2.20071013.ent
+- -libs subpkg (to be more multilib friendly)
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-1.20071013.ent
+- kdepim-enterprise branch 20071013 snapshot (r724979)
+
 * Wed Oct 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-10.20070926.ent
 - xdg-open patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	8 Oct 2007 13:34:46 -0000	1.42
+++ sources	25 Oct 2007 10:01:01 -0000	1.43
@@ -1,4 +1,4 @@
 024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
 496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
 fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
-0d1f3d94721fbc40367aacbac91d6d34  kdepim-enterprise-svn20070926.tar.bz2
+20ceb8e93d65c956f6b607d553be1fc2  kdepim-enterprise-svn20071013.tar.bz2