From 4871702bddd115cad08c09bab16a08240e45c0b3 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 06:50:20 +0000
Subject: auto-import changelog data from kdenetwork-2.2-4.src.rpm

Sun Aug 19 2001 Than Ngo <than@redhat.com> 2.2-4
- add some fixes from KDE_2_2_BRANCH
- fix bug #51852, #51788

---

diff --git a/.cvsignore b/.cvsignore
index 3c8f367..94e177a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,3 @@
 kdenetwork-2.2.tar.bz2
+kimon-2.0pre1.tar.gz
+kisdndock-0.9.1.tar.gz
diff --git a/kdenetwork.spec b/kdenetwork.spec
index 8d93ec9..db368e9 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -2,7 +2,7 @@
 %define DATE 20010805
 %define is_release 1
 %define beta %{nil}
-%define rel 3
+%define rel 4
 
 Name: kdenetwork
 Version: 2.2
@@ -24,8 +24,17 @@ Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{ver}.tar.bz2
 %else
 Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{DATE}.tar.bz2
 %endif
-Obsoletes: kdenetwork2
 Source1: kppp.pamd
+%ifnarch s390 s390x
+Source2: kisdndock-0.9.1.tar.gz
+Source3: kimon-2.0pre1.tar.gz
+Source4: kisdndock.pam
+Obsoletes: kdenetwork2, kimon, kisdndock
+Requires: usermode
+Patch0: kimon-2.0pre1-misc.patch
+%else
+Obsoletes: kdenetwork2
+%endif
 Epoch: 7
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -33,7 +42,8 @@ License: GPL
 Requires: qt >= 2.2.3 kdelibs >= 2.1 XFree86 XFree86-libs glibc
 BuildRequires: qt-devel kdelibs-devel XFree86-devel glibc-devel gcc-c++
 Requires(post,postun): /sbin/ldconfig
-Patch: kdenetwork-2.2-cvsfixes.patch
+Patch1: kdenetwork-2.2-cvsfixes.patch
+Patch2: kdenetwork-2.2beta1-knewsticker-utf8-20010713.diff
 
 %package ppp
 Summary: PPP configuration utilities for KDE.
@@ -54,18 +64,37 @@ a PPP (modem dial-up) connection for the K Desktop Environment (KDE).
 rm -rf $RPM_BUILD_ROOT
 
 %if %{is_release}
+%ifnarch s390 s390x
+%setup -q -n %{name}-%{ver} -a 2 -a 3
+%patch0 -p0 -b .misc
+%else
 %setup -q -n %{name}-%{ver}
+%endif
 %else
 %setup -q -n %{name}
 %endif
-%patch -p1 -b .cvs
+%patch1 -p1 -b .cvs
+%patch2 -p1 -b .utf8
+
+%ifnarch s390 s390x
+cd kisdndock-0.9.1 && make -f Makefile.cvs
+cd ..
+%endif
 make -f Makefile.cvs
 
 %build
 export KDEDIR=%{prefix}
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-
 FLAGS="-D_GNU_SOURCE"
+%ifnarch s390 s390x
+cd kisdndock-0.9.1
+CXXFLAGS="$RPM_OPT_FLAGS $FLAGS" ./configure --prefix=%{prefix} --sysconfdir=%{_sysconfdir}
+make %{?_smp_mflags}
+cd ../kimon-2.0pre1
+CXXFLAGS="$RPM_OPT_FLAGS $FLAGS" ./configure --prefix=%{prefix}
+make %{?_smp_mflags}
+cd ..
+%endif
 
 cp -a /usr/share/libtool/l* .
 %ifnarch alpha
@@ -76,12 +105,24 @@ CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" \
 ./configure --prefix=%{prefix} \
 	--includedir=%{prefix}/include/kde
 
-make %{?_smp_mflags}
+LANG=C make %{?_smp_mflags}
 
 %install
+%ifnarch s390 s390x
+(cd kisdndock-0.9.1 && make install DESTDIR=$RPM_BUILD_ROOT transform=)
+(cd kimon-2.0pre1 && make install-strip DESTDIR=$RPM_BUILD_ROOT)
+mkdir -p $RPM_BUILD_ROOT%{prefix}/bin \
+         $RPM_BUILD_ROOT/etc/pam.d \
+         $RPM_BUILD_ROOT/etc/security/console.apps
+install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/kisdndock
+touch $RPM_BUILD_ROOT/etc/security/console.apps/kisdndock
+(cd $RPM_BUILD_ROOT%{prefix}/bin && ln -fs consolehelper kisdndock)
+%endif
+
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 cp %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/kppp
+rm -f $RPM_BUILD_ROOT/kimon.xpm
 
 %ifnarch ia64
 # Make symlinks relative
@@ -105,7 +146,7 @@ find . -type f | sed -e 's,^\.,\%attr(-\,root\,root) ,' \
 find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> \
 	$RPM_BUILD_DIR/file.list.%{name}
 
-egrep -v "(%{prefix}/bin/kppp|%{prefix}/share/applnk/Internet/.*ppp.*|%{prefix}/share/apps/.*ppp.*|%{prefix}/share/icons/.*/.*/.*/.*ppp.*|%{_docdir}/HTML/en/kppp|%{prefix}/bin$|%{prefix}/include$|%{prefix}/lib$|%{prefix}/share$|pam.d/kppp)" $RPM_BUILD_DIR/file.list.%{name} >$RPM_BUILD_DIR/file.list.%{name}.main
+egrep -v "(%{prefix}/bin/kppp|%{prefix}/share/applnk/Internet/.*ppp.*|%{prefix}/share/apps/.*ppp.*|%{prefix}/share/icons/.*/.*/.*/.*ppp.*|%{_docdir}/HTML/en/kppp|%{prefix}/bin$|%{prefix}/include$|%{prefix}/lib$|%{prefix}/share$|pam.d/kppp|/etc$|/etc/pam.d$|%{prefix}/share/doc$|%{prefix}/share/icons$|%{prefix}/share/services$|%{prefix}/share/sounds$|%{prefix}/include/kde$|%{prefix}/lib/kde2$|%{prefix}/share/applnk/Internet$|%{prefix}/include/kde/mimelib$|%{prefix}/share/applnk$|%{prefix}/share/apps$|%{prefix}/share/applnk/Settings$|%{prefix}/share/applnk/Utilities$|%{prefix}/share/apps/kconf_update$|%{prefix}/share/config$|%{prefix}/share/doc/HTML$|%{prefix}/share/doc/HTML/en$|%{prefix}/share/icons/hicolor$|%{prefix}/share/icons/hicolor/(16x16|32x32|48x48)$|%{prefix}/share/icons/hicolor/(16x16|32x32|48x48)/apps$|/etc/security/console.apps/kisdndock|/etc/pam.d/kisdndock|%{prefix}/sbin$)" $RPM_BUILD_DIR/file.list.%{name} >$RPM_BUILD_DIR/file.list.%{name}.main
 perl -pi -e "s,%{_docdir},%%doc %{_docdir},g" file.list.%{name}.main
 
 # Run kppp through consolehelper
@@ -128,6 +169,8 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name}* $RPM_BUILD_DIR/%{name}
 
 %files -f ../file.list.%{name}.main
 %defattr(-,root,root)
+%config /etc/pam.d/kisdndock
+%config /etc/security/console.apps/kisdndock
 
 %files ppp
 %defattr(-,root,root)
@@ -141,6 +184,10 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name}* $RPM_BUILD_DIR/%{name}
 %config /etc/pam.d/kppp
 
 %changelog
+* Sun Aug 19 2001 Than Ngo <than@redhat.com> 2.2-4
+- add some fixes from KDE_2_2_BRANCH
+- fix bug #51852, #51788
+
 * Mon Aug 13 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.2-3
 - Add kmail and knode fixes from KDE_2_2_BRANCH (fixes #51634)
 - Remove /etc/pam.d/kppp from base package (#51592)
diff --git a/sources b/sources
index 492ae38..eceedcb 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 8b83592546aa96ce69fb80dffde32f68  kdenetwork-2.2.tar.bz2
+030299ea15e7ff80e8053b249c7cf462  kimon-2.0pre1.tar.gz
+8c4ca2193cb1a243b02131b82d03aa47  kisdndock-0.9.1.tar.gz