diff --git a/scribus-1.3.3.11.tar.bz2 b/scribus-1.3.3.11.tar.bz2 deleted file mode 100644 index de6a276..0000000 --- a/scribus-1.3.3.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8685baf28a21d7c680b0f9ff62188818b837bb67c64dc15fce3acbdc9180a8ca -size 13302366 diff --git a/scribus-1.3.3.12svn.tar.bz2 b/scribus-1.3.3.12svn.tar.bz2 new file mode 100644 index 0000000..8220ba0 --- /dev/null +++ b/scribus-1.3.3.12svn.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25ba9ab1edcaa736cd8fd66fe78c9a53a7508b6b905ebcb4678bc6b3c586a0d9 +size 15173594 diff --git a/scribus.changes b/scribus.changes index e390234..01503d7 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 16 15:18:04 CEST 2008 - dmueller@suse.de + +- update to 1.3.3.12svn: + * http://bugs.scribus.net/changelog_page.php +- add help files back (bnc#379906) + ------------------------------------------------------------------- Mon Apr 14 20:02:25 CEST 2008 - dmueller@suse.de diff --git a/scribus.spec b/scribus.spec index a775635..82ae99b 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,5 +1,5 @@ # -# spec file for package scribus (Version 1.3.3.11) +# spec file for package scribus (Version 1.3.3.12) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,11 +14,8 @@ Name: scribus BuildRequires: cairo-devel cups cups-devel python-devel shared-mime-info BuildRequires: fontconfig-devel libtiff-devel libxml2-devel openssl-devel -BuildRequires: gcc-c++ pkgconfig -BuildRequires: cmake -%if %suse_version < 1000 -BuildRequires: libjpeg-devel -%endif +BuildRequires: gcc-c++ pkgconfig qt3-devel +BuildRequires: cmake kde4-filesystem update-desktop-files %if %suse_version < 1010 BuildRequires: -ghostscript-library libtiff-devel openssl-devel %endif @@ -26,14 +23,13 @@ License: GPL v2 or later Group: Productivity/Publishing/Other AutoReqProv: on Requires: tk python-imaging -%if %suse_version > 1000 Suggests: AdobeICCProfiles -%endif Provides: scribus-short-words Obsoletes: scribus-i18n-de scribus-i18n-en scribus-i18n-fr scribus-short-words -Version: 1.3.3.11 -Release: 40 -Source: %{name}-%{version}.tar.bz2 +%define tar_version 1.3.3.12svn +Version: 1.3.3.12 +Release: 1 +Source: %{name}-%{tar_version}.tar.bz2 Patch3: %{name}-1.3.3.10-doc-path.diff Patch4: cmake-2.6.diff Url: http://www.scribus.net/ @@ -74,7 +70,7 @@ Authors: Steve Callcott %prep -%setup -q +%setup -q -n %name-%tar_version %patch3 %patch4 @@ -85,8 +81,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$CXXFLAGS" cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \ -DCMAKE_SKIP_RPATH=TRUE -DDOCDIR=%{_docdir} -DLIB_INSTALL_DIR=%{_libdir} \ - -DLIB_SUFFIX=$(echo %_lib | cut -b4-) .. -make + -DLIB_SUFFIX=$(echo %_lib | cut -b4-) -DWANT_CAIRO=1 .. +%make_jobs %install cd build @@ -94,8 +90,9 @@ cd build cd .. mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 -D $RPM_BUILD_ROOT/usr/share/scribus/icons/scribusicon.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/scribusicon.png +rm -rf $RPM_BUILD_ROOT/usr/share/mimelnk install -m 644 -D scribus.desktop $RPM_BUILD_ROOT%{_datadir}/applications/scribus.desktop -%suse_update_desktop_file %name Office WordProcessor +%suse_update_desktop_file -r %name Office WordProcessor install -m 644 -D scribus.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/scribus.xml %post @@ -113,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%doc AUTHORS ChangeLog NEWS README TODO +%doc %_defaultdocdir/%name %{_bindir}/* /usr/share/applications/*.desktop /usr/share/man/man?/*.* @@ -126,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/man/pl/man1 %changelog +* Wed Apr 16 2008 dmueller@suse.de +- update to 1.3.3.12svn: + * http://bugs.scribus.net/changelog_page.php +- add help files back (bnc#379906) * Mon Apr 14 2008 dmueller@suse.de - fix build against cmake 2.6 - sync buildrequires with the community package