packages: smart/smart.spec - rename kde bcond to ksmarttray

[glen]

Author: glen                         Date: Thu Mar 24 13:42:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rename kde bcond to ksmarttray

---- Files affected:
packages/smart:
   smart.spec (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: packages/smart/smart.spec
diff -u packages/smart/smart.spec:1.42 packages/smart/smart.spec:1.43
--- packages/smart/smart.spec:1.42	Thu Mar 24 14:39:41 2011
+++ packages/smart/smart.spec	Thu Mar 24 14:42:12 2011
@@ -4,7 +4,7 @@
 #  - pexpect-0.999 http://pexpect.sourceforge.net/
 #
 # Conditional build:
-%bcond_with	kde	# with KDE support (not needed for GNOME)
+%bcond_with	ksmarttray	# build ksmarttray (KDE3)
 
 %define	module smart
 Summary:	Next generation package handling tool
@@ -107,15 +107,17 @@
 rm smart/util/optparse.py
 
 %build
-export CFLAGS="%{rpmcflags}"
-python setup.py build
+# CC/CFLAGS is only for arch packages - remove on noarch packages
+CC="%{__cc}" \
+CFLAGS="%{rpmcflags}" \
+%{__python} setup.py build
 
 # smart-update
 %{__make} -C contrib/smart-update \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}"
 
-%if %{with kde}
+%if %{with ksmarttray}
 # ksmarttray
 cd contrib/ksmarttray
 %{__make} -f admin/Makefile.common
@@ -132,19 +134,22 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_libdir}/smart,/var/lib/smart/{channels,packages}}
-python setup.py install -O1 --root=$RPM_BUILD_ROOT
+%{__python} setup.py install \
+	--skip-build \
+	--optimize=2 \
+	--root=$RPM_BUILD_ROOT
 
 cp -f contrib/smart-update/smart-update $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-kde.desktop
 install -p smart/interfaces/images/smart.png $RPM_BUILD_ROOT%{_pixmapsdir}/smart.png
 # Currently needs to hardcode %{_libdir}, as this is hardcoded in the
 # code, too.
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/smart/distro.py
 
-%if %{with kde}
+%if %{with ksmarttray}
 %{__make} -C contrib/ksmarttray install \
 	DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-kde.desktop
 %endif
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{es_ES,es}
@@ -234,6 +239,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2011/03/24 13:42:12  glen
+- rename kde bcond to ksmarttray
+
 Revision 1.42  2011/03/24 13:39:41  glen
 - smart-kde.desktop is not intrusive, so don't bcond it (see also r1.31)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smart/smart.spec?r1=1.42&r2=1.43&f=u