From 270a046a51f71ddba126e1fd3d16e65e8dbd9a9551823f82796fb69f40186f5c Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 22 Aug 2011 14:15:09 +0000 Subject: [PATCH] Accepting request 79411 from KDE:Distro:Factory forward to factory OBS-URL: https://build.opensuse.org/request/show/79411 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=38 --- scribus.changes | 11 ++++++++--- scribus.spec | 13 ++++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/scribus.changes b/scribus.changes index d8eb8ab..98950db 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,9 +1,14 @@ +------------------------------------------------------------------- +Mon Aug 15 13:49:58 UTC 2011 - idonmez@novell.com + +- Fix build and use %{_smp_mflags} + ------------------------------------------------------------------- Wed Aug 10 09:33:53 UTC 2011 - toddrme2178@gmail.com --Fixed language file identification --Removed redundant buildrequires --Cleaned up spec file formatting + - Fixed language file identification + - Removed redundant buildrequires + - Cleaned up spec file formatting ------------------------------------------------------------------- Sat Jun 18 19:13:42 UTC 2011 - mrdocs@opensuse.org diff --git a/scribus.spec b/scribus.spec index cea982e..c41b1d8 100644 --- a/scribus.spec +++ b/scribus.spec @@ -99,14 +99,22 @@ cmake \ -DCMAKE_SKIP_RPATH=TRUE \ ../ -make +make %{_smp_mflags} %install cd build %make_install +mkdir -p %{buildroot}%{_datadir}/pixmaps +mkdir -p %{buildroot}%{_datadir}/applications mkdir -p %{buildroot}%{_datadir}/doc/packages/scribus + +ln -s %{buildroot}%{_datadir}/scribus/icons/scribus.png %{buildroot}%{_datadir}/pixmaps/scribus.png + +ln -s %{buildroot}%{_datadir}/mimelnk/application/vnd.scribus.desktop %{buildroot}%{_datadir}/applications/vnd.scribus.desktop + + %if 0%{?suse_version} %suse_update_desktop_file -i %{buildroot}%{_datadir}/mimelnk/application/vnd.scribus.desktop Office WordProcessor %endif @@ -140,6 +148,9 @@ rm -rf %{buildroot} %dir %{_datadir}/mimelnk %dir %{_datadir}/mimelnk/application %{_datadir}/mimelnk/application/vnd.scribus.desktop +%{_datadir}/applications/vnd.scribus.desktop +%{_datadir}/pixmaps/scribus.png + %files devel %defattr(-, root, root)