commit scribus for openSUSE:Factory
Hello community, here is the log from the commit of package scribus for openSUSE:Factory checked in at 2014-04-18 11:08:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scribus (Old) and /work/SRC/openSUSE:Factory/.scribus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scribus" Changes: -------- --- /work/SRC/openSUSE:Factory/scribus/scribus.changes 2013-08-23 12:01:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scribus.new/scribus.changes 2014-04-18 11:31:35.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 17 19:17:27 UTC 2014 - hrvoje.senjan@gmail.com + +- Added python_version.diff: fixes build with cmake 3.0 + +------------------------------------------------------------------- New: ---- python_version.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scribus.spec ++++++ --- /var/tmp/diff_new_pack.Ytn267/_old 2014-04-18 12:15:45.000000000 +0200 +++ /var/tmp/diff_new_pack.Ytn267/_new 2014-04-18 12:15:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scribus # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -30,6 +30,8 @@ Source3: %{name}-icon64.png Source4: %{name}-icon128.png Source5: %{name}-icon256.png +# PATCH-FIX-UPSTREAM python_version.diff -- fix build with cmake 3.0 +Patch0: python_version.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: aspell BuildRequires: aspell-devel @@ -40,6 +42,7 @@ BuildRequires: fdupes BuildRequires: fontconfig-devel BuildRequires: hicolor-icon-theme +BuildRequires: hunspell-devel BuildRequires: libQtWebKit-devel BuildRequires: liblcms2-devel BuildRequires: libpodofo-devel @@ -51,7 +54,6 @@ BuildRequires: python-devel BuildRequires: shared-mime-info BuildRequires: update-desktop-files -BuildRequires: hunspell-devel ##BuildRequires: libMagick++-devel %if 0%{?suse_version} @@ -94,6 +96,7 @@ %prep %setup -q +%patch0 -p1 %build # Delete non-free colour swatches (bnc#763586) ++++++ python_version.diff ++++++ --- scribus-1.4.3.orig/CMakeLists.txt 2013-07-19 00:00:28.000000000 +0200 +++ scribus-1.4.3/CMakeLists.txt 2014-04-17 21:15:40.324549693 +0200 @@ -534,8 +534,7 @@ ENDIF(TIFF_FOUND) #<< JPEG, TIFF #<< PYTHON -SET(PythonLibs_FIND_VERSION 2) -FIND_PACKAGE(PythonLibs REQUIRED) +FIND_PACKAGE(PythonLibs 2 REQUIRED) IF (PYTHON_LIBRARY) MESSAGE("Python Library Found OK") SET(HAVE_PYTHON 1) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de