From f542b2714d2153bdcd6c237ac67e5dfc325fd08d Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: May 17 2006 19:24:47 +0000
Subject: add support Fedora Core release 5


---

diff --git a/kdeadmin.spec b/kdeadmin.spec
index 573b42e..2102cf4 100644
--- a/kdeadmin.spec
+++ b/kdeadmin.spec
@@ -26,7 +26,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.2
-Release: 1
+Release: 2
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -43,6 +43,9 @@ Source5: kpackagerc
 
 Patch1: kde-libtool.patch
 
+# upstream patches
+Patch100: kdeadmin-3.5.2-knetworkconf-fedora.patch
+
 Requires(post,postun): /sbin/ldconfig
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -155,6 +158,9 @@ kxconfig is a tool that allows you to configure the X server.
 %setup -q
 %patch1 -p1 -b .libtool
 
+# upstream patches
+%patch100 -p1 -b .knetworkconf-fedora
+
 %if ! %{kpackage}
   echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
 %endif
@@ -222,12 +228,12 @@ export CXXFLAGS="$FLAGS"
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # don't use, just delete. Our own versions come later.
-rm -rf $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security
+rm -rf %{buildroot}/etc/pam.d %{buildroot}/etc/security
 
 # fix absolute symbolic links
 (
@@ -238,8 +244,8 @@ rm -rf $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security
   %if %{kuser}
   rpmlist="$rpmlist kuser"
   %endif
-  mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
-  cd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+  mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+  cd %{buildroot}%{_docdir}/HTML/en
   for i in $rpmlist ; do
     cd $i && ln -nfs ../common .
     cd ..
@@ -248,8 +254,8 @@ rm -rf $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security
 
 # Put in some sane defaults
 %if %{kuser}
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
-  cat >$RPM_BUILD_ROOT%{_datadir}/config/kuserrc <<EOF
+  mkdir -p %{buildroot}%{_datadir}/config
+  cat >%{buildroot}%{_datadir}/config/kuserrc <<EOF
 [template]
 copySkel=true
 createHomeDir=true
@@ -260,7 +266,7 @@ EOF
 %endif
 
 %if %{ksysv}
-  cat >$RPM_BUILD_ROOT%{_datadir}/config/ksysvrc <<EOF
+  cat >%{buildroot}%{_datadir}/config/ksysvrc <<EOF
 [Other Settings]
 Configured=true
 [Path Settings]
@@ -271,63 +277,63 @@ Show Runlevels=0,1,2,3,4,5,6
 EOF
 %endif
 
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps \
-         $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/usr/sbin
+mkdir -p %{buildroot}/etc/security/console.apps \
+         %{buildroot}/etc/pam.d %{buildroot}/usr/sbin
 
 # Runkuser through consolehelper
 %if %{kuser}
-  mv $RPM_BUILD_ROOT/usr/bin/kuser $RPM_BUILD_ROOT/usr/sbin
-  install -c -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/security/console.apps/kuser
-  install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/kuser
-  ln -s consolehelper $RPM_BUILD_ROOT/usr/bin/kuser
+  mv %{buildroot}%{_bindir}/kuser %{buildroot}/usr/sbin
+  install -c -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
+  install -c -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
+  ln -s consolehelper %{buildroot}%{_bindir}/kuser
 %endif
 
 %if %{kpackage}
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
-  install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/security/console.apps/kpackage
-  install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/kpackage
-  install -c -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/config
-  mv $RPM_BUILD_ROOT/usr/bin/kpackager $RPM_BUILD_ROOT/usr/sbin
-  ln -s consolehelper $RPM_BUILD_ROOT/usr/bin/kpackager
+  mkdir -p %{buildroot}%{_datadir}/config
+  install -c -m 644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage
+  install -m 0644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage
+  install -c -m 644 %{SOURCE5} %{buildroot}%{_datadir}/config
+  mv %{buildroot}%{_bindir}/kpackager %{buildroot}/usr/sbin
+  ln -s consolehelper %{buildroot}%{_bindir}/kpackager
 %endif
 
 %if ! %{kcron}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kcron
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kcron
 %endif
 
 %if ! %{kdat}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdat
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kdat
 %endif
 
 %if ! %{kpackage}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kpackage
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kpackage
 %endif
 
 %if ! %{ksysv}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksysv
+  rm -rf %{buildroot}%{_docdir}/HTML/en/ksysv
 %endif
 
 %if ! %{kuser}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kuser
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kuser
 %endif
 
 %if ! %{lilo}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/lilo-config
+  rm -rf %{buildroot}%{_docdir}/HTML/en/lilo-config
 %endif
 
 desktop-file-install \
    --vendor "" \
-   --dir $RPM_BUILD_ROOT%{appdir} \
+   --dir %{buildroot}%{appdir} \
    --delete-original \
    --add-only-show-in KDE \
-   $RPM_BUILD_ROOT%{appdir}/kuser.desktop
+   %{buildroot}%{appdir}/kuser.desktop
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -405,6 +411,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed May 17 2006 Than Ngo <than@redhat.com> 7:3.5.2-2
+- add support Fedora Core release 5
+
 * Wed Apr 05 2006 Than Ngo <than@redhat.com> 7:3.5.2-1
 - update to 3.5.2