diff --git a/.gitignore b/.gitignore index 6d566f4..e2a4eac 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /digikam-2.6.0-beta1.tar.bz2 /digikam-2.6.0-beta2.tar.bz2 /digikam-2.6.0-beta3.tar.bz2 +/digikam-software-compilation-2.6.0-rc.tar.bz2 diff --git a/digikam.spec b/digikam.spec index 70a81e5..e66ad0c 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,13 +1,13 @@ -%define pre beta3 +%define pre rc Name: digikam Version: 2.6.0 -Release: 0.6.%{?pre}%{?dist} +Release: 0.7.%{?pre}%{?dist} Summary: A digital camera accessing & photo management application License: GPLv2+ URL: http://www.digikam.org/ -Source0: http://downloads.sourceforge.net/digikam/digikam-%{version}%{?pre:-%{pre}}.tar.bz2 +Source0: http://downloads.sourceforge.net/digikam/digikam-software-compilation-%{version}%{?pre:-%{pre}}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # digiKam not listed as a media handler for pictures in Nautilus (#516447) @@ -214,7 +214,7 @@ BuildArch: noarch %prep -%setup -q -n %{name}-%{version}%{?pre:-%{pre}} +%setup -q -n %{name}-software-compilation-%{version}%{?pre:-%{pre}} %patch0 -p1 -b .clapack-atlas @@ -223,7 +223,7 @@ BuildArch: noarch mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} -DENABLE_LCMS2=ON -DDIGIKAMSC_COMPILE_PO=ON -DDIGIKAMSC_COMPILE_DOC=ON .. +%{cmake_kde4} -DENABLE_LCMS2=ON .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -446,6 +446,7 @@ update-desktop-database -q &> /dev/null %{_kde4_libdir}/kde4/kipiplugin_htmlexport.so %{_kde4_libdir}/kde4/kipiplugin_imageviewer.so %{_kde4_libdir}/kde4/kipiplugin_imageshackexport.so +%{_kde4_libdir}/kde4/kipiplugin_imgurexport.so %{_kde4_libdir}/kde4/kipiplugin_ipodexport.so %{_kde4_libdir}/kde4/kipiplugin_jpeglossless.so %{_kde4_libdir}/kde4/kipiplugin_kioexportimport.so @@ -504,6 +505,9 @@ update-desktop-database -q &> /dev/null %changelog +* Wed May 9 2012 Alexey Kurov - 2.6.0-0.7.rc +- digikam-software-compilation-2.6.0-rc + * Tue May 08 2012 Rex Dieter 2.6.0-0.6.beta3 - rebuild (libtiff) diff --git a/sources b/sources index 008098d..0193234 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d791879634735b6de638c08aa6ab515 digikam-2.6.0-beta3.tar.bz2 +271892857156464617a0513b5ec108d8 digikam-software-compilation-2.6.0-rc.tar.bz2