forked from pool/scribus
Accepting request 230691 from KDE:Extra
Added python_version.diff: fixes build with cmake 3.0 OBS-URL: https://build.opensuse.org/request/show/230691 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=50
This commit is contained in:
parent
556842a81d
commit
6ef9911536
12
python_version.diff
Normal file
12
python_version.diff
Normal file
@ -0,0 +1,12 @@
|
||||
--- 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)
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 17 19:17:27 UTC 2014 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Added python_version.diff: fixes build with cmake 3.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 22 03:30:39 UTC 2013 - mrdocs@opensuse.org
|
||||
|
||||
|
@ -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 @@ Source2: %{name}-icon32.png
|
||||
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: cups-devel
|
||||
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: pkgconfig
|
||||
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 @@ for developing scribus plugins.
|
||||
%prep
|
||||
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
# Delete non-free colour swatches (bnc#763586)
|
||||
|
Loading…
x
Reference in New Issue
Block a user