Author: shadzik Date: Thu Jan 18 02:40:29 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - NOTE: all these changes below are just for the --with snap option - kbfx silk uses cmake not autotools anymore - BR cmake - fix %build and %install - fix %files
---- Files affected: SPECS: kbfx.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/kbfx.spec diff -u SPECS/kbfx.spec:1.21 SPECS/kbfx.spec:1.22 --- SPECS/kbfx.spec:1.21 Thu Jan 18 03:05:07 2007 +++ SPECS/kbfx.spec Thu Jan 18 03:40:22 2007 @@ -32,6 +32,7 @@ URL: http://www.kbfx.org/ BuildRequires: autoconf BuildRequires: automake +%{?with_snap:BuildRequires: cmake} BuildRequires: kdelibs-devel >= 9:3.2.0 BuildRequires: rpmbuild(macros) >= 1.129 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -56,10 +57,15 @@ %prep %setup -q -T -b %{?with_snap:1}0 -n %{name}-%{?with_snap:%{_snap}}%{!?with_snap:%{version}%{_rel}} +%if !%{with snap} %patch0 -p0 %patch1 -p1 +%endif %build +%if %{with snap} +%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} . +%else %{__make} -f Makefile.cvs %configure \ %if "%{_lib}" == "lib64" @@ -67,8 +73,10 @@ %endif --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \ --with-qt-libraries=%{_libdir} +%endif %{__make} + %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}/kde} @@ -78,10 +86,11 @@ kde_htmldir=%{_kdedocdir} \ kde_libs_htmldir=%{_kdedocdir} \ kdelnkdir=%{_desktopdir} \ - +%if !%{with snap} 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 +%endif +#%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT @@ -93,18 +102,34 @@ %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/kbfxconfigapp +%if %{with snap} +%{_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la +%attr(755,root,root) %{_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so +%{_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la +%attr(755,root,root) %{_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so +%{_libdir}/kbfx/plugins/libkbfxplasmadatastub.la +%attr(755,root,root) %{_libdir}/kbfx/plugins/libkbfxplasmadatastub.so +%{_libdir}/libkbfxplasma.la +%attr(755,root,root) %{_libdir}/libkbfxplasma.so +%{_libdir}/libkbfxspinxtest.la +%attr(755,root,root) %{_libdir}/libkbfxspinxtest.so +%{_datadir}/applnk/Utilities/kbfxconfigapp.desktop +%{_datadir}/apps/kicker/applets/kbfxspinxtest.desktop +%{_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop +%else %attr(755,root,root) %{_libdir}/libkbfxspinx.so %{_libdir}/libkbfxspinx.la +%{_datadir}/apps/kicker/applets/kbfxspinx.desktop +%{_desktopdir}/kde/kbfxconfigapp.desktop +%{_desktopdir}/kde/kbfxspinx.desktop +%{_datadir}/config.kcfg/kbfx.kcfg +%endif %{_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 -%{_desktopdir}/kde/kbfxconfigapp.desktop -%{_desktopdir}/kde/kbfxspinx.desktop %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -112,6 +137,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.22 2007/01/18 02:40:22 shadzik +- NOTE: all these changes below are just for the --with snap option +- kbfx silk uses cmake not autotools anymore +- BR cmake +- fix %build and %install +- fix %files + Revision 1.21 2007/01/18 02:05:07 shadzik - snap updated - some changes in versioning (due to kbfx changes) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kbfx.spec?r1=1.21&r2=1.22&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
