rpms/kdeadmin/devel kdeadmin.spec,1.153,1.154

[Than Ngo]

Author: than

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

Modified Files:
	kdeadmin.spec 
Log Message:
- fix rhel conditionals




Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- kdeadmin.spec	1 Dec 2009 14:38:45 -0000	1.153
+++ kdeadmin.spec	3 Dec 2009 23:13:55 -0000	1.154
@@ -7,7 +7,7 @@ Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
 Version:        4.3.80
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -69,6 +69,15 @@ a CUPS print server.
 
 %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
+
+%if ! 0%{?include_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} ..
@@ -159,6 +168,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
+- fix rhel conditionals
+
 * Tue Dec  1 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)