rpms/kdeadmin/devel kdeadmin.spec, 1.154, 1.155 kuser.pam, 1.1, NONE kuser.pamd, 1.7, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28688

Modified Files:
	kdeadmin.spec 
Removed Files:
	kuser.pam kuser.pamd 
Log Message:
* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
- Repositioning the KDE Brand (#547361)
- omit kpackage
- drop old/unused kuser consolehelper files



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- kdeadmin.spec	3 Dec 2009 23:13:55 -0000	1.154
+++ kdeadmin.spec	14 Dec 2009 14:24:14 -0000	1.155
@@ -1,13 +1,14 @@
 %if 0%{?fedora}
 %define system_config_printer_kde 1
-%define include_kpackage 1
 %endif
+## define to include kpackage
+#define kpackage 1
 
 Name:           kdeadmin
-Summary:        K Desktop Environment - Administrative tools
+Summary:        KDE Administrative tools
 Epoch:          7
 Version:        4.3.80
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -15,9 +16,6 @@ URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source1:        kuser.pam
-Source2:        kuser.pamd
-
 # FIXME/TODO: upstream this -- Rex
 Patch0:         kdeadmin-4.2.85-printing.patch
 
@@ -30,6 +28,11 @@ 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}
 Obsoletes: system-config-printer-kde < %{epoch}:%{version}-%{release}
 %endif
@@ -73,7 +76,7 @@ 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%{?include_kpackage}
+%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
@@ -111,7 +114,7 @@ touch --no-create %{_kde4_iconsdir}/hico
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
-%if 0%{?include_kpackage}
+%if 0%{?kpackage}
 %post kpackage
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
@@ -148,7 +151,7 @@ fi
 %{_kde4_libdir}/kde4/kcm_cron.so
 %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
 
-%if 0%{?include_kpackage}
+%if 0%{?kpackage}
 %files kpackage
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kpackage
@@ -168,6 +171,11 @@ fi
 
 
 %changelog
+* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
+- Repositioning the KDE Brand (#547361)
+- omit kpackage
+- drop old/unused kuser consolehelper files
+
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
 - fix rhel conditionals
 


--- kuser.pam DELETED ---


--- kuser.pamd DELETED ---