SPECS: smart.spec - kde bcond cleanup

[qboosh]

Author: qboosh                       Date: Sun Oct  8 14:54:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kde bcond cleanup

---- Files affected:
SPECS:
   smart.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/smart.spec
diff -u SPECS/smart.spec:1.16 SPECS/smart.spec:1.17
--- SPECS/smart.spec:1.16	Wed Sep 20 16:34:03 2006
+++ SPECS/smart.spec	Sun Oct  8 16:54:22 2006
@@ -2,7 +2,10 @@
 # TODO
 # - bundled and modified software:
 #  - pexpect-0.999 http://pexpect.sourceforge.net/
-%bcond_without	kde # not needed for GNOME
+#
+# Conditional build:
+%bcond_without	kde	# without KDE support (not needed for GNOME)
+#
 %define	module smart
 Summary:	Next generation package handling tool
 Summary(pl):	Narzędzie do obsługi pakietów nowej generacji
@@ -65,7 +68,6 @@
 %description gui -l pl
 Graficzny interfejs użytkownika do zarządcy pakietów Smart.
 
-%if %{with kde}
 %package -n ksmarttray
 Summary:	KDE tray program for watching updates with Smart Package Manager
 Summary(pl):	Program zasobnika KDE do oglądania uaktualnień przy użyciu zarządcy pakietów Smart
@@ -82,7 +84,6 @@
 %description -n ksmarttray -l pt
 Programa tray do KDE para verificar atualizaçőes com o Smart Package
 Manager.
-%endif
 
 %prep
 %setup -q
@@ -126,18 +127,15 @@
 
 cp -f contrib/smart-update/smart-update $RPM_BUILD_ROOT%{_bindir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-%if %{with kde}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-kde.desktop
-%endif
 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}
-%{__make} install \
-	-C contrib/ksmarttray \
+%{__make} -C contrib/ksmarttray install \
 	DESTDIR=$RPM_BUILD_ROOT
+install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-kde.desktop
 %endif
 
 %find_lang %{name}
@@ -231,6 +229,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/10/08 14:54:22  qboosh
+- kde bcond cleanup
+
 Revision 1.16  2006/09/20 14:34:03  piti
 - removed duplicated description -l pt
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/smart.spec?r1=1.16&r2=1.17&f=u