Author: arekm Date: Sun Sep 25 16:54:23 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; more BR; don't require mysqld installed at build time
---- Files affected: packages/digikam: digikam.spec (1.141 -> 1.142) ---- Diffs: ================================================================ Index: packages/digikam/digikam.spec diff -u packages/digikam/digikam.spec:1.141 packages/digikam/digikam.spec:1.142 --- packages/digikam/digikam.spec:1.141 Sun Sep 25 18:02:07 2011 +++ packages/digikam/digikam.spec Sun Sep 25 18:54:18 2011 @@ -7,7 +7,7 @@ Summary(pl.UTF-8): Interfejs KDE do gphoto2 Name: digikam Version: 2.1.1 -Release: 1 +Release: 2 License: GPL Group: X11/Applications/Graphics Source0: http://downloads.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 @@ -19,6 +19,7 @@ BuildRequires: QtSql-devel >= %{qtver} BuildRequires: QtSvg-devel >= %{qtver} BuildRequires: automoc4 +BuildRequires: clapack-devel BuildRequires: cmake >= 2.8.0 BuildRequires: gettext-devel BuildRequires: jasper-devel @@ -26,6 +27,7 @@ BuildRequires: kde4-kdepimlibs-devel >= %{kdever} BuildRequires: lcms-devel BuildRequires: lensfun-devel +BuildRequires: libf2c-devel BuildRequires: libgphoto2-devel BuildRequires: libkdcraw-devel >= %{kdever} BuildRequires: libkdeedu-devel >= %{kdever} @@ -33,13 +35,14 @@ BuildRequires: libkipi-devel >= %{kdever} BuildRequires: libksane-devel >= %{kdever} BuildRequires: liblqr-devel >= 0.4.0 +BuildRequires: libpgf-devel BuildRequires: libtiff-devel BuildRequires: marble-devel >= %{kdever} # fixed mysql_install_db in this version BuildRequires: mysql-extras >= 5.5.9-2 BuildRequires: opencv-devel BuildRequires: pkgconfig >= 1:0.9.0 -BuildRequires: qjson-devel +BuildRequires: qjson-devel >= 0.5 BuildRequires: qt4-build >= %{qtver} BuildRequires: qt4-qmake >= %{qtver} BuildRequires: rpmbuild(macros) >= 1.129 @@ -74,8 +77,6 @@ %setup -q %build -# explicitely remove hne language support (re-add when glibc supports it) -%{__sed} -i -e 's/add_subdirectory(hne)//g' po/CMakeLists.txt install -d build cd build %cmake \ @@ -86,6 +87,7 @@ -DLIB_SUFFIX=64 \ -DLIB_INSTALL_DIR_SUFFIX=64 \ %endif + -DSERVERCMD_MYSQL=%{_sbindir}/mysqld \ ../ %{__make} @@ -210,6 +212,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.142 2011/09/25 16:54:18 arekm +- rel 2; more BR; don't require mysqld installed at build time + Revision 1.141 2011/09/25 16:02:07 arekm - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/digikam/digikam.spec?r1=1.141&r2=1.142&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
