From 8f4352190eabbe08812562d29f99fff616249176 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Feb 01 2010 21:38:03 +0000
Subject: Remove all the kpackage conditionals, it has been dropped upstream. (This

    also renders the CMakeLists.txt sed hacks redundant.)

---

diff --git a/kdeadmin.spec b/kdeadmin.spec
index 9382871..e3d2f6e 100644
--- a/kdeadmin.spec
+++ b/kdeadmin.spec
@@ -2,8 +2,6 @@
 %if 0%{?fedora}
 %define system_config_printer_kde 1
 %endif
-## define to include kpackage
-#define kpackage 1
 
 Name:           kdeadmin
 Summary:        KDE Administrative tools
@@ -29,9 +27,7 @@ BuildRequires:  python-devel
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 
-%if ! 0%{?kpackage}
 Obsoletes: kdeadmin-kpackage < %{epoch}:%{version}-%{release}
-%endif
 
 
 %if ! 0%{?system_config_printer_kde}
@@ -45,16 +41,6 @@ The %{name} package includes administrative tools including:
 * ksystemlog: system log viewer
 * kuser: user manager
 
-%package kpackage
-Summary: An RPM package manager
-Group: Applications/System
-Requires: smart
-%description kpackage
-Kpackage is an RPM package manager, used for displaying currently installed
-packages, uninstalling them and installing new ones.
-
-It is based upon the "Smart Package Manager".
-
 %package -n system-config-printer-kde
 Summary: A printer administration tool for KDE
 Group: System Environment/Base
@@ -78,11 +64,6 @@ a CUPS print server.
 sed -i -e 's:macro_optional_add_subdirectory(system-config-printer-kde):#macro_optional_add_subdirectory(system-config-printer-kde):g' CMakeLists.txt
 %endif
 
-%if ! 0%{?kpackage}
-sed -i -e 's:macro_optional_add_subdirectory(kpackage):#macro_optional_add_subdirectory(kpackage):g' CMakeLists.txt
-sed -i -e 's:add_subdirectory(kpackage):#add_subdirectory(kpackage):g' doc/CMakeLists.txt
-%endif
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -116,20 +97,6 @@ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
-%if 0%{?kpackage}
-%post kpackage
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
-%posttrans kpackage
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
-%postun kpackage
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-fi
-%endif
-
 
 %files
 %defattr(-,root,root,-)
@@ -154,17 +121,6 @@ fi
 %{_kde4_libdir}/kde4/kcm_cron.so
 %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
 
-%if 0%{?kpackage}
-%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*
-%endif
-
 %if 0%{?system_config_printer_kde}
 %files -n system-config-printer-kde
 %defattr(-,root,root,-)