From 6017e7a2bd4b5b9bc5b35aadfd72604bd6891c48 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Apr 03 2010 14:31:35 +0000
Subject: - 4.4.2


---

diff --git a/.cvsignore b/.cvsignore
index 8dce8e6..2d1d971 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kdeadmin-4.4.1.tar.bz2
+kdeadmin-4.4.2.tar.bz2
diff --git a/kdeadmin-4.3.95-system_config_printer_fix.patch b/kdeadmin-4.3.95-system_config_printer_fix.patch
deleted file mode 100644
index 16670d7..0000000
--- a/kdeadmin-4.3.95-system_config_printer_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN a/system-config-printer-kde/options.py kdeadmin-4.3.95/system-config-printer-kde/options.py
---- a/system-config-printer-kde/options.py	2010-01-31 09:52:37.902922876 +0100
-+++ kdeadmin-4.3.95/system-config-printer-kde/options.py	2010-01-31 09:53:34.347043858 +0100
-@@ -133,9 +133,9 @@
-                 self.widget.clear()
-                 if type(supported) == list:
-                     for each in supported:
--                        self.widget.addItem(self.combobox_dict[each])
-+                        self.widget.addItem(each)
-                 else:
--                    self.widget.addItem(self.combobox_dict[supported])
-+                    self.widget.addItem(supported)
-             elif (type(self.widget) == QComboBox and
-                   self.ipp_type == int and
-                   self.combobox_map != None):
diff --git a/kdeadmin.spec b/kdeadmin.spec
index 129a225..4e2497e 100644
--- a/kdeadmin.spec
+++ b/kdeadmin.spec
@@ -6,7 +6,7 @@
 Name:           kdeadmin
 Summary:        KDE Administrative tools
 Epoch:          7
-Version:        4.4.1
+Version:        4.4.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -19,9 +19,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         kdeadmin-4.2.85-printing.patch
 
 ## upstream patches
-# https://bugs.kde.org/show_bug.cgi?id=219751#c9
-Patch100: kdeadmin-4.3.95-system_config_printer_fix.patch
-
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -59,15 +56,14 @@ a CUPS print server.
 %patch0 -p1 -b .printing
 
 # upstream patches
-%patch100 -p1 -b .system_config_printer_fix
-
-
-%build
 
 %if ! 0%{?system_config_printer_kde}
 sed -i -e 's:macro_optional_add_subdirectory(system-config-printer-kde):#macro_optional_add_subdirectory(system-config-printer-kde):g' CMakeLists.txt
 %endif
 
+
+%build
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -134,6 +130,9 @@ fi
 
 
 %changelog
+* Mon Mar 29 2010 Lukas Tinkl <ltinkl@redhat.com> - 4.4.2-1
+- 4.4.2
+
 * Sat Feb 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 7:4.4.1-1
 - 4.4.1
 
diff --git a/sources b/sources
index 5ef050f..0d91f5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a69c96bf7ad38ea78972e926a2281e7  kdeadmin-4.4.1.tar.bz2
+92d80ac84525c8160f42bf54ee6351df  kdeadmin-4.4.2.tar.bz2