[aqsis] Fix build by removing fixup
Nicolas Chauvet
kwizart at fedoraproject.org
Sat Mar 10 16:48:23 UTC 2012
commit c7e4ae33c30a0b79aa19fec8cf897cff7982dd42
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Sat Mar 10 17:47:51 2012 +0100
Fix build by removing fixup
aqsis-1.8.0-nofixup.patch | 12 ++++++++++++
aqsis.spec | 6 ++++--
2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/aqsis-1.8.0-nofixup.patch b/aqsis-1.8.0-nofixup.patch
new file mode 100644
index 0000000..0e3e8f1
--- /dev/null
+++ b/aqsis-1.8.0-nofixup.patch
@@ -0,0 +1,12 @@
+diff -up Aqsis-1.8.0-Source/distribution/CMakeLists.txt.origin Aqsis-1.8.0-Source/distribution/CMakeLists.txt
+--- Aqsis-1.8.0-Source/distribution/CMakeLists.txt.origin 2012-03-02 09:03:45.000000000 +0100
++++ Aqsis-1.8.0-Source/distribution/CMakeLists.txt 2012-03-10 17:44:41.294883074 +0100
+@@ -111,7 +111,7 @@ include(CPack)
+ # By moving it here, we guarantee it happens after the files are installed, as this
+ # is add_subdirectory'd last, and I arbitrarily choose piqsl, as if QT is enabled,
+ # all QT apps are build anyway at the moment.
+-if(AQSIS_USE_QT)
++if(AQSIS_USE_QT_BUT_DO_FIXUP_ANYWAY)
+ set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}")
+ set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}")
+ INSTALL(CODE "
diff --git a/aqsis.spec b/aqsis.spec
index edbb89b..85f2567 100644
--- a/aqsis.spec
+++ b/aqsis.spec
@@ -7,6 +7,7 @@ Group: Applications/Multimedia
License: GPLv2+ and LGPLv2+
URL: http://www.aqsis.org
Source0: http://downloads.sourceforge.net/aqsis/Aqsis-%{version}-Source.tar.gz
+Patch0: aqsis-1.8.0-nofixup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -21,10 +22,10 @@ BuildRequires: libjpeg-devel >= 6
BuildRequires: libtiff-devel >= 3.7.1
BuildRequires: libpng-devel
BuildRequires: libxslt
-BuildRequires: qt4-devel
+BuildRequires: qt4-devel >= 4.6.2
#BuildRequires: tinyxml-devel
BuildRequires: OpenEXR-devel
-BuildRequires: sphinx
+BuildRequires: python-sphinx
BuildRequires: zlib-devel >= 1.1.4
Requires: qt4%{?_isa} >= %{_qt4_version}
@@ -101,6 +102,7 @@ integration with third-party applications.
%prep
%setup -q -n Aqsis-%{version}-Source
+%patch0 -p1
%build
More information about the scm-commits
mailing list