rpms/kdenetwork/devel kdenetwork-3.5.8-kppp.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 kdenetwork.spec, 1.103, 1.104 sources, 1.46, 1.47 kdenetwork-3.3.92-kppp.patch, 1.2, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdenetwork.spec sources 
Added Files:
	kdenetwork-3.5.8-kppp.patch 
Removed Files:
	kdenetwork-3.3.92-kppp.patch 
Log Message:
* Sun Oct 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.8-2
- -libs: %%post/%%postun -p /sbin/ldconfig

* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.8-1
- kde-3.5.8
- libs subpkg (more multilib friendly)


kdenetwork-3.5.8-kppp.patch:

--- NEW FILE kdenetwork-3.5.8-kppp.patch ---
diff -up kdenetwork-3.5.8/kppp/Kppp.desktop.kppp kdenetwork-3.5.8/kppp/Kppp.desktop
--- kdenetwork-3.5.8/kppp/Kppp.desktop.kppp	2007-10-08 04:49:13.000000000 -0500
+++ kdenetwork-3.5.8/kppp/Kppp.desktop	2007-10-13 16:03:03.000000000 -0500
@@ -66,5 +66,4 @@ Path=
 Type=Application
 Terminal=false
 X-KDE-StartupNotify=true
-X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Network;Dialup;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	16 Jun 2007 23:21:59 -0000	1.40
+++ .cvsignore	16 Oct 2007 13:24:54 -0000	1.41
@@ -1 +1,2 @@
 kdenetwork-3.5.7.tar.bz2
+kdenetwork-3.5.8.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdenetwork.spec	18 Sep 2007 19:08:01 -0000	1.103
+++ kdenetwork.spec	16 Oct 2007 13:24:54 -0000	1.104
@@ -18,8 +18,8 @@
 
 Name:    kdenetwork
 Epoch:   7
-Version: 3.5.7
-Release: 6%{?dist}
+Version: 3.5.8
+Release: 2%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -37,11 +37,12 @@
 
 Patch1: kdenetwork-3.1-desktop.patch
 Patch2: kdenetwork-3.1-buildroot.patch
-Patch3: kdenetwork-3.3.92-kppp.patch
+Patch3: kdenetwork-3.5.8-kppp.patch
 Patch4: kdenetwork-3.2.3-resolv.patch
 # include more/proper ppp headers
 Patch5: kdenetwork-3.5.7-ppp.patch
 
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires(preun):  chkconfig
 Requires(post):   /sbin/ldconfig chkconfig
 Requires(postun): /sbin/ldconfig
@@ -98,15 +99,15 @@
 Summary: Development files for %{name} 
 Group: Development/Libraries
 Provides: kdenetwork3-devel = %{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: kdelibs-devel
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: kdelibs3-devel
 %description devel
 %{summary}. 
 
 %package extras
 Summary: Extras packages for %{name} 
 Group: Applications/Internet
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 %if "%{?_with_xmms:1}" == "1"
 Obsoletes: %{name}-nowlistenting < %{epoch}:%{version}-%{release}
 Provides:  %{name}-nowlistenting = %{epoch}:%{version}-%{release}
@@ -122,6 +123,16 @@
  * nowlistening (xmms) plugin for Kopete.
 %endif
 
+%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}.
+
+
 
 %prep
 %setup -q
@@ -188,7 +199,7 @@
 done
 fi
 
-# Show only in KDE
+# Show only in KDE, FIXME, need to re-evaluate these -- Rex
 for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
    kwifimanager kget knewsticker ksirc kdict ; do
    if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
@@ -241,6 +252,10 @@
   /sbin/service lisa stop > /dev/null 2>&1 ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %post extras
 for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
@@ -262,7 +277,7 @@
 %defattr(-,root,root,-)
 
 # ksirc
-%doc %{_docdir}/HTML/??/ksirc/
+%{_docdir}/HTML/??/ksirc/
 %{_bindir}/ksirc
 %{_libdir}/libkdeinit_ksirc.*
 %{_libdir}/kde3/ksirc.*
@@ -272,7 +287,7 @@
 %{_datadir}/icons/hicolor/*/apps/ksirc.*
 
 # kdict
-%doc %{_docdir}/HTML/en/kdict
+%{_docdir}/HTML/en/kdict
 %{_bindir}/kdict
 %{_libdir}/kde3/kdict*
 %{_libdir}/libkdeinit_kdict.*
@@ -282,7 +297,7 @@
 %{_datadir}/icons/hicolor/*/apps/kdict.*
 
 # ktalk
-%doc %{_docdir}/HTML/en/ktalkd
+%{_docdir}/HTML/en/ktalkd
 %{_bindir}/ktalkd*
 %{_libdir}/kde3/kcm_ktalkd.*
 %{_datadir}/applications/kde/kcmktalkd.desktop
@@ -292,7 +307,7 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
 
 # kpf
-%doc %{_docdir}/HTML/en/kpf
+%{_docdir}/HTML/en/kpf
 %{_libdir}/kde3/kpf*
 %{_datadir}/apps/kicker/applets/kpfapplet.desktop
 %{_datadir}/icons/crystalsvg/*/apps/kpf.*
@@ -395,12 +410,10 @@
 %endif
 %config(noreplace) %{_sysconfdir}/lisarc
 %config(noreplace) %{_initrddir}/lisa
-%{_libdir}/*.so.*
 %{_libdir}/libkdeinit_*.so
 %if "%{?_with_wifi:1}" == "1"
-%{_libdir}/libkwireless.so
+%{_libdir}/libkwireless.*
 %endif
-%{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin/*
 %{_bindir}/*
@@ -418,14 +431,25 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
-%if "%{?_with_wifi:1}" == "1"
-%exclude %{_libdir}/libkwireless.so
-%endif
+%{_libdir}/libkopete*.so
+%{_libdir}/librss.so
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libkopete*.so.*
+%{_libdir}/libkopete*.la
+%{_libdir}/librss.so.*
+%{_libdir}/librss.la
 
 
 %changelog
+* Sun Oct 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.8-2
+- -libs: %%post/%%postun -p /sbin/ldconfig
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.8-1
+- kde-3.5.8
+- libs subpkg (more multilib friendly)
+
 * Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-6
 - fix ppp patch
 
@@ -854,115 +878,3 @@
 
 * Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-1
 - 3.0 final
-
-* Wed Mar  6 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020306.1
-- Rename subpackages
-
-* Thu Jan 31 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020129.2
-- Rebuild with new kdelibs
-
-* Tue Jan 29 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020129.1
-- Update
-
-* Tue Jan  8 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020108.1
-- Update
-- Integrate ktalk stuff with xinetd
-
-* Tue Dec 18 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20011218.1
-- Update
-- Split into subpackages
-
-* Sun Jul 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010722.1
-- Update
-- Add build dependencies
-- Work around ia64 breakages
-
-* Sun May 13 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010513.1
-- Update to CVS
-- clean up specfile
-- Use %%post -p and %%postun -p
-
-* Wed Feb 21 2001 Than Ngo <than at redhat.com>
-- 2.1-respin
-
-* Mon Feb 19 2001 Than Ngo <than at redhat.com>
-- update 2.1
-- fix dangling symlinks
-
-* Fri Feb  2 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Limit CPU usage to 2 CPUs to make asok happy
-
-* Mon Jan 22 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update
-- Don't require perl, not everyone using ksirc is also using
-  ksirc perl scripting...
-
-* Mon Jan  8 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update (needed because of kdelibs change)
-- Obsolete kdenetwork2 (from 7.0 preview)
-
-* Mon Jan  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update
-
-* Tue Dec 12 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Add missing PAM file, fix group
-
-* Wed Nov 15 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- update to HEAD
-
-* Fri Nov  3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update CVS (fix kmail segfault with empty identity)
-
-* Tue Oct 31 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Fix up consolehelper config
-
-* Mon Oct 30 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update to current KDE_2_0_BRANCH (this should fix up knode)
-- Run kppp through consolehelper (Bug #20021)
-- Split of kppp and kppplog to a separate package, kdenetwork-ppp
-  (RFE #20022)
-
-* Mon Oct 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 2.0 final
-
-* Wed Oct  4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 2.0
-
-* Thu Aug 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 1.93
-
-* Mon Aug  7 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new version
-
-* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- disable keystone for now (compiler problem)
-
-* Fri Jul 21 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- some fixes to spec file
-
-* Tue Jul 18 2000 Than Ngo <than at redhat.de>
-- rebuilt with glibc-2.1.92-14 and gcc-2.96-40
-
-* Thu Jul 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Obsolete ktalk (powertools 6.x)
-- SMPify
-
-* Tue Jul 11 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- use gcc 2.96
-- new snapshot
-
-* Fri Jun 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Epoch
-
-* Tue Jun 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- ExcludeArch ia64 for now
-
-* Sat Mar 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- move it to /usr, where it belongs
-
-* Mon Oct 25 1999 Bernhard Rosenkraenzer <bero at redhat.de>
-- initial RPM


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	16 Jun 2007 23:21:59 -0000	1.46
+++ sources	16 Oct 2007 13:24:54 -0000	1.47
@@ -1 +1 @@
-d7f2a05a7e304b33128123c3f67ea636  kdenetwork-3.5.7.tar.bz2
+0e79374d1109d937b0c9bdd3a75e7476  kdenetwork-3.5.8.tar.bz2


--- kdenetwork-3.3.92-kppp.patch DELETED ---