[digikam] fix htmlexport build
nucleo
nucleo at fedoraproject.org
Wed Mar 13 13:00:30 UTC 2013
commit 3807c03763c53cb7e4045cdbcedd1be2890f0721
Author: nucleo <nucleo at fedoraproject.org>
Date: Wed Mar 13 15:00:20 2013 +0200
fix htmlexport build
digikam-3.1.0-htmlexport.patch | 15 +++++++++++++++
digikam.spec | 6 ++++--
2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/digikam-3.1.0-htmlexport.patch b/digikam-3.1.0-htmlexport.patch
new file mode 100644
index 0000000..c9e2ff3
--- /dev/null
+++ b/digikam-3.1.0-htmlexport.patch
@@ -0,0 +1,15 @@
+--- digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-11 10:24:11.000000000 +0200
++++ digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-13 00:15:05.539275132 +0200
+@@ -468,9 +468,9 @@
+ # Currently the cmake module distributed w/ cmake uses a different variable
+ # name LIBXLST_EXSLT_LIBRARIES for libxeslt than the cmake modeule
+ # distributed w/ kdelibs LIBEXSLT_LIBRARIES.
+- if (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES)
+- set(LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_LIBRARIES})
+- endif (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES)
++ if (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES)
++ set(LIBXSLT_EXSLT_LIBRARIES ${LIBEXSLT_LIBRARIES})
++ endif (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES)
+ IF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES)
+ ADD_SUBDIRECTORY(htmlexport)
+ ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES)
diff --git a/digikam.spec b/digikam.spec
index f675dd6..e7ef695 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -20,6 +20,7 @@ Source1: digikam-import.desktop
Patch0: digikam-2.5.0-clapack-atlas.patch
## upstreamable patches
+Patch50: digikam-3.1.0-htmlexport.patch
## upstream patches
@@ -48,8 +49,7 @@ BuildRequires: pkgconfig(libpng) >= 1.2.7
BuildRequires: pkgconfig(libkdcraw) >= 2.2.0
BuildRequires: pkgconfig(libkexiv2) >= 1.0.0
BuildRequires: pkgconfig(libkipi) >= 2.0.0
-BuildRequires: pkgconfig(sqlite3)
-BuildRequires: mysql-devel mysql-server
+BuildRequires: mysql-server
BuildRequires: pkgconfig(exiv2)
## DNG converter
BuildRequires: expat-devel
@@ -221,6 +221,7 @@ BuildArch: noarch
%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
%patch0 -p1 -b .clapack-atlas
+%patch50 -p1 -b .htmlexport
# don't use bundled/old FindKipi.cmake in favor of kdelibs' version
# see http:/bugs.kde.org/307213
@@ -523,6 +524,7 @@ update-desktop-database -q &> /dev/null
%changelog
* Tue Mar 12 2013 Alexey Kurov <nucleo at fedoraproject.org> - 3.1.0-1
- digikam-3.1.0
+- drop BR: pkgconfig(sqlite3) mysql-devel
* Wed Mar 06 2013 Rex Dieter <rdieter at fedoraproject.org> 3.0.0-2
- rebuild (marble)
More information about the scm-commits
mailing list