diff --git a/.cvsignore b/.cvsignore index 131179e..548a90d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdenetwork-3.0.5a.tar.bz2 +kdenetwork-3.0.8.tar.bz2 diff --git a/kdenetwork.spec b/kdenetwork.spec index a66953e..911a329 100644 --- a/kdenetwork.spec +++ b/kdenetwork.spec @@ -1,82 +1,55 @@ -%define build_release 0 -%define build_beta 1 -%define build_snapshot 2 - -%define isClean 1 - -%define isBuild %{build_release} - -%define debug 0 - -%define release_number 1 - -%define build_for_ftp 0 - %define strip_bin 0 -%define final 0 %define rpm_clean 1 - -%define desktop_file 1 +%define desktop_file 0 %define desktop_file_utils_version 0.2.93 - -%define libtool 1 +%define DATE 20020326 +%define is_release 1 +%define beta %{nil} +%define rel 1 Name: kdenetwork -Version: 3.0.5a +Version: 3.0.8 +%define sourcedir stable/%{version}/distribution/tar/generic/source +%define ver %{version}%{beta} +%if %{is_release} +%if "%{beta}" != "" +Release: 0.%{beta}.%{rel} +%else +Release: %{rel} +%endif +%else +Release: 0.cvs%{DATE}.%{rel} +%endif Prefix: /usr Icon: kde-icon.xpm Summary: K Desktop Environment - Network Applications -Epoch: 7 -Group: Applications/Internet -BuildRoot: %{_tmppath}/%{name}-buildroot -License: GPL - -%if "%{isBuild}" == "%{build_release}" -%define release_name %{nil} -Release: %{release_number} -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{version}.tar.bz2 -%endif - -%if "%{isBuild}" == "%{build_beta}" -%define release_name beta1 -Release: 0.%{release_name}.%{release_number} -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{release_name}.tar.bz2 -%endif - -%if "%{isBuild}" == "%{build_snapshot}" -%define release_name 20020807 -Release: 0.%{release_name}cvs.%{release_number} -Source: cvs://cvs.kde.org/%{name}-%{release_name}.tar.bz2 -%endif - -%if %{build_for_ftp} -ExclusiveArch: %{ix86} +%if %{is_release} +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 Source2: ktalk Source3: kotalk -Source900: gccver.c - -Patch: kdenetwork-3.0.5a-buildroot.patch -Patch1: kdenetwork-3.0.5a-strlcpy.patch - +Patch: kdenetwork-3.0.2-desktop.patch +Epoch: 7 +Group: Applications/Internet +BuildRoot: %{_tmppath}/%{name}-buildroot +License: GPL BuildRequires: qt-devel >= 3.0.5 -BuildRequires: kdelibs-devel >= %{version} +BuildRequires: kdelibs-devel >= 3.0.8 BuildRequires: XFree86-devel BuildRequires: libtool BuildRequires: glibc-devel BuildRequires: gcc-c++ BuildRequires: automake15 BuildRequires: autoconf >= 2.53 - %if %{desktop_file} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} %endif - Requires(post,postun): /sbin/ldconfig - -Obsoletes: kdenetwork2 +Source900: gccver.c %description Networking applications for the K Desktop Environment. @@ -84,8 +57,7 @@ Networking applications for the K Desktop Environment. %package libs Summary: KDE Networking libraries Group: System Environment/Libraries -Requires: qt >= 3.0.5 -Requires: kdelibs >= %{version} +Requires: qt >= 3.0.4 kdelibs >= 3.0.2 Obsoletes: kdenetwork %description libs @@ -106,7 +78,6 @@ to develop or compile KDE networking applications. Summary: K Desktop Environment - PPP Network Applications Group: Applications/Internet Requires: usermode -Requires: kdelibs >= %{version} Obsoletes: kdenetwork-ppp Provides: kdenetwork-ppp @@ -120,7 +91,6 @@ PPP networking. Summary: IRC client for KDE Group: Applications/Internet Obsoletes: kdenetwork -Requires: kdelibs >= %{version} %description -n ksirc An IRC (Internet Relay Chat) client for KDE. @@ -129,7 +99,6 @@ An IRC (Internet Relay Chat) client for KDE. Summary: A DICT (net dictionary) client for KDE Group: Applications/Internet Obsoletes: kdenetwork -Requires: kdelibs >= %{version} %description -n kdict A DICT (net dictionary) client for KDE. @@ -138,7 +107,6 @@ A DICT (net dictionary) client for KDE. Summary: KIT - An AIM client for KDE Group: Applications/Internet Obsoletes: kdenetwork -Requires: kdelibs >= %{version} %description -n kit An AIM (AOL Instant Messager) client for KDE @@ -148,7 +116,6 @@ Summary: A mail client for KDE Group: Applications/Internet Requires: %{name}-libs = %{version}-%{release} Obsoletes: kdenetwork -Requires: kdelibs >= %{version} %description -n kmail A mail client for KDE. @@ -159,7 +126,6 @@ Internet mail protocols (POP3, IMAP, SMTP, ...) Summary: A News Ticker for KDE Group: Applications/Internet Requires: %{name}-libs = %{version}-%{release} -Requires: kdelibs >= %{version} Obsoletes: kdenetwork %description -n knewsticker @@ -170,7 +136,6 @@ sites of your choice. Summary: A newsgroup (NNTP) reader for KDE Group: Applications/Internet Requires: %{name}-libs = %{version}-%{release} -Requires: kdelibs >= %{version} Obsoletes: kdenetwork %description -n knode @@ -179,7 +144,6 @@ A newsgroup (NNTP) reader for KDE. %package -n korn Summary: Multi-folder new mail monitor for KDE Group: Applications/Internet -Requires: kdelibs >= %{version} Obsoletes: kdenetwork %description -n korn @@ -190,7 +154,6 @@ folders in kicker (the KDE panel). %package -n ktalkd Summary: Talk (chat) protocol implementation for KDE Group: Applications/Internet -Requires: kdelibs >= %{version} Obsoletes: kdenetwork %description -n ktalkd @@ -199,7 +162,6 @@ An implementation of the Talk protocol for KDE. %package -n kxmlrpcd Summary: Remote scripting capability for KDE Group: Applications/Internet -Requires: kdelibs >= %{version} Obsoletes: kdenetwork %description -n kxmlrpcd @@ -209,7 +171,6 @@ the XmlRpc protocol. %package -n lisa Summary: LAN browser Group: Applications/Internet -Requires: kdelibs >= %{version} Obsoletes: kdenetwork %description -n lisa @@ -219,34 +180,62 @@ relying on the TCP/IP protocol stack, no smb or whatever. %package -n kpf Summary: KDE Public Fileserver Group: Applications/Internet -Requires: kdelibs >= %{version} Obsoletes: kdenetwork %description -n kpf KPF is an easy to use public file server controlled from the KDE panel. Simply drag a file or directory to the KPF button to share it. +%package -n krfb +Summary: KDE Desktop Sharing +Group: Applications/Internet +Obsoletes: kdenetwork + +%description -n krfb +KDE Desktop Sharing (krfb) is a small server for the RFB protocol, better +known as VNC. Unlike most other Unix/Linux RFB servers, KRfb allows you to +share your X11 session instead of creating a new X11 session. + +%package -n kget +Summary: An advanced download manager for KDE +Group: Applications/Internet +Obsoletes: kdenetwork + +%description -n kget +An advanced download manager for KDE + + +%package -n krdc +Summary: KDE Remote Desktop Connection +Group: Applications/Internet +Obsoletes: kdenetwork + +%description -n krdc +KDE Remote Desktop Connection (krdc) is a small VNC-compatible client +that is based on the TightVNC Unix client. You can use it to access +VNC-compatible servers like KDE's Desktop Sharing (krfb). + %prep rm -rf $RPM_BUILD_ROOT -%if "%{isBuild}" == "%{build_release}" -%setup -q +%if %{is_release} +%setup -q -n %{name}-%{ver} %else -%setup -q -n %{name}-%{version}-%{release_name} +%setup -q -n %{name} +%endif +%if %{desktop_file} +%patch -p1 -b .desktop %endif - -%patch -p1 -b .buildroot -%patch1 -p1 -b .strlcpy # Workaround for legacy auto* tools -%if %{libtool} [ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf [ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5? autoheader [ -x /usr/bin/aclocal-1.5 ] && ln -s /usr/bin/aclocal-1.5 aclocal [ -x /usr/bin/automake-1.5 ] && ln -s /usr/bin/automake-1.5 automake export PATH=`pwd`:$PATH -make -f admin/Makefile.common cvs -%endif +# End workaround + +make -f Makefile.cvs %build export KDEDIR=%{prefix} @@ -263,31 +252,29 @@ CXXFLAGS="$FLAGS $RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -fno-check-new" \ CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" \ %endif ./configure --prefix=%{prefix} \ - --libdir=%{prefix}/%{_lib} \ - --includedir=%{prefix}/include/kde + --includedir=%{prefix}/include/kde gcc -o gccver %{SOURCE900} if [ "0`./gccver`" -lt 3001 ]; then - find . -name Makefile |xargs perl -pi -e "s,^CXXLD\s*=.*,\$& -release gcc`./gccver -v`,g" + find . -name Makefile |xargs perl -pi -e "s,^CXXLD\s*=.*,\$& -release gcc`./gccver -v`,g" fi make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT - make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/pam.d cp %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/kppp # Make symlinks relative -mkdir -p $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en/common -pushd $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en -for i in *; do - [ -d $i -a -L $i/common ] && ln -nfs ../common $i -done -popd +( + mkdir -p $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en/common + cd $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en + for i in *; do + [ -d $i -a -L $i/common ] && ln -nfs ../common $i + done +) # Run kppp through consolehelper mkdir -p $RPM_BUILD_ROOT%{prefix}/sbin @@ -306,12 +293,6 @@ cp %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d %if %{desktop_file} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -pushd $RPM_BUILD_ROOT%{_datadir}/applnk -for i in `find . -name "*.desktop"`; do - grep "Hidden=true" $i >& /dev/null && rm -f $i -done -popd - desktop-file-install --vendor kde \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category "Application;Network;X-Red-Hat-Extra" \ @@ -330,6 +311,7 @@ desktop-file-install --vendor kde \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/kmailcvt.desktop + for i in FileBrowsing Information LookNFeel LookNFeel/Desktop LookNFeel/Themes \ LookNFeel/Windows Network Peripherals Personalization \ PowerControl Sound System WebBrowsing; do @@ -384,6 +366,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_libdir}/libkdenetwork*.so.* %{_libdir}/libmimelib*.so.* +%{_libdir}/kde3/kfile_* +%{_datadir}/services/kfile_rfc822.desktop %files devel %defattr(-,root,root) @@ -400,6 +384,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/*ppp* %else %{_datadir}/applnk/Internet/*ppp* +%{_datadir}/applnk/Internet/More/*ppp* %endif %{_datadir}/apps/kppp %{_datadir}/icons/*/*/*/*ppp* @@ -460,9 +445,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/apps/kconf_update/kmail* %{_datadir}/apps/kconf_update/kpgp.upd %{_datadir}/apps/kconf_update/upgrade-transport.pl +%{_datadir}/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl +%{_datadir}/apps/kconf_update/upgrade-signature.pl %{_datadir}/apps/kmail %{_datadir}/icons/*/*/apps/kmail* %doc %{_docdir}/HTML/en/kmail +%doc %{_docdir}/HTML/en/kgpgcertmanager +%{_bindir}/kgpgcertmanager +%{_datadir}/apps/kgpgcertmanager %files -n knewsticker %defattr(-,root,root) @@ -470,12 +460,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/kde3/*newsticker* %{_libdir}/libkntsrcfilepropsdlg*.* %if %{desktop_file} +%{_datadir}/applnk/.hidden/knewsticker* +%{_datadir}/applnk/.hidden/kcmnewsticker* +%{_datadir}/applications/kde-kcmnewsticker* %{_datadir}/applications/kde-kcmnewsticker* %{_datadir}/applications/kde-knewsticker-standalone.desktop %else %{_datadir}/applnk/.hidden/knewsticker* -%{_datadir}/applnk/Settings/Network/kcmnewsticker* +%{_datadir}/applnk/.hidden/kcmnewsticker* %{_datadir}/applnk/Settings/Personalization/kcmnewsticker* +%{_datadir}/applnk/Internet/More/knewsticker-standalone.desktop %{_datadir}/applnk/Internet/knewsticker-standalone.desktop %endif %{_datadir}/apps/kconf_update/knewsticker.upd @@ -506,6 +500,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/*KOrn.desktop %else %{_datadir}/applnk/Internet/KOrn.desktop +%{_datadir}/applnk/Internet/More/KOrn.desktop %endif %{_datadir}/icons/*/*/apps/korn* %doc %{_docdir}/HTML/en/korn @@ -514,7 +509,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/mail.local %{_bindir}/*talk* -%{_libdir}/kde3/libkcm_ktalkd* +%{_libdir}/kde3/kcm_ktalkd* %if %{desktop_file} %{_datadir}/applications/kde-kcmktalkd.desktop %else @@ -524,27 +519,29 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/sounds/ktalkd.wav %config %{_datadir}/config/ktalkdrc %doc %{_docdir}/HTML/en/ktalkd +%doc %{_docdir}/HTML/en/kcontrol/kcmtalkd %config %{_sysconfdir}/xinetd.d/ktalk %config %{_sysconfdir}/xinetd.d/kotalk %files -n kxmlrpcd %defattr(-,root,root) %{_bindir}/kxmlrpcd -%{_libdir}/kde3/libkcm_*xml* +%{_libdir}/kde3/kcm_*xml* %{_libdir}/*xml* %if %{desktop_file} %{_datadir}/applications/kde-*xml* %else -%{_datadir}/applnk/Settings/System/*xml* +#%{_datadir}/applnk/Settings/System/*xml* %endif %{_datadir}/services/kxmlrpcd.desktop +%doc %{_docdir}/HTML/en/kcontrol/kxmlrpcd %files -n lisa %defattr(-,root,root) %{_bindir}/lisa %{_bindir}/reslisa -%{_libdir}/kde3/libkcm_lanbrowser*.* -%{_libdir}/kio_lan*.* +%{_libdir}/kde3/kcm_lanbrowser*.* +%{_libdir}/kde3/kio_lan*.* %if %{desktop_file} %{_datadir}/applications/kde-lanbrowser.desktop %else @@ -554,6 +551,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/apps/lisa %{_datadir}/services/*lan.protocol %doc %{_docdir}/HTML/en/lisa +%doc %{_docdir}/HTML/en/kcontrol/lanbrowser %files -n kpf %defattr(-,root,root) @@ -563,23 +561,41 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/services/kpf* %doc %{_docdir}/HTML/en/kpf -%changelog -* Sun Dec 22 2002 Than Ngo 3.0.5a-1 -- 3.0.5a -- fix bug #78650 - -* Mon Nov 11 2002 Nalin Dahyabhai 3.0.5-2 -- remove directory names from the PAM configuration, allowing the same config - file to be used for all arches on multilib systems - -* Sat Nov 9 2002 Than Ngo 3.0.5-1 -- update to 3.0.5 - -* Tue Oct 15 2002 Than Ngo 3.0.4-1 -- 3.0.4 +%files -n krfb +%defattr(-,root,root) +%{_bindir}/krfb +%{_libdir}/kde3/kcm_krfb* +%{_libdir}/kde3/kded_kinetd* +%{_datadir}/applnk/Settings/Network/*krfb.desktop +%{_datadir}/applnk/System/*krfb.desktop +%{_datadir}/apps/kinetd +%{_datadir}/apps/krfb +%doc %{_docdir}/HTML/en/krfb +%{_datadir}/icons/*/*/*/krfb.png +%{_datadir}/services/kded/kinetd.desktop +%{_datadir}/services/kinetd_krfb.desktop +%{_datadir}/servicetypes/kinetdmodule.desktop + +%files -n kget +%defattr(-,root,root) +%{_bindir}/kget +%{_datadir}/applnk/Internet/*kget.desktop +%{_datadir}/apps/kget +%{_datadir}/icons/*/*/*/kget.png +%{_datadir}/icons/*/*/*/kget_list.png +%{_datadir}/mimelnk/application/x-kgetlist.desktop + +%files -n krdc +%defattr(-,root,root) +%{_bindir}/krdc +%{_datadir}/applnk/Internet/*krdc.desktop +%{_datadir}/apps/krdc +%{_datadir}/icons/*/*/*/krdc.png +%{_datadir}/services/vnc.protocol -* Sat Oct 12 2002 Than Ngo 3.0.3-3.1 -- kpf Directory traversal +%changelog +* Wed Oct 2 2002 Harald Hoyer +- 3.0.8 KDE 3.1 Beta 2 * Sat Aug 24 2002 Than Ngo 3.0.3-3 - move knode menu entries to Extras (bug #71881) diff --git a/kppp.pamd b/kppp.pamd index c9a5a8a..98164ae 100644 --- a/kppp.pamd +++ b/kppp.pamd @@ -1,7 +1,7 @@ #%PAM-1.0 -auth sufficient pam_rootok.so -auth sufficient pam_timestamp.so -auth required pam_stack.so service=system-auth -session optional pam_xauth.so -session optional pam_timestamp.so -account required pam_permit.so +auth sufficient /lib/security/pam_rootok.so +auth sufficient /lib/security/pam_timestamp.so +auth required /lib/security/pam_stack.so service=system-auth +session optional /lib/security/pam_xauth.so +session optional /lib/security/pam_timestamp.so +account required /lib/security/pam_permit.so diff --git a/sources b/sources index 0fbdbf6..acfa0c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -527973059f0b880e714f8a4eae0d18e5 kdenetwork-3.0.5a.tar.bz2 +213519d966ef86f8a990b9b6ff8fa9e4 kdenetwork-3.0.8.tar.bz2