rpms/kdebase/F-7 .cvsignore,1.59,1.60 kdebase.spec,1.278,1.279

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdebase.spec 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-7/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	16 Feb 2008 02:59:51 -0000	1.59
+++ .cvsignore	16 Apr 2008 13:44:01 -0000	1.60
@@ -1,4 +1,4 @@
+kdebase-3.5.9.tar.bz2
 cr16-app-package_games_kids.png
 cr32-app-package_games_kids.png
 cr48-app-package_games_kids.png
-kdebase-3.5.9.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-7/kdebase.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- kdebase.spec	28 Mar 2008 12:20:29 -0000	1.278
+++ kdebase.spec	16 Apr 2008 13:44:01 -0000	1.279
@@ -12,13 +12,16 @@
 %define _with_samba --with-samba
 
 Version: 3.5.9
-Release: 8%{?dist}
+Release: 10%{?dist}.1
 
 %if 0%{?fedora} > 8
 Name: kdebase3
 Summary: K Desktop Environment 3 - core files
 Obsoletes: kdebase < 6:%{version}-%{release}
 Provides: kdebase = 6:%{version}-%{release}
+
+# make -pim-ioslaves subpkg
+%define pim 1
 %else
 Epoch: 6
 Name: kdebase
@@ -104,6 +107,12 @@
 Obsoletes: kdebase-extras < 6:%{version}-%{release}
 Provides: kdebase-extras = 6:%{version}-%{release}
 %endif
+%if 0%{?pim}
+Requires: kdebase3-pim-ioslaves = %{version}-%{release}
+%else
+Obsoletes: kdebase3-pim-ioslaves < %{version}-%{release}
+Provides: kdebase3-pim-ioslaves = %{version}-%{release}
+%endif
 
 Requires(post): coreutils fileutils
 Requires(postun): coreutils fileutils
@@ -165,6 +174,7 @@
 # dbus >= 0.90, hal >= 0.5 (mock/yum is having problems groking this for me on el5/x86_64) -- Rex
 BuildRequires: dbus-devel hal-devel
 %endif
+BuildRequires: bzip2-devel
 BuildRequires: freetype-devel
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
@@ -267,6 +277,18 @@
 %{summary}.
 %endif
 
+%if 0%{?pim}
+%package pim-ioslaves
+Summary: PIM KIOslaves from %{name}
+Group: System Environment/Libraries
+%description pim-ioslaves
+Protocol handlers (KIOslaves) for personal information management, including:
+ * kio_ldap
+ * kio_nntp
+ * kio_pop3
+ * kio_smtp
+%endif
+
 
 %prep
 %setup -q -n kdebase-%{version}
@@ -477,6 +499,10 @@
 install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
 %endif
 
+# create/own /var/lib/kdm/kdmsts (#442081)
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/kdm
+touch $RPM_BUILD_ROOT%{_localstatedir}/lib/kdm/kdmsts
+
 %else
 # FIXME/TODO: initial removal. Check if the simple rm breaks anything.
 
@@ -755,6 +781,8 @@
 %if ! %{redhatify}
 %{_datadir}/fonts/bitmap-fonts/*
 %endif
+%dir %{_localstatedir}/lib/kdm
+%ghost %{_localstatedir}/lib/kdm/kdmsts
 %endif
 %{_datadir}/config.kcfg/*
 %{_bindir}/kio_media_mounthelper
@@ -776,6 +804,17 @@
 %{_datadir}/sounds/*
 %{_libdir}/kde3/*
 %{_libdir}/libkdeinit_*.*
+%if 0%{?pim}
+# exclude pim-ioslaves files from main package
+%exclude %{_libdir}/kde3/kio_ldap.*
+%exclude %{_libdir}/kde3/kio_nntp.*
+%exclude %{_libdir}/kde3/kio_pop3.*
+%exclude %{_libdir}/kde3/kio_smtp.*
+%exclude %{_datadir}/services/ldap*.protocol
+%exclude %{_datadir}/services/nntp*.protocol
+%exclude %{_datadir}/services/pop3*.protocol
+%exclude %{_datadir}/services/smtp*.protocol
+%endif
 
 %if 0%{?libs}
 %files libs
@@ -785,6 +824,19 @@
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
 
+%if 0%{?pim}
+%files pim-ioslaves
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kio_ldap.*
+%{_libdir}/kde3/kio_nntp.*
+%{_libdir}/kde3/kio_pop3.*
+%{_libdir}/kde3/kio_smtp.*
+%{_datadir}/services/ldap*.protocol
+%{_datadir}/services/nntp*.protocol
+%{_datadir}/services/pop3*.protocol
+%{_datadir}/services/smtp*.protocol
+%endif
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*.h
@@ -803,6 +855,15 @@
 
 
 %changelog
+* Mon Apr 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-10.1
+- create/own: /var/lib/kdm (#442081)
+
+* Tue Apr 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-10
+- f9+: split off -pim-ioslaves subpackage for kdepim (#441541)
+
+* Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-9
+- add missing BR bzip2-devel (thanks to Karsten Hopp)
+
 * Fri Mar 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-8
 - omit %%_datadir/applnk/.hidden/.directory (#321771)