SPECS: kbfx.spec - bcond header, complete URL - moved kbfxconfigap...

[qboosh]

Author: qboosh                       Date: Thu Nov 30 19:54:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bcond header, complete URL
- moved kbfxconfigapp.desktop to proper place, missing dir

---- Files affected:
SPECS:
   kbfx.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/kbfx.spec
diff -u SPECS/kbfx.spec:1.17 SPECS/kbfx.spec:1.18
--- SPECS/kbfx.spec:1.17	Wed Nov 29 16:49:11 2006
+++ SPECS/kbfx.spec	Thu Nov 30 20:53:54 2006
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
 %bcond_with	snap	# build cvs snapshot
-
+#
 %define		_snap	20060611cvs
 %define		_rel	rc4
 
@@ -20,7 +22,7 @@
 Source0:	http://dl.sourceforge.net/kbfx/%{name}-%{version}%{_rel}.tar.bz2
 # Source0-md5:	52bdd89a284c5d8188898c1d97eb7b48
 %endif
-URL:		http://www.kbfx.org
+URL:		http://www.kbfx.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	kdelibs-devel >= 9:3.2.0
@@ -60,7 +62,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}/kde}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -68,8 +70,8 @@
 	kde_libs_htmldir=%{_kdedocdir} \
 	kdelnkdir=%{_desktopdir} \
 
-install kbfxspinx/kbfxspinx.desktop $RPM_BUILD_ROOT%{_desktopdir}
-
+install kbfxspinx/kbfxspinx.desktop $RPM_BUILD_ROOT%{_desktopdir}/kde
+mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/kbfxconfigapp.desktop $RPM_BUILD_ROOT%{_desktopdir}/kde
 #%find_lang %{name}spinx --with-kde
 
 %clean
@@ -84,16 +86,16 @@
 %attr(755,root,root) %{_bindir}/kbfxconfigapp
 %attr(755,root,root) %{_libdir}/libkbfxspinx.so
 %{_libdir}/libkbfxspinx.la
+%{_datadir}/apps/kbfx
+%{_datadir}/apps/kbfxconfigapp
 %{_datadir}/apps/kicker/applets/kbfxspinx.desktop
+%{_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
+%{_datadir}/applnk/.hidden/kbfx_theme.desktop
 %{_datadir}/config.kcfg/kbfx.kcfg
+%{_datadir}/mimelnk/application/x-kbfxtheme.desktop
 %{_iconsdir}/*/*/*/*.png
-%{_datadir}/apps/kbfx
+%{_desktopdir}/kbfxconfigapp.desktop
 %{_desktopdir}/kbfxspinx.desktop
-%{_datadir}/applnk/.hidden/kbfx_theme.desktop
-%{_datadir}/applnk/Utilities/kbfxconfigapp.desktop
-%{_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc
-%{_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
-%{_datadir}/mimelnk/application/x-kbfxtheme.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -101,6 +103,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/11/30 19:53:54  qboosh
+- bcond header, complete URL
+- moved kbfxconfigapp.desktop to proper place, missing dir
+
 Revision 1.17  2006/11/29 15:49:11  shadzik
 - URL
 
================================================================

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