From 0553b3977662699ca7ee0b16e31c3f7e6089f24e Mon Sep 17 00:00:00 2001 From: nucleo Date: Mar 06 2012 15:23:43 +0000 Subject: digikam-2.6.0-beta2 --- diff --git a/.gitignore b/.gitignore index 6b4f86f..866b020 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /digikam-2.4.1.tar.bz2 /digikam-2.5.0.tar.bz2 /digikam-2.6.0-beta1.tar.bz2 +/digikam-2.6.0-beta2.tar.bz2 diff --git a/digikam-2.6.0-beta1-docbook.patch b/digikam-2.6.0-beta1-docbook.patch deleted file mode 100644 index 89526e7..0000000 --- a/digikam-2.6.0-beta1-docbook.patch +++ /dev/null @@ -1,58 +0,0 @@ -commit fb9d7b6149e610fe38500c2438d3a6298b81cdbc -Author: Gilles Caulier -Date: Mon Feb 6 09:09:03 2012 +0100 - - compile - -diff --git a/digikam/sidebar.docbook b/digikam/sidebar.docbook -index a5d77c9..4d20a74 100644 ---- a/digikam/sidebar.docbook -+++ b/digikam/sidebar.docbook -@@ -57,7 +57,7 @@ - - Metadata, as shown in these four tabs, can be modified and enhanced in a number of ways elsewhere: - -- with the camera dialog -+ with the camera interface - the metadata editor - the GPS-locator - copying database metadata to files -@@ -379,14 +379,14 @@ - - The Geolocation Tab - -- This tab is based on the marble widget to display a rough map of orientation. You can zoom in and out with the mousewheel by either scrolling it or hold and drag it. Pan by holding down the left mouse button. -+ This tab is based on the marble widget to display a rough map of orientation. You can zoom in and out with the mousewheel by either scrolling it or hold and drag it. Pan by holding down the left mouse button. - The Geolocation tab - For higher resolution maps choose "More Info" - - The left sidebar is a geo-search tool. Press the &Ctrl;left mouse button to pull-up a square as indicated. All images falling within the coordinates of that square will be shown. -- On the right sidebar you will find a cross to indicate the GPS location and the selected image's name next to it. The GPS coordinates and the time information are displayed below the widget. -- For higher resolution maps choose More Info button to open the detailed map service (choose before on the left scroll box) in a Internet browser. -- The displayed positioning data are actually stored in the image's EXIF tags (and not yet in the database). That allows the location to be read by any other application that can understand EXIF GPS data. -+ On the right sidebar you will find a cross to indicate the GPS location and the selected image's name next to it. The GPS coordinates and the time information are displayed below the widget. -+ For higher resolution maps choose More Info button to open the detailed map service (choose before on the left scroll box) in a Internet browser. -+ The displayed positioning data are actually stored in the image's EXIF tags (and not yet in the database). That allows the location to be read by any other application that can understand EXIF GPS data. - - What is GPS? - -@@ -398,7 +398,7 @@ - - - -- -+ - - - Comments & Tags -@@ -418,8 +418,8 @@ - - IPTC data only supports ASCII characters and is limited to 2000 characters (old American norm). All texts will be truncated after 2000 chars, and special characters will be malformed. If you intend to use the IPTC caption field in other applications you should be compliant with these restrictions. - -- After commenting, either choose the Apply button or go straight to the next image, the captions will be saved. -- Next to the Apply button there is the More button. From it you can either choose to read metadata from the selected file to the database, or the other way around, to write metadata to the files (the latter take place anyway if you chose a metadata setting so that all metadata is always saved to the images). -+ After commenting, either choose the Apply button or go straight to the next image, the captions will be saved. -+ Next to the Apply button there is the More button. From it you can either choose to read metadata from the selected file to the database, or the other way around, to write metadata to the files (the latter take place anyway if you chose a metadata setting so that all metadata is always saved to the images). - - - diff --git a/digikam.spec b/digikam.spec index 4bdf3ae..368bf39 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,8 +1,8 @@ -%define pre beta1 +%define pre beta2 Name: digikam Version: 2.6.0 -Release: 0.2.%{?pre}%{?dist} +Release: 0.3.%{?pre}%{?dist} Summary: A digital camera accessing & photo management application License: GPLv2+ @@ -23,8 +23,6 @@ Patch0: digikam-2.5.0-clapack-atlas.patch ## upstreamable patches ## upstream patches -# https://bugs.kde.org/show_bug.cgi?id=293563 -Patch100: digikam-2.6.0-beta1-docbook.patch # for clapack, see also the clapack-atlas patch BuildRequires: atlas-devel @@ -220,9 +218,6 @@ BuildArch: noarch %patch0 -p1 -b .clapack-atlas -pushd doc/digikam -%patch100 -p1 -b .docbook -popd %build @@ -300,10 +295,10 @@ kipiplugin_smug.lang kipiplugin_timeadjust.lang \ kipiplugins.lang >> kipi-plugins.lang ## unpackaged files -rm -f %{buildroot}%{_kde4_libdir}/libdigikamcore.so -rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so -rm -f %{buildroot}%{_kde4_libdir}/libkipiplugins.so -rm -f %{buildroot}%{_kde4_libdir}/libPropertyBrowser.a +rm %{buildroot}%{_kde4_libdir}/libdigikamcore.so +rm %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so +rm %{buildroot}%{_kde4_libdir}/libkipiplugins.so +rm %{buildroot}%{_kde4_libdir}/libPropertyBrowser.a %check @@ -451,6 +446,7 @@ update-desktop-database -q &> /dev/null %{_kde4_libdir}/kde4/kipiplugin_gpssync.so %{_kde4_libdir}/kde4/kipiplugin_htmlexport.so %{_kde4_libdir}/kde4/kipiplugin_imageviewer.so +%{_kde4_libdir}/kde4/kipiplugin_imageshackexport.so %{_kde4_libdir}/kde4/kipiplugin_ipodexport.so %{_kde4_libdir}/kde4/kipiplugin_jpeglossless.so %{_kde4_libdir}/kde4/kipiplugin_kioexportimport.so @@ -469,6 +465,7 @@ update-desktop-database -q &> /dev/null %{_kde4_libdir}/kde4/kipiplugin_timeadjust.so %{_kde4_libdir}/kde4/kipiplugin_vkontakte.so %{_kde4_libdir}/kde4/kipiplugin_yandexfotki.so +%{_kde4_libdir}/kde4/kipiplugin_wikimedia.so %{_kde4_appsdir}/gpssync/ %{_kde4_appsdir}/kipiplugin_flashexport/ %{_kde4_appsdir}/kipiplugin_galleryexport/ @@ -508,6 +505,9 @@ update-desktop-database -q &> /dev/null %changelog +* Tue Mar 6 2012 Alexey Kurov - 2.6.0-0.3.beta2 +- digikam-2.6.0-beta2 + * Tue Feb 28 2012 Fedora Release Engineering - 2.6.0-0.2.beta1 - Rebuilt for c++ ABI breakage diff --git a/sources b/sources index e1d0d1c..11dd456 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83b4ae6a69502a0164130459c542a529 digikam-2.6.0-beta1.tar.bz2 +f1c5ac8b0ae94d7fe50c9849aa25caf4 digikam-2.6.0-beta2.tar.bz2