update: cmake, digikam

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1777 ec354946-7b23-47d6-9f5a-488ba84defc7

c/cmake/cmake-vl.spec

@@ -5,7 +5,7 @@ Name: cmake
 Summary: Cross-platform make system
 Summary(ja): クロスプラットフォームな Make システム
 Version: 2.8.2
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 
 Group: Development/Tools
 License: BSD
@@ -15,11 +15,15 @@ Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
 Source1: macros.cmake
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
+BuildRequires: curl-devel
+BuildRequires: expat-devel
 BuildRequires: ncurses-devel
+BuildRequires: zlib-devel
 %if %{with gui}
 BuildRequires: qt4-devel, desktop-file-utils
 %define qt_gui --qt-gui
+%else
+%define qt_gui --no-qt-gui
 %endif
 
 Vendor: Project Vine
@@ -50,8 +54,13 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
 %build
-./bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
-    --mandir=/share/man --with-system-libs %{?qt_gui}
+./bootstrap \
+    --prefix=%{_prefix} \
+    --datadir=/share/%{name} \
+    --mandir=/share/man \
+    --system-libs \
+    %{?qt_gui}
+
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
@@ -112,6 +121,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Sun Sep  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.2-4
+- fixed typo (not --with-system-libs, but --system-libs)
+- added BR: curl-devel, expat-devel, zlib-devel
+
 * Mon Aug 23 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.2-3
 - add BuildRequires: ncurses-devel
 

d/digikam/digikam-vl.spec

@@ -1,6 +1,7 @@
 Name:	 digikam
 Summary: A digital camera accessing & photo management application
-Version: 1.3.0
+Summary(ja): デジタルカメラへのアクセス機能を持つ写真管理アプリケーション
+Version: 1.4.0
 Release: 1%{?dist}
 
 Group:	 Applications/Multimedia
@@ -18,35 +19,33 @@ BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: glib2-devel
-BuildRequires: libgphoto2-devel
+BuildRequires: jasper-devel
 BuildRequires: kdegraphics4-devel
-#BuildRequires: libkdcraw-devel >= 0.4.0-2
-#BuildRequires: libkexiv2-devel >= 0.5.0
-#BuildRequires: libkipi-devel >= 0.3.0
+BuildRequires: kdelibs4-devel
+BuildRequires: kdepimlibs-devel
+BuildRequires: lcms-devel
+#BuildRequires: lensfun-devel
+BuildRequires: libgphoto2-devel
 #BuildRequires: liblqr-1-devel
-BuildRequires: jasper-devel
+BuildRequires: libpng-devel >= 1.2.7
+BuildRequires: libtiff-devel
+BuildRequires: qt4-MySQL
+BuildRequires: soprano-devel
+BuildRequires: sqlite3-devel
 
 # marble integration, http://bugzilla.redhat.com/470578 
-%define marble_version 4.3.0
+%define marble_version 4.5.0
 BuildRequires: kdeedu4-devel >= %{marble_version} 
 
-BuildRequires: kdelibs4-devel
-
+Requires: %{name}-libs = %{version}-%{release}
 # trash protocol support needed
 # FIXME: should probably be handled lower in the stack
 Requires: kdebase-runtime >= 4.4.0
-
-BuildRequires: kdepimlibs-devel
-BuildRequires: lcms-devel
-#BuildRequires: lensfun-devel
-BuildRequires: libtiff-devel
-BuildRequires: libpng-devel >= 1.2.7
-BuildRequires: soprano-devel
-BuildRequires: sqlite3-devel
+Requires: kdeedu-marble >= %{marble_version}
+Requires: qt4-sqlite
 
 Obsoletes: digikamimageplugins < 0.9.1-2
 
-Requires: %{name}-libs = %{version}-%{release}
 
 %description
 digiKam is an easy to use and powerful digital photo management application,
@@ -64,11 +63,7 @@ to use them.
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 #Requires: %{name} = %{version}-%{release}
-%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
-Requires: kdeedu4-marble-libs >= 4.3.0
-%else
-Requires: kdeedu-marble-libs >= 4.3.0
-%endif
+Requires: kdeedu-marble-libs >= %{marble_version}
 
 %description libs
 %{summary}.
@@ -175,6 +170,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.4.0-1
+- new upstream release
+- added Japanese summary
+- added R: qt4-sqlite, kdeedu4-marble <BTS:1026> <BTS:1027>
+
 * Sat Aug 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.3.0-1
 - new upstream release