rpms/kdenetwork/FC-5 kdenetwork-3.5.4-kde#130630.patch, NONE, 1.1 kdenetwork-3.5.4-kde#63494.patch, NONE, 1.1 kdenetwork-3.5.4-kde#73519.patch, NONE, 1.1 kdenetwork.spec, 1.74, 1.75 sources, 1.42, 1.43

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdenetwork/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19186

Modified Files:
	kdenetwork.spec sources 
Added Files:
	kdenetwork-3.5.4-kde#130630.patch 
	kdenetwork-3.5.4-kde#63494.patch 
	kdenetwork-3.5.4-kde#73519.patch 
Log Message:
3.5.4


kdenetwork-3.5.4-kde#130630.patch:
 oscartypes.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdenetwork-3.5.4-kde#130630.patch ---
Index: kopete/protocols/oscar/liboscar/oscartypes.h
===================================================================
--- kopete/protocols/oscar/liboscar/oscartypes.h	(Revision 568262)
+++ kopete/protocols/oscar/liboscar/oscartypes.h	(Revision 568263)
@@ -237,7 +237,7 @@
 	const WORD ICQ_MAJOR 			= 0x0014;
 	const WORD ICQ_MINOR 			= 0x0034;
 	const WORD ICQ_POINT 			= 0x0000;
-	const WORD ICQ_BUILD 			= 0x0A0F;
+	const WORD ICQ_BUILD 			= 0x0BB8;
 	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
 	const char ICQ_COUNTRY[] 		= "us";
 	const char ICQ_LANG[] 			= "en";

kdenetwork-3.5.4-kde#63494.patch:
 newsscroller.cpp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdenetwork-3.5.4-kde#63494.patch ---
Index: knewsticker/newsscroller.cpp
===================================================================
--- knewsticker/newsscroller.cpp	(Revision 566105)
+++ knewsticker/newsscroller.cpp	(Revision 566106)
@@ -129,7 +129,7 @@
 };
 
 NewsScroller::NewsScroller(QWidget *parent, ConfigAccess *cfg, const char *name)
-	: QFrame(parent, name),
+	: QFrame(parent, name, WNoAutoErase),
 	m_cfg(cfg),
 	m_scrollTimer(new QTimer(this)),
 	m_activeHeadline(0),
@@ -258,8 +258,8 @@
 	
 	if (contentsRect().contains(pt))
 		updateActive(pt);
-	
-	repaint(false);
+
+	update();
 }
 
 void NewsScroller::enterEvent(QEvent *)
@@ -337,7 +337,7 @@
 	}
 
 	if (updateActive(e->pos()))
-		repaint(false);
+		update();
 }
 
 void NewsScroller::wheelEvent(QWheelEvent *e)
@@ -360,7 +360,7 @@
 
 	if (m_activeHeadline) {
 		m_activeHeadline = 0;
-		repaint(false);
+		update();
 	}
 }
 
@@ -488,7 +488,7 @@
 			m_offset = - scrollHeight();
 	}
 
-	repaint(false);
+	update();
 }
 
 int NewsScroller::scrollWidth() const

kdenetwork-3.5.4-kde#73519.patch:
 vidmode.cpp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE kdenetwork-3.5.4-kde#73519.patch ---
Index: krdc/vidmode.cpp
===================================================================
--- krdc/vidmode.cpp	(Revision 571506)
+++ krdc/vidmode.cpp	(Revision 571507)
@@ -38,7 +38,9 @@
 	if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
 		return;
 
-	XF86VidModeGetAllModeLines(dpy,oldResolution.screen,&modecount, &modes);
+	if (!XF86VidModeGetAllModeLines(dpy, oldResolution.screen, &modecount, &modes))
+		return;
+
 	for (int i = 0; i < modecount; i++) {
 		int w = (*modes[i]).hdisplay;
 		int h = (*modes[i]).vdisplay;
@@ -69,7 +71,9 @@
 	if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
 		return Resolution();
 
-	XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes);
+	if (!XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes))
+		return Resolution();
+
 	int cw = (*modes[0]).hdisplay;
 	int ch = (*modes[0]).vdisplay;
 	nx = cw;


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-5/kdenetwork.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- kdenetwork.spec	8 Jun 2006 22:40:18 -0000	1.74
+++ kdenetwork.spec	14 Aug 2006 13:38:55 -0000	1.75
@@ -1,30 +1,26 @@
 %define debug 0
 %define final 0
-%define arts 1
 %define libidn 1
 %define make_cvs 1
-%define xmms 0
 
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
 
 %define appdir %{_datadir}/applications/kde
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Name: kdenetwork
-Version: 3.5.3
+Version: 3.5.4
 Release: 0.1.fc5
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kppp.pamd
 Source2: ktalk
 Source4: lisarc
@@ -37,6 +33,11 @@
 Patch4: kdenetwork-3.2.3-resolv.patch
 Patch5: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
 
+# upstream patches
+Patch100: kdenetwork-3.5.4-kde#130630.patch
+Patch101: kdenetwork-3.5.4-kde#73519.patch
+Patch102: kdenetwork-3.5.4-kde#63494.patch
+
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
@@ -45,10 +46,8 @@
 BuildRequires: qt-devel >= %{qt_version}
 BuildRequires: kdebase-devel
 BuildRequires: libtool
-BuildRequires: glibc-devel
-BuildRequires: gcc-c++
 BuildRequires: automake
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf
 %ifnarch s390 s390x
 BuildRequires: wireless-tools >= 25
 %endif
@@ -56,11 +55,7 @@
 BuildRequires: libXmu-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXtst-devel
-%if %{xmms}
-BuildRequires: xmms-devel
-%else
-Obsoletes: kdenetwork-nowlistening
-%endif
+BuildRequires: openssl-devel
 
 %description
 Networking applications for the K Desktop Environment.
@@ -75,16 +70,6 @@
 Development files for kdenetwork. Install kdenetwork-devel if you wish
 to develop or compile KDE networking applications.
 
-%if %{xmms}
-%package nowlistening
-Summary: Xmms plugin for Kopete
-Group: Applications/Multimedia
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description nowlistening
-Xmms plugin for Kopete
-%endif
-
 %prep
 %setup -q
 %patch0 -p1 -b .dt
@@ -94,11 +79,12 @@
 %patch4 -p1 -b .ppp
 %patch5 -p1 -b .libgadu-va_copy
 
-find -name CVS | xargs rm -rf 
+# upstream patches
+%patch100 -p0 -b .kde#130630
+%patch101 -p0 -b .kde#73519
+%patch102 -p0 -b .kde#63494
 
-%if !%{xmms}
-  echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
-%endif
+echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -107,22 +93,11 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-FLAGS="%{optflags}"
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
-export KDEDIR=%{_prefix}
-export LDFLAGS="$LDFLAGS `krb5-config --libs`"
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --enable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -186,14 +161,25 @@
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add lisa
-exit 0
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
 
 %postun
 /sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %preun
 if [ "$1" = "0" ]; then
-    /sbin/chkconfig --del lisa
+    /sbin/chkconfig --del lisa ||:
+    /sbin/service lisa stop > /dev/null 2>&1 ||:
 fi
 exit 0
 
@@ -202,11 +188,12 @@
 
 %files
 %defattr(-,root,root)
-%config %{_sysconfdir}/security/console.apps/kppp
-%config %{_sysconfdir}/pam.d/kppp
-%config %{_sysconfdir}/lisarc
-%config %{_sysconfdir}/rc.d/init.d/lisa
-%config %{_sysconfdir}/xinetd.d/ktalk
+%doc AUTHORS COPYING README
+%config(noreplace) %{_sysconfdir}/security/console.apps/kppp
+%config(noreplace) %{_sysconfdir}/pam.d/kppp
+%config(noreplace) %{_sysconfdir}/lisarc
+%config(noreplace) %{_sysconfdir}/rc.d/init.d/lisa
+%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
 %doc %{_docdir}/HTML/en/*
 %{_libdir}/*.so*
 %{_libdir}/*.la
@@ -234,17 +221,10 @@
 %defattr(-,root,root)
 %{_includedir}/kde/*
 
-%if %{xmms}
-%files nowlistening
-%defattr(-,root,root)
-%{_datadir}/apps/kopete/*nowlisteningchatui*
-%{_datadir}/apps/kopete/*nowlisteningui*
-%{_datadir}/services/kconfiguredialog/*nowlistening*
-%{_datadir}/services/*nowlistening*
-%{_libdir}/kde3/*nowlistening*
-%endif
-
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 7:3.5.4-0.1.fc5
+- 3.5.4
+
 * Fri Jun 09 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.1.fc5
 - update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-5/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	8 Jun 2006 22:40:18 -0000	1.42
+++ sources	14 Aug 2006 13:38:55 -0000	1.43
@@ -1 +1 @@
-119af91a048c34d9a917a1898f215554  kdenetwork-3.5.3.tar.bz2
+81660b1a73e81b6c01a55861c154dd3b  kdenetwork-3.5.4.tar.bz2