rpms/kdeadmin/devel .cvsignore, 1.37, 1.38 kdeadmin.spec, 1.78, 1.79 sources, 1.39, 1.40 kdeadmin-3.5.7-knetworkconf.patch, 1.1, NONE

Than Ngo (than) fedora-extras-commits at redhat.com
Thu Dec 6 17:06:30 UTC 2007 

Author: than

Update of /cvs/extras/rpms/kdeadmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10520

Modified Files:
	.cvsignore kdeadmin.spec sources 
Removed Files:
	kdeadmin-3.5.7-knetworkconf.patch 
Log Message:
3.97.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	13 Oct 2007 17:51:55 -0000	1.37
+++ .cvsignore	6 Dec 2007 17:05:45 -0000	1.38
@@ -1,2 +1,3 @@
 kdeadmin-3.5.7.tar.bz2
 kdeadmin-3.5.8.tar.bz2
+kdeadmin-3.97.0.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kdeadmin.spec	17 Nov 2007 22:32:14 -0000	1.78
+++ kdeadmin.spec	6 Dec 2007 17:05:45 -0000	1.79
@@ -1,606 +1,187 @@
-
-%define make_cvs 1 
-%define console_helper 1
-
-Name:    kdeadmin
-Summary: Administrative tools for KDE
-Epoch:   7
-Version: 3.5.8
-Release: 2%{?dist}
-
-License: GPLv2
-URL:     http://www.kde.org/
-Group:   User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source1: kuser.pam
-Source2: kuser.pamd
-Source3: kpackage.pam
-Source4: kpackage.pamd
-Source5: kpackagerc
-Source6: ksysvrc
-Source7: kuserrc
-
-Patch0: kdeadmin-3.5.7-knetworkconf.patch
-
-Requires: kdelibs3 >= %{version}
+Name:           kdeadmin
+Epoch:          7
+Version:        3.97.0
+Release:        1%{?dist}
+Summary:        K Desktop Environment - Administrative tools
+
+Group:          User Interface/Desktops
+# FIXME/TODO: Check license
+License:        GPLv2
+URL:            http://www.kde.org/
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+Source1:        kuser.pam
+Source2:        kuser.pamd
+Source3:        kpackage.pam
+Source4:        kpackage.pamd
+# FIXME/TODO: Also include extra kuserrc and kpackagerc like in KDE 3.5?
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  kde-filesystem >= 4
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+BuildRequires:  kdelibs4-devel >= %{version}
+BuildRequires:  kdepimlibs-devel >= %{version}
+BuildRequires:  cmake
+BuildRequires:  openldap-devel
+# FIXME/TODO: These ones could be removed when they will be required by kdelibs4-devel (which happens soon)
+BuildRequires:  libXcomposite-devel
+BuildRequires:  libXdamage-devel
+BuildRequires:  libxkbfile-devel
+BuildRequires:  libXv-devel
+BuildRequires:  libXxf86misc-devel
+BuildRequires:  libXScrnSaver-devel
+BuildRequires:  libXpm-devel
+BuildRequires:  libXtst-devel
+
+
+# FIXME/TODO: are there other explicit Requires?
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
+Requires: kdelibs4 >= %{version}
+Requires: kdepimlibs >= %{version}
 Requires: pkgconfig
-%if 0%{?console_helper}
 Requires: usermode-gtk
-%endif
 
-%if %{make_cvs}
-BuildRequires: automake libtool
-%endif
-BuildRequires: kdelibs3-devel >= %{version}
-BuildRequires: rpm-devel
 
 %description
 The kdeadmin package includes administrative tools for the K Desktop
 Environment (KDE) including:
-kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
+* kcron (an editor for the cron command scheduler)
+* knetworkconf (a network configuration module for KDE's settings manager)
+* kuser (an user manager)
+* secpolicy (a program to display PAM security policies)
 
 
-%prep
-%setup -q
+%package kpackage
+Summary: A package manager
+Group: Applications/System
+Requires: smart
+Requires: usermode-gtk
+%description kpackage
+This package contains a package manager for  the KDE Desktop Environment.
+It is used for displaying currently installed packages, uninstalling
+them and installing new ones.
 
-%patch0 -p1 -b .knetworkconf
+kpackage is based upon the "Smart Package Manager".
 
-%if 0%{?rhel} > 1
-  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
-  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE ksysv"' >ksysv/configure.in.in
-  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kuser"' >kuser/configure.in.in
-  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE lilo-config"' >lilo-config/configure.in.in
-%endif
-
-%if %{make_cvs}
-  make -f admin/Makefile.common cvs
-%endif
+%prep
+%setup -q
 
 
 %build
-unset QTDIR && . /etc/profile.d/qt.sh
 
-%configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --with-rpm \
-   --enable-final \
-   --with-private-groups
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
-make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot}
-
-%if 0%{?rhel} > 1
-comps="kcron kdat knetworkconf"
-rm -rf %{buildroot}%{_docdir}/HTML/en/kuser \
-       %{buildroot}%{_docdir}/HTML/en/kpackage \
-       %{buildroot}%{_docdir}/HTML/en/ksysv \
-       %{buildroot}%{_docdir}/HTML/en/lilo-config       
-%else
-comps="kcron kdat knetworkconf kpackage ksysv kuser"
-mkdir -p %{buildroot}%{_datadir}/config \
-         %{buildroot}/etc/security/console.apps \
-         %{buildroot}/etc/pam.d \
-         %{buildroot}%{_sbindir}
-
-install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/
+mkdir %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # Run kuser through consolehelper
-install -p -m644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
-install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
-mv %{buildroot}%{_bindir}/kuser %{buildroot}%{_sbindir}
-ln -s consolehelper %{buildroot}%{_bindir}/kuser
+install -D -p -m644 %{SOURCE1} %{buildroot}%{_kde4_sysconfdir}/security/console.apps/kuser
+install -D -p -m644 %{SOURCE2} %{buildroot}%{_kde4_sysconfdir}/pam.d/kuser
+mkdir -p %{buildroot}%{_kde4_sbindir}
+mv %{buildroot}%{_kde4_bindir}/kuser %{buildroot}%{_kde4_sbindir}
+ln -s consolehelper %{buildroot}%{_kde4_bindir}/kuser
 
-%if 0%{?console_helper}
 # Run kpackage through consolehelper
-install -p -m644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage
-install -p -m644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage
-mv %{buildroot}%{_bindir}/kpackage %{buildroot}%{_sbindir}
-ln -s consolehelper %{buildroot}%{_bindir}/kpackage
-%endif
-
-%endif
-
-# locale's
-%find_lang %{name} || touch %{name}.lang
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}/$HTML_DIR ]; then
-for lang_dir in %{buildroot}/$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# rpmdocs
-for dir in $comps ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
-%post
-for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+install -D -p -m644 %{SOURCE3} %{buildroot}%{_kde4_sysconfdir}/security/console.apps/kpackage
+install -D -p -m644 %{SOURCE4} %{buildroot}%{_kde4_sysconfdir}/pam.d/kpackage
+mv %{buildroot}%{_kde4_bindir}/kpackage %{buildroot}%{_kde4_sbindir}
+ln -s consolehelper %{buildroot}%{_kde4_bindir}/kpackage
 
+# removed unused stuff
+rm -f %{buildroot}%{_kde4_libdir}/pkgconfig
 
 %clean
 rm -rf %{buildroot}
 
+%post
+/sbin/ldconfig ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%doc rpmdocs/*
-%{_bindir}/*
-%if 0%{?rhel} < 1
-%{_sbindir}/*
-%config(noreplace) /etc/pam.d/*
-%config(noreplace) /etc/security/console.apps/*
-%endif
-%{_datadir}/apps/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/config*/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/service*/*.desktop
-%{_libdir}/kde3/*
-%{_libdir}/pkgconfig/*.pc
-
-
-%changelog
-* Sat Nov 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-2
-- Requires: usermode-gtk
-
-* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-1
-- kde-3.5.8
-
-* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-3
-- License: GPLv2
-- (Build)Requires: kdelibs3(-devel)
-- drop Requires: kdebase
-
-* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-2
-- update knetworkconf patch
-- portability (rhel) bits
-
-* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-1
-- kdeadmin-3.5.7
-- make use of consoleheloper optional for kdesu-aware apps (default yes)
-
-* Wed May 23 2007 Than Ngo <than at redhat.com> -  7:3.5.6-5.fc7
-- fix bz#241049, kpackage does not run from the menu
-
-* Mon Mar 12 2007 Than Ngo <than at redhat.com> - 7:3.5.6-4.fc7
-- fix broken dependencies
-
-* Mon Mar 12 2007 Than Ngo <than at redhat.com> 7:3.5.6-3.fc7
-- fix broken dependencies 
-
-* Mon Mar 05 2007 Than Ngo <than at redhat.com> - 7:3.5.6-2.fc7
-- cleanup specfiles
-
-* Wed Feb 07 2007 Than Ngo <than at redhat.com> 7:3.5.6-1.fc7
-- 3.5.6
-
-* Fri Aug 18 2006 Than Ngo <than at redhat.com> 7:3.5.4-2
-- add FC6 support in knetworkconf
-
-* Thu Aug 10 2006 Than Ngo <than at redhat.com> 7:3.5.4-1
-- rebuild
-
-* Mon Jul 24 2006 Than Ngo <than at redhat.com> 7:3.5.4-0.pre1
-- prerelease of 3.5.4 (from the first-cut tag)
-- drop kdeadmin-3.5.2-knetworkconf-fedora.patch, it's include in 3.5.4 upstream
-
-* Mon Jul 17 2006 Than Ngo <than at redhat.com> 7:3.5.3-2
-- rebuild
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.3-1.1
-- rebuild
-
-* Fri Jun 02 2006 Than Ngo <than at redhat.com> 7:3.5.3-1
-- update to 3.5.3
-
-* Wed May 17 2006 Than Ngo <than at redhat.com> 7:3.5.2-2
-- add support Fedora Core release 5
-
-* Wed Apr 05 2006 Than Ngo <than at redhat.com> 7:3.5.2-1
-- update to 3.5.2
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Fri Feb 03 2006 Than Ngo <than at redhat.com> 7:3.5.1-1 
-- 3.5.1
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Tue Nov 29 2005 Than Ngo <than at redhat.com> 7:3.5.0-1
-- 3.5 final
-
-* Tue Nov 15 2005 Than Ngo <than at redhat.com> 7:3.4.92-2 
-- get rid of redundant buildrequires
-
-* Mon Oct 24 2005 Than Ngo <than at redhat.com> 7:3.4.92-1
-- update to 3.5 Beta 2
-
-* Fri Oct  7 2005 Tomas Mraz <tmraz at redhat.com>
-- use include instead of pam_stack in pam config
-
-* Tue Oct 04 2005 Than Ngo <than at redhat.com> 7:3.4.91-1
-- update to 3.5 Beta 1
-
-* Tue Sep 20 2005 Than Ngo <than at redhat.com> 7:3.4.2-2 
-- fix kcron crashes when a variable is selected #168770
-
-* Mon Aug 08 2005 Than Ngo <than at redhat.com> 7:3.4.2-1
-- update to 3.4.2
-
-* Mon Jul 18 2005 Than Ngo <than at redhat.com> 7:3.4.1-2
-- enable kuser #161051
-
-* Tue Jun 28 2005 Than Ngo <than at redhat.com> 7:3.4.1-1
-- 3.4.1
-
-* Fri Mar 18 2005 Than Ngo <than at redhat.com> 7:3.4.0-1
-- 3.4.0
-
-* Fri Mar 04 2005 Than Ngo <than at redhat.com> 7:3.4.0-0.rc1.2
-- rebuilt against gcc-4.0.0-0.31
-
-* Sat Feb 26 2005 Than Ngo <than at redhat.com> 7:3.4.0-0.rc1.1
-- KDE 3.4.0 rc1
-
-* Fri Feb 18 2005 Than Ngo <than at redhat.com> 7:3.3.92-0.1
-- KDE-3.4 beta2
-
-* Fri Dec 03 2004 Than Ngo <than at redhat.com> 7:3.3.2-0.1
-- update to 3.3.2
-
-* Mon Oct 18 2004 Than Ngo <than at redhat.com> 7:3.3.1-2
-- rebuilt
-
-* Wed Oct 13 2004 Than Ngo <than at redhat.com> 7:3.3.1-1
-- update to 3.3.1
-
-* Mon Aug 23 2004 Than Ngo <than at redhat.com> 3.3.0-1
-- update to 3.3.0 release
-
-* Tue Aug 10 2004 Than Ngo <than at redhat.com> 3.3.0-0.1.rc2
-- update to 3.3.0 rc2
-
-* Tue Aug 10 2004 Than Ngo <than at redhat.com> 3.3.0-0.1.rc1
-- update to 3.3 rc1
-
-* Sat Aug 07 2004 Than Ngo <than at redhat.com> 7:3.2.92-1 
-- update to 3.2 beta 2
-
-* Mon Jun 21 2004 Than Ngo <than at redhat.com> 7:3.2.3-1 
-- update to 3.2.3
-
-* Tue May 25 2004 Than Ngo <than at redhat.com> 7:3.2.2-3
-- disable kcmlinuz
-
-* Tue May 04 2004 Than Ngo <than at redhat.com> 7:3.2.2-2
-- cleanup GNOME/KDE menu
-
-* Tue Apr 13 2004 Than Ngo <than at redhat.com> 7:3.2.2-1
-- 3.2.2 release
-
-* Sun Mar 07 2004 Than Ngo <than at redhat.com> 7:3.2.1-1
-- 3.2.1 release
-
-* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Thu Feb 05 2004 Than Ngo <than at redhat.com> 7:3.2.0-0.3
-- 3.2.0 release
-- build against qt 3.3.0
-
-* Tue Jan 27 2004 Than Ngo <than at redhat.com> 3.1.95-0.2
-- cleanup specfile
-
-* Mon Jan 19 2004 Than Ngo <than at redhat.com> 7:3.1.95-0.1
-- KDE 3.2 RC1
-
-* Wed Dec 03 2003 Than Ngo <than at redhat.com> 7:3.1.94-0.1
-- KDE 3.2 Beta 2
-
-* Thu Nov 27 2003 Than Ngo <than at redhat.com> 7:3.1.93-0.2
-- get rid of rpath
-
-* Wed Nov 12 2003 Than Ngo <than at redhat.com> 7:3.1.93-0.1
-- KDE 3.2 Beta1
-- update kisdndock 1.0.2
-- cleanup
-
-* Tue Sep 30 2003 Than Ngo <than at redhat.com> 7:3.1.4-1
-- 3.1.4
-
-* Sun Aug 03 2003 Than Ngo <than at redhat.com> 7:3.1.3-1
-- 3.1.3
-
-* Wed Jun 25 2003 Than Ngo <than at redhat.com> 3.1.2-4
-- build against gcc-3.3-12
-- add define macro for lilo
-
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Mon May 19 2003 Than Ngo <than at redhat.com> 3.1.2-2
-- 3.1.2
-
-* Wed Mar 19 2003 Than Ngo <than at redhat.com> 3.1.1-1
-- 3.1.1
-
-* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
-- debuginfo rebuild
-
-* Thu Feb 20 2003 Than Ngo <than at redhat.com> 3.1-2
-- fix #84665
-- get rid of gcc path from dependency_libs
-
-* Mon Jan 27 2003 Than Ngo <than at redhat.com> 3.1-1
-- 3.1 final
-- remove unneeded size_t check patch
-- cleanup specfile
-
-* Thu Jan 23 2003 Tim Powers <timp at redhat.com> 7:3.1-0.5
-- rebuild
-
-* Tue Jan 14 2003 Thomas Woerner <twoerner at redhat.com> 3.1-0.4
-- exclude ia64
-- removed size_t check
-
-* Mon Jan 13 2003 Thomas Woerner <twoerner at redhat.com> 3.1-0.3
-- rc6
-
-* Thu Nov 28 2002 Than Ngo <than at redhat.com> 3.1-0.2
-- desktop file issues
-
-* Mon Nov 25 2002 Than Ngo <than at redhat.com> 3.1-0.1
-- update to 3.1 rc4
-- desktop file issues
-- adjust some patch files for 3.1
-
-* Sun Nov 10 2002 Than Ngo <than at redhat.com> 3.0.5-1
-- update to 3.0.5
-
-* Wed Nov  6 2002 Than Ngo <than at redhat.com> 3.0.4-2
-- fix some build problems
-
-* Tue Oct 15 2002 Than Ngo <than at redhat.com> 3.0.4-1
-- 3.0.4
-- cleanup specfile
-
-* Fri Sep 13 2002 Than Ngo <than at redhat.com> 3.0.3-3.1
-- Fixed to build on x86_64
-
-* Thu Aug 22 2002 Bernhard Rosenkraenzer <bero at redhat.de> 3.0.3-3
-- Fix kuser (#68879)
-
-* Wed Aug 14 2002 Florian La Roche <Florian.LaRoche at redhat.de>
-- improve spec file to better exclude sub-packages
-
-* Mon Aug 12 2002 Than Ngo <than at redhat.com> 3.0.3-1
-- 3.0.3
-- rebuild against new gcc
-
-* Thu Aug  8 2002 Than Ngo <than at redhat.com> 3.0.2-4
-- desktop file issues
-- Added pam_timestamp support (bug #69862)
-
-* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.2-3
-- build using gcc-3.2-0.1
-
-* Sat Jul 20 2002 Than Ngo <than at redhat.com> 3.0.2-2
-- fix desktop files issue
-
-* Wed Jul 10 2002 Than Ngo <than at redhat.com> 3.0.2-1
-- 3.0.2
-- use desktop-file-install
-
-* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Fri May 10 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.1-1
-- 3.0.1
-- Fix build with current automake
-- Don't build kpackage until the rpm 4.1 API is finalized
-
-* Tue Apr 16 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-4
-- Rebuild
-
-* Thu Apr 11 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-3
-- Link everything against the correct qt
-
-* Thu Mar 28 2002 Than Ngo <than at redhat.com> 3.0.0-2
-- add missing shared libs
-- exlude some stuff on s390/s390x
-
-* Wed Mar 27 2002 Than Ngo <than at redhat.com> 3.0.0-1
-- final
-
-* Tue Mar  5 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020305.1
-- Make splits a buildtime option (off by default) by request.
-
-* Mon Feb 18 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020118.1
-- Remove kapabilities, qmkbootdisk and kontrol-panel, they're separate packages
-  these days
-
-* Thu Jan 17 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020117.1
-- Update
-- Build with current kdelibs
-- Run kpackage through consolehelper
-
-* Sat Dec 15 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20011215.1
-- Update
-- Split package
-
-* Thu Aug  9 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-2
-- Get rid of the "Sources were not configured" warning at the first
-  start of kuser
-- The first normal user ID is 500, not 1001
-- Run kwuftpd and kuser through consolehelper
-- kontrol-panel 4.1.0; takes its desktop files from /etc/X11/sysconfig and
-  /etc/X11/serverconfig and removes desktop files that aren't needed
-  anymore
-- Don't require mkbootdisk on ia64
-
-* Mon Aug  6 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-1
-- 2.2 final
-
-* Tue Jul 24 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010724.1
-- Add build dependency on fam-devel (#49081)
-- Get rid of ia64 workaround
-
-* Sun Jul 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010722.1
-- Update
-- Work around ia64 breakages
-
-* Wed Jun 27 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010627.1
-- Update
-- Add build dependencies (#45153)
-- Don't own /usr/lib/kde2, kdelibs already does
-
-* Tue May 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.alpha2.1
-- 2.2alpha2
-
-* Fri Apr 20 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.alpha1.1
-- 2.2alpha1
-
-* Fri Mar 23 2001 Preston Brown <pbrown at redhat.com> 2.1.1-3
-- secpolicy removed for now...broken and useless.
-
-* Wed Mar 21 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.1.1-2
-- Fix an endless loop when switching kernels in lilo-config
-
-* Tue Mar 20 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.1.1-1
-- 2.1.1
-- clean up specfile
-
-* Mon Mar 19 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.1-8
-- Don't crash when deleting a cronjob (#31999)
-
-* Mon Mar 19 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.1-7
-- Fix ksysv defaults (#32000)
-
-* Fri Mar 16 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Fix kuser defaults (#31847)
-
-* Wed Feb 28 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Fix typo in kontrol-panel.desktop (#30001)
-- Don't own standard directories
-- Add Polnish translation to .desktop files from CVS
-
-* Sun Feb 25 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Add icons for lilo and wu-ftpd configuration in kontrol-panel
-  (Bug #29347)
-
-* Wed Feb 21 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update to 2.1-respin
-
-* Mon Feb 19 2001 Than Ngo <than at redhat.com>
-- fixed dangling symlinks
-- fixed kontrol-panel references lprngtool (bug #25477)
-- update to 2.1
-
-* Mon Feb  5 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Rebuild with lilo installed in the buildroot, we want
-  lilo-config
-
-* Mon Jan 22 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update
-
-* Mon Jan  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update
-- Don't exclude ia64
-
-* Sat Oct 28 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update to KDE_2_0_BRANCH, now that the ".0 release" bugs are fixed
-
-* Mon Oct 16 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 2.0 final
-
-* Tue Oct  3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 2.0
-
-* Mon Oct  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new CVS
-
-* Thu Aug 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- rebuild with new Qt
-
-* Wed Aug 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 1.93
-- fix up rpmv4 support
-
-* Wed Jul 26 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Handle rpmv4 packages in kpackage (patch from Jeff Johnson <jbj at redhat.com>
-  and myself)
-
-* Fri Jul 21 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- some fixes to spec file
+%postun
+/sbin/ldconfig ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-* Tue Jul 18 2000 Than Ngo <than at redhat.de>
-- rebuilt against glibc-2.1.92-14, gcc-2.96-40
 
-* Sun Jul 16 2000 Than Ngo <than at redhat.de>
-- use gcc 2.96
-- new snapshot
-- FHS fixes
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING COPYING.LIB COPYING-DOCS README
+%{_kde4_bindir}/kcron
+%{_kde4_bindir}/kuser
+%{_kde4_bindir}/secpolicy
+%{_kde4_appsdir}/kcron
+%{_kde4_appsdir}/knetworkconf/
+%{_kde4_appsdir}/kuser/
+%{_kde4_datadir}/applications/kde4/kcron.desktop
+%{_kde4_datadir}/applications/kde4/kuser.desktop
+%{_kde4_datadir}/config.kcfg/kuser.kcfg
+%{_kde4_datadir}/kde4/services/*
+%{_kde4_docdir}/HTML/en/kcron/
+%{_kde4_docdir}/HTML/en/knetworkconf/
+%{_kde4_docdir}/HTML/en/kuser/
+%{_kde4_iconsdir}/hicolor/*/*/*
+%exclude %{_kde4_iconsdir}/hicolor/*/*/kpackage.png
+%{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
+%{_kde4_sbindir}/kuser
+%config(noreplace) %{_kde4_sysconfdir}/security/console.apps/kuser
+%config(noreplace) %{_kde4_sysconfdir}/pam.d/kuser
 
-* Sun Jul  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- use kernelcc
-- new snapshot
+%files kpackage
+%defattr(-,root,root,-)
+%{_kde4_bindir}/kpackage
+%{_kde4_appsdir}/kpackage/
+%{_kde4_datadir}/applications/kde4/kpackage.desktop
+%{_kde4_datadir}/config.kcfg/kpackageSettings.kcfg
+%{_kde4_docdir}/HTML/en/kpackage/
+%{_kde4_iconsdir}/hicolor/*/*/kpackage.png
+%{_kde4_sbindir}/kpackage
+%config(noreplace) %{_kde4_sysconfdir}/security/console.apps/kpackage
+%config(noreplace) %{_kde4_sysconfdir}/pam.d/kpackage
 
-* Tue Jun 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- clean up specfile
-- new snapshot
-- ExcludeArch ia64 for now - kdelibs doesn't compile there
-- kill ksysctrl for now - compiler breakages.
+%changelog
+* Thu Dec 06 2007 Than Ngo <than at redhat.com> 3.97.0-1
+- 3.97.0
 
-* Sat Mar 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- move it to /usr, where it belongs
+* Fri Nov 30 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.2-1
+- kde-3.96.2
 
-* Fri Jan  7 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- work around install-strip breakage
+* Fri Nov 23 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.1-1
+- kde-3.96.1
+- also use epoch in changelog (also backwards)
+
+* Thu Nov 22 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-7
+- use consolehelper for kuser and kpackage
+
+* Wed Nov 21 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-6
+- put kpackage in a subpkg (for the smart requirement)
+
+* Mon Nov 19 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-5
+- BR: kde-filesystem >= 4
+
+* Mon Nov 19 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-4
+- BR: libXcomposite-devel
+- BR: libXdamage-devel
+- BR: libxkbfile-devel
+- BR: libXpm-devel
+- BR: libXv-devel
+- BR: libXxf86misc-devel
+- BR: libXtst-devel
+- BR: libXScrnSaver-devel
+
+* Fri Nov 16 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-3
+- +BR: kde4-macros(api)
+
+* Thu Nov 15 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-2
+- included AUTHORS 
+- added %%post and %%postun
+- BR: kde-filesystem
 
-* Fri Oct 22 1999 Bernhard Rosenkraenzer <bero at redhat.de>
-- 2.0 snapshot
+* Thu Nov 15 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-1
+- Initial version for Fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	13 Oct 2007 17:51:55 -0000	1.39
+++ sources	6 Dec 2007 17:05:45 -0000	1.40
@@ -1 +1 @@
-324a44d854a92177e71954f9264c98a8  kdeadmin-3.5.8.tar.bz2
+eec1ebff24d0323997b076a15f26b556  kdeadmin-3.97.0.tar.bz2


--- kdeadmin-3.5.7-knetworkconf.patch DELETED ---

More information about the fedora-extras-commits mailing list