diff --git a/scribus-1.4.0.rc6.tar.bz2 b/scribus-1.4.0.rc6.tar.bz2 deleted file mode 100644 index 516552b..0000000 --- a/scribus-1.4.0.rc6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91b218469f96818d00e0ff606b3524757bda03289e72edfca34462f865ff36e7 -size 39287217 diff --git a/scribus-1.4.1.tar.bz2 b/scribus-1.4.1.tar.bz2 new file mode 100644 index 0000000..6815409 --- /dev/null +++ b/scribus-1.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3603ca1de6c70f4a6a2b09571593581d4e5aaed863b6c5986e37a3a2469801b +size 68006491 diff --git a/scribus.changes b/scribus.changes index 7206eb8..466216f 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Wed May 23 08:42:03 UTC 2012 - badshah@localhost + +- Delete non-free colour swatches (givelife and dtp-studio) from + the package (bnc#763586) + +------------------------------------------------------------------- +Wed May 23 01:57:45 UTC 2012 - mrdocs@opensuse.org + +- drop fdupes in %datashare it breaks the help browser +- shorten the -devel description + +------------------------------------------------------------------- +Mon May 21 19:42:32 UTC 2012 - badshah400@gmail.com + +- Add back aspell and liblcms2-devel BuildRequires: these got + removed during the previous change by mistake. + +------------------------------------------------------------------- +Sat May 5 22:36:28 UTC 2012 - badshah400@gmail.com + +- Update to version 1.4.1: + + Many bugs fixed since 1.4.0 (see ChangeLog file installed in + /usr/share/doc/scribus/) + + Addition of the GiveLife Color System(R) swatch palettes + (www.givelifecolorsystem.com), license in the swatches + directory. + + Updates to resolve small canvas interaction issues + + Corrections to both bitmap and SVG image import issues + + Addition of undo steps for path operations and page moving + + Corrections to some master page behaviour + + Fixes for text editing issues + + Enhancements to scripter + + Translation updates + + The Italian version of the help documents has been updated + significantly + + Relocation of profiles and swatches to the share directory of + Unix-like systems (linux, OS X, etc) to fit in with the file + system recommendations +- Added build requirement on fdupes to link duplicate files +- Install desktop menu for application +- Changes from version 1.4.0: + + Many bugs fixed since 1.4.0rc6 (see ChangeLog file installed + in /usr/share/doc/scribus/). + +------------------------------------------------------------------- +Fri Jan 20 14:27:08 UTC 2012 - toddrme2178@gmail.com + +- Fixed aspell detection +- Added lcms2 buildrequires + +------------------------------------------------------------------- +Mon Jan 2 19:33:19 UTC 2012 - adrian@suse.de + +- update to final 1.4.0 release +- use xz compressed tar ball + +------------------------------------------------------------------- +Tue Dec 6 21:18:23 UTC 2011 - coolo@suse.com + +- scribus is GPL-2.0+ + ------------------------------------------------------------------- Wed Oct 26 08:11:42 UTC 2011 - coolo@suse.com diff --git a/scribus.spec b/scribus.spec index c86ba48..f5b2b58 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,7 +1,7 @@ # # spec file for package scribus # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) Peter Linnell and 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties @@ -17,24 +17,25 @@ # - Name: scribus -Version: 1.4.0.rc6 +Version: 1.4.1 Release: 0 -License: GPL Summary: Open Source Page Layout and Desktop Publishing (DTP) -Url: http://www.scribus.net/ +License: GPL-2.0+ Group: Productivity/Publishing/Other -Source: %{name}-%{version}.tar.bz2 +Url: http://www.scribus.net/ +Source: http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build - +BuildRequires: aspell BuildRequires: aspell-devel BuildRequires: boost-devel BuildRequires: cairo-devel BuildRequires: cmake >= 2.6.0 BuildRequires: cups-devel +BuildRequires: fdupes BuildRequires: fontconfig-devel BuildRequires: libQtWebKit-devel +BuildRequires: liblcms2-devel BuildRequires: libpodofo-devel BuildRequires: libqt4-devel >= 4.6.0 BuildRequires: libtiff-devel @@ -67,7 +68,6 @@ Encapsulated Postscript import and export and creation of color separations. %package devel -License: GPL Summary: Open Source Page Layout / Desktop Publishing (DTP) Group: Development/Libraries/Other Requires: %{name} = %{version} @@ -77,20 +77,28 @@ Requires: libstdc++-devel Requires: zlib-devel %description devel -This package provides the development headers for %{name}. It is most useful -for developing plugins for %{name}. + + +This package provides the development headers for scribus. It is most useful +for developing scribus plugins. %prep -%setup -q +%setup -q -n Scribus %build +# Delete non-free colour swatches (bnc#763586) +rm resources/swatches/givelife_colors_license.rtf +rm resources/swatches/GiveLife_Color_System*.xml +# All .eps swatches come with the same non-free license by dtp studio Oldenburg. +rm resources/swatches/*.eps +rm resources/swatches/dtp-studio-free-palettes-license.rtf export CXXFLAGS="%{optflags} -fno-strict-aliasing" export CFLAGS="$CXXFLAGS -fno-strict-aliasing" mkdir build -cd build +pushd build cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ %if "%{_lib}" == "lib64" @@ -105,11 +113,20 @@ make %{_smp_mflags} %install -cd build - make install \ - DESTDIR=%{buildroot} +pushd build +make install DESTDIR=%{buildroot} -%if 0%{?suse_version} +popd + +%if 0%{?suse_version} +%suse_update_desktop_file -r -i %{name} Qt Office Publishing WordProcessor +mkdir %{buildroot}%{_datadir}/pixmaps +install -m 644 %{buildroot}%{_datadir}/%{name}/icons/%{name}.png %{buildroot}%{_datadir}/pixmaps/ +%endif + +%fdupes %{buildroot}%{_includedir}/%{name}/ + +%if 0%{?suse_version} %suse_update_desktop_file -i %{buildroot}%{_datadir}/mimelnk/application/vnd.scribus.desktop Office WordProcessor %endif @@ -119,14 +136,16 @@ cd build if [ -f /usr/bin/update-mime-database ]; then /usr/bin/update-mime-database /usr/share/mime > /dev/null fi +%desktop_database_post %postun if [ -f /usr/bin/update-mime-database ]; then /usr/bin/update-mime-database /usr/share/mime > /dev/null fi +%desktop_database_postun %files -%defattr(-, root, root) +%defattr(-,root,root) %{_bindir}/scribus %{_mandir}/man?/*.* %{_mandir}/*/man?/*.* @@ -134,6 +153,8 @@ fi %{_datadir}/mime/packages/scribus.xml %{_datadir}/scribus %{_datadir}/doc/scribus +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.png # This should be owned by filesystem or man, but there are only scribus files: %lang(pl) %dir %{_mandir}/pl %lang(pl) %{_mandir}/pl/man1 @@ -142,7 +163,7 @@ fi %{_datadir}/mimelnk/application/vnd.scribus.desktop %files devel -%defattr(-, root, root) +%defattr(-,root,root) %{_includedir}/scribus %changelog