OBS User unknown 2007-06-18 22:15:24 +00:00 committed by Git OBS Bridge
parent 135251f2b5
commit 04bc0373dd
10 changed files with 136 additions and 467 deletions

View File

@ -1,29 +0,0 @@
--- digikam/libs/dcraw/Makefile.am
+++ digikam/libs/dcraw/Makefile.am
@@ -25,14 +25,6 @@
bin_PROGRAMS = digikamdcraw
-# This line is require to prevent broken compilation with -std=iso9899:1990 gcc option.
-# In fact, dcraw.c use lcms.h witch use the "inline" keyword witch do not exist in pure C
-# implementation. The -Dinline option please compiler to see inline with this option.
-# Note : using -std-c99 instead -std=iso9899:1990 is not possible because some compiler
-# do not support it.
-# Thanks to Andras Mantia for this tip.
-digikamdcraw_CFLAGS = -Dinline= -w
-
digikamdcraw_SOURCES = dcraw.c
digikamdcraw_LDFLAGS = $(all_libraries) $(LIBJPEG) $(LCMS_LIBS)
--- digikam/libs/dcraw/dcraw.c
+++ digikam/libs/dcraw/dcraw.c
@@ -46,7 +46,9 @@
#include <jpeglib.h>
#endif
#ifndef NO_LCMS
+#define inline __inline__
#include <lcms.h>
+#undef inline
#endif
#ifdef __CYGWIN__

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d6a4d9828f05024b206964ddda9119a9767da351c44cd7bbab342d11b24a5a4
size 6781756

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d63335e3de5154d05f46b211aba13ae740dc4c1620b2023460c477e0dc7b310
size 10466947

View File

@ -1,380 +0,0 @@
------------------------------------------------------------------------
r642723 | cgilles | 2007-03-15 10:15:46 +0100 (Thu, 15 Mar 2007) | 3 lines
digikam from trunk : Fix broken compilation with current Exiv2 implementation (next 0.14.0 release), duing a change with C++ Exception rule. Binary compatibilty is broken I recommend to cleanup and recompile digiKam.
CCMAIL: digikam-devel@kde.org
------------------------------------------------------------------------
Index: digikam/libs/widgets/metadata/makernotewidget.h
===================================================================
--- digikam/libs/widgets/metadata/makernotewidget.h (revision 642722)
+++ digikam/libs/widgets/metadata/makernotewidget.h (revision 642723)
@@ -1,10 +1,10 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
- * Date : 2006-02-20
+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Date : 2006-02-20
* Description : a widget to display non standard Exif metadata
* used by camera makers
*
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
Index: digikam/libs/widgets/metadata/exifwidget.cpp
===================================================================
--- digikam/libs/widgets/metadata/exifwidget.cpp (revision 642722)
+++ digikam/libs/widgets/metadata/exifwidget.cpp (revision 642723)
@@ -1,9 +1,9 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
- * Date : 2006-02-20
+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Date : 2006-02-20
* Description : a widget to display Standard Exif metadata
*
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -46,6 +46,7 @@
#include "dmetadata.h"
#include "metadatalistview.h"
#include "exifwidget.h"
+#include "exifwidget.moc"
namespace Digikam
{
@@ -180,11 +181,10 @@ bool ExifWidget::decodeMetadata()
}
catch (Exiv2::Error& e)
{
- DDebug() << "Cannot parse EXIF metadata using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return false;
+ DMetadata::printExiv2ExceptionError("Cannot parse EXIF metadata using Exiv2 ", e);
}
+
+ return false;
}
void ExifWidget::buildView(void)
@@ -210,11 +210,10 @@ QString ExifWidget::getTagTitle(const QS
}
catch (Exiv2::Error& e)
{
- DDebug() << "Cannot get metadata tag title using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return i18n("Unknown");
+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag title using Exiv2 ", e);
}
+
+ return i18n("Unknown");
}
QString ExifWidget::getTagDescription(const QString& key)
@@ -227,11 +226,10 @@ QString ExifWidget::getTagDescription(co
}
catch (Exiv2::Error& e)
{
- DDebug() << "Cannot get metadata tag description using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return i18n("No description available");
+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag description using Exiv2 ", e);
}
+
+ return i18n("No description available");
}
void ExifWidget::slotSaveMetadataToFile(void)
@@ -243,4 +241,3 @@ void ExifWidget::slotSaveMetadataToFile(
} // namespace Digikam
-#include "exifwidget.moc"
Index: digikam/libs/widgets/metadata/gpswidget.h
===================================================================
--- digikam/libs/widgets/metadata/gpswidget.h (revision 642722)
+++ digikam/libs/widgets/metadata/gpswidget.h (revision 642723)
@@ -1,9 +1,9 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
- * Date : 2006-02-22
+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Date : 2006-02-22
* Description : a tab widget to display GPS info
*
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -84,7 +84,6 @@ private:
private:
GPSWidgetPriv *d;
-
};
} // namespace Digikam
Index: digikam/libs/widgets/metadata/iptcwidget.cpp
===================================================================
--- digikam/libs/widgets/metadata/iptcwidget.cpp (revision 642722)
+++ digikam/libs/widgets/metadata/iptcwidget.cpp (revision 642723)
@@ -1,9 +1,9 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
- * Date : 2006-02-20
+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Date : 2006-02-20
* Description : A widget to display IPTC metadata
*
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -44,6 +44,7 @@
#include "ddebug.h"
#include "dmetadata.h"
#include "iptcwidget.h"
+#include "iptcwidget.moc"
namespace Digikam
{
@@ -155,11 +156,10 @@ bool IptcWidget::decodeMetadata()
}
catch (Exiv2::Error& e)
{
- DDebug() << "Cannot parse IPTC metadata using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return false;
+ DMetadata::printExiv2ExceptionError("Cannot parse IPTC metadata using Exiv2 ", e);
}
+
+ return false;
}
void IptcWidget::buildView(void)
@@ -184,11 +184,10 @@ QString IptcWidget::getTagTitle(const QS
}
catch (Exiv2::Error& e)
{
- DDebug() << "Cannot get metadata tag title using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return i18n("Unknow");
+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag title using Exiv2 ", e);
}
+
+ return i18n("Unknow");
}
QString IptcWidget::getTagDescription(const QString& key)
@@ -201,11 +200,10 @@ QString IptcWidget::getTagDescription(co
}
catch (Exiv2::Error& e)
{
- DDebug() << "Cannot get metadata tag description using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return i18n("No description available");
+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag description using Exiv2 ", e);
}
+
+ return i18n("No description available");
}
void IptcWidget::slotSaveMetadataToFile(void)
@@ -217,4 +215,3 @@ void IptcWidget::slotSaveMetadataToFile(
} // namespace Digikam
-#include "iptcwidget.moc"
Index: digikam/libs/widgets/metadata/exifwidget.h
===================================================================
--- digikam/libs/widgets/metadata/exifwidget.h (revision 642722)
+++ digikam/libs/widgets/metadata/exifwidget.h (revision 642723)
@@ -1,9 +1,9 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
- * Date : 2006-02-20
+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Date : 2006-02-20
* Description : a widget to display Standard Exif metadata
*
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
Index: digikam/libs/widgets/metadata/iptcwidget.h
===================================================================
--- digikam/libs/widgets/metadata/iptcwidget.h (revision 642722)
+++ digikam/libs/widgets/metadata/iptcwidget.h (revision 642723)
@@ -1,9 +1,9 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
- * Date : 2006-02-20
+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Date : 2006-02-20
* Description : A widget to display IPTC metadata
*
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
Index: digikam/libs/widgets/metadata/makernotewidget.cpp
===================================================================
--- digikam/libs/widgets/metadata/makernotewidget.cpp (revision 642722)
+++ digikam/libs/widgets/metadata/makernotewidget.cpp (revision 642723)
@@ -1,10 +1,10 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
- * Date : 2006-02-20
+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Date : 2006-02-20
* Description : a widget to display non standard Exif metadata
* used by camera makers
*
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -46,6 +46,7 @@
#include "ddebug.h"
#include "dmetadata.h"
#include "makernotewidget.h"
+#include "makernotewidget.moc"
namespace Digikam
{
@@ -197,11 +198,10 @@ bool MakerNoteWidget::decodeMetadata()
}
catch (Exiv2::Error& e)
{
- DDebug() << "Cannot parse MAKERNOTE metadata using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return false;
+ DMetadata::printExiv2ExceptionError("Cannot parse MAKERNOTE metadata using Exiv2 ", e);
}
+
+ return false;
}
void MakerNoteWidget::buildView(void)
@@ -226,11 +226,10 @@ QString MakerNoteWidget::getTagTitle(con
}
catch (Exiv2::Error& e)
{
- DDebug() << "Cannot get metadata tag title using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return i18n("Unknown");
+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag title using Exiv2 ", e);
}
+
+ return i18n("Unknown");
}
QString MakerNoteWidget::getTagDescription(const QString& key)
@@ -243,11 +242,10 @@ QString MakerNoteWidget::getTagDescripti
}
catch (Exiv2::Error& e)
{
- DDebug() << "Cannot get metadata tag description using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return i18n("No description available");
+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag description using Exiv2 ", e);
}
+
+ return i18n("No description available");
}
void MakerNoteWidget::slotSaveMetadataToFile(void)
@@ -259,4 +257,3 @@ void MakerNoteWidget::slotSaveMetadataTo
} // namespace Digikam
-#include "makernotewidget.moc"
Index: digikam/libs/widgets/metadata/gpswidget.cpp
===================================================================
--- digikam/libs/widgets/metadata/gpswidget.cpp (revision 642722)
+++ digikam/libs/widgets/metadata/gpswidget.cpp (revision 642723)
@@ -1,9 +1,9 @@
/* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
- * Date : 2006-02-22
+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Date : 2006-02-22
* Description : a tab widget to display GPS info
*
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -62,6 +62,7 @@ http://www.gpspassion.com/forumsen/topic
namespace Digikam
{
+
static const char* ExifGPSHumanList[] =
{
"GPSLatitude",
@@ -304,11 +305,10 @@ bool GPSWidget::decodeMetadata()
catch (Exiv2::Error& e)
{
setMetadataEmpty();
- DDebug() << "Cannot parse EXIF metadata using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return false;
+ DMetadata::printExiv2ExceptionError("Cannot parse EXIF metadata using Exiv2 ", e);
}
+
+ return false;
}
void GPSWidget::setMetadataEmpty()
@@ -342,11 +342,10 @@ QString GPSWidget::getTagTitle(const QSt
}
catch (Exiv2::Error& e)
{
- DDebug() << "Cannot get metadata tag title using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return i18n("Unknown");
+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag title using Exiv2 ", e);
}
+
+ return i18n("Unknown");
}
QString GPSWidget::getTagDescription(const QString& key)
@@ -359,11 +358,10 @@ QString GPSWidget::getTagDescription(con
}
catch (Exiv2::Error& e)
{
- DDebug() << "Cannot get metadata tag description using Exiv2 ("
- << QString::fromAscii(e.what().c_str())
- << ")" << endl;
- return i18n("No description available");
+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag description using Exiv2 ", e);
}
+
+ return i18n("No description available");
}
bool GPSWidget::decodeGPSPosition(void)

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Jun 18 14:54:32 CEST 2007 - stbinner@suse.de
- update to version 0.9.2:
* DigikamImagePlugins have been merged into digiKam tarballs.
* New depency to libkdcraw shared library used to decode RAW file.
* Removing direct Exiv2 library depency. libkexiv2 is now used
* Light Table tool to compare similar images side by side
* Red Eyes Correction tool have been completly re-writen.
* Solarize plugin is now a "Color Effects" pack including Solarize,
Velvia (new plugin), Neon, and Edge effects.
* Black & White converter now support a lots of B&W analog camera
film types (Agfa, Ilford, Kodak). A new 'strength' setting can
simulate the amount of Lens filters effect.
- split of Superimpose plugin templates into sub-package
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 13 23:25:37 CEST 2007 - stbinner@suse.de Wed Jun 13 23:25:37 CEST 2007 - stbinner@suse.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package digikam (Version 0.9.1) # spec file for package digikam (Version 0.9.2)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -14,7 +14,7 @@ Name: digikam
BuildRequires: doxygen giflib-devel imlib2-devel kdelibs3-devel kdesdk3-translate BuildRequires: doxygen giflib-devel imlib2-devel kdelibs3-devel kdesdk3-translate
BuildRequires: libkexiv2-devel libkipi-devel sqlite-devel sqlite2-devel BuildRequires: libkexiv2-devel libkipi-devel sqlite-devel sqlite2-devel
%if %suse_version > 1020 %if %suse_version > 1020
BuildRequires: fdupes libjasper-devel BuildRequires: fdupes libjasper-devel libkdcraw-devel
%else %else
BuildRequires: libjasper BuildRequires: libjasper
%endif %endif
@ -29,22 +29,21 @@ BuildRequires: libtiff-devel
License: GNU General Public License (GPL) License: GNU General Public License (GPL)
Group: Hardware/Other Group: Hardware/Other
Summary: A KDE Photo Manager Summary: A KDE Photo Manager
Version: 0.9.1 Version: 0.9.2
Release: 51 Release: 1
%define rversion %version %define rversion %version-final
URL: http://www.digikam.org/ URL: http://www.digikam.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{rversion}.tar.bz2 Source0: %{name}-%{rversion}.tar.bz2
Source1: service.desktop Source1: service.desktop
Source2: digikamrc
Source3: superimposetemplates-0.1.1.tar.bz2
Patch1: external-sqlite.diff Patch1: external-sqlite.diff
Patch2: autoconf.diff
Patch4: digikam-gphoto-disk.patch Patch4: digikam-gphoto-disk.patch
Patch5: digikam-load.diff Patch5: digikam-load.diff
Patch7: digikam-print.diff Patch7: digikam-print.diff
Patch8: digikam-exif-support.diff
Patch9: renamepreview.patch Patch9: renamepreview.patch
Patch10: accept-old-libexiv2.diff Patch10: accept-old-libexiv2.diff
Patch11: fix-non-utf8.diff
Requires: imlib2-loaders Requires: imlib2-loaders
%if %suse_version > 1020 %if %suse_version > 1020
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
@ -92,25 +91,67 @@ Authors:
-------- --------
Renchi Raju <renchi@green.tam.uiuc.edu> Renchi Raju <renchi@green.tam.uiuc.edu>
%package -n digikamimageplugins
Group: Productivity/Graphics/Bitmap Editors
Summary: Image Manipulation Plug-Ins
%description -n digikamimageplugins
Various plug-ins for the image editor in Digikam:
* AdjustLevels : A plug-in adjusting the image histogram levels
manually.
* SolarizeImage : A plug-in for solarizing an image.
* Despeckle : A noise reduction filter.
* OilPaint : An oil painting effect filter.
* Emboss : An embossed image effect filter.
* Charcoal : A charcoal drawing image effect filter.
* Unsharp : An unsharped mask image filter.
* RainDrop : Adding raindrops randomly in an image.
* FilmGrain : Adding film grain in an image.
Authors:
--------
Gilles Caulier <caulier dot gilles at free.fr>
Renchi Raju <renchi at pooh.tam.uiuc.edu>
%package -n digikamimageplugins-superimpose
Group: Productivity/Graphics/Bitmap Editors
Summary: Templates for Digikam's Superimpose Plugin
%description -n digikamimageplugins-superimpose
This package contains templates for the Superimpose plugin of Digikam.
Authors:
--------
Gilles Caulier <caulier dot gilles at free.fr>
Renchi Raju <renchi at pooh.tam.uiuc.edu>
%if %suse_version > 1020 %if %suse_version > 1020
%lang_package %lang_package
%endif %endif
%prep %prep
%setup -q -n %name-%rversion %setup -q -n %name-%rversion
%if %suse_version > 900
rm -rf digikam/sqlite rm -rf digikam/sqlite
%patch1 %patch1
%endif
%patch2
%patch4 -p1 %patch4 -p1
#%patch5 -p0 #%patch5 -p0
%patch7 %patch7
%patch8
%patch9 %patch9
%if %suse_version == 1020 %if %suse_version == 1020
%patch10 %patch10
%endif %endif
%patch11
. /etc/opt/kde3/common_options . /etc/opt/kde3/common_options
update_admin --no-unsermake update_admin --no-unsermake
@ -125,14 +166,22 @@ make VERBOSE=1 %{?jobs:-j%jobs}
make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
%if %suse_version > 1000 %if %suse_version > 1000
%suse_update_desktop_file digikam Graphics Photography %suse_update_desktop_file digikam Graphics Photography
%suse_update_desktop_file digikamthemedesigner Graphics Photography
%else %else
%suse_update_desktop_file digikam Graphics Photograph %suse_update_desktop_file digikam Graphics Photograph
%suse_update_desktop_file digikamthemedesigner Graphics Photograph
%endif %endif
%suse_update_desktop_file showfoto Graphics Viewer %suse_update_desktop_file showfoto Graphics Viewer
echo "NoDisplay=true" >> $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/showfoto.desktop echo "NoDisplay=true" >> $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/showfoto.desktop
mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus/open_in_digikam.desktop install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus/open_in_digikam.desktop
%suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus/open_in_digikam.desktop %suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus/open_in_digikam.desktop
#
# install superimpose templates
mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/digikamimageplugins/superimpose/
tar xfj %SOURCE3 -C $RPM_BUILD_ROOT/opt/kde3/share/apps/digikamimageplugins/superimpose/
mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/config/
install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/opt/kde3/share/config/
%if %suse_version > 1020 %if %suse_version > 1020
%fdupes -s $RPM_BUILD_ROOT %fdupes -s $RPM_BUILD_ROOT
@ -160,10 +209,15 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
/opt/kde3/bin/* /opt/kde3/bin/*
/opt/kde3/%_lib/*.so.* /opt/kde3/%_lib/*.so.*
%exclude /opt/kde3/%_lib/kde3/digikamimageplugin*.la
%exclude /opt/kde3/%_lib/kde3/digikamimageplugin*.so
/opt/kde3/%_lib/kde3/* /opt/kde3/%_lib/kde3/*
/opt/kde3/share/appl*/*/*.desktop /opt/kde3/share/appl*/*/*.desktop
%exclude /opt/kde3/share/apps/digikam/digikamimageplugin_*
%exclude /opt/kde3/share/apps/digikamimageplugins
/opt/kde3/share/apps/* /opt/kde3/share/apps/*
/opt/kde3/share/icons/* /opt/kde3/share/icons/*
%exclude /opt/kde3/share/services/digikamimageplugin_*.desktop
/opt/kde3/share/services/* /opt/kde3/share/services/*
/opt/kde3/share/servicetypes/digikamimageplugin.desktop /opt/kde3/share/servicetypes/digikamimageplugin.desktop
/usr/share/man/man1/digitaglinktree.1.gz /usr/share/man/man1/digitaglinktree.1.gz
@ -173,10 +227,38 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
/opt/kde3/include/digikam /opt/kde3/include/digikam
/opt/kde3/include/digikam_export.h /opt/kde3/include/digikam_export.h
/opt/kde3/%_lib/*.so /opt/kde3/%_lib/libdigikam.so
/opt/kde3/%_lib/*.la /opt/kde3/%_lib/libdigikam.la
%files -n digikamimageplugins
%defattr(-,root,root)
/opt/kde3/%_lib/kde3/digikamimageplugin*.la
/opt/kde3/%_lib/kde3/digikamimageplugin*.so
%exclude /opt/kde3/share/apps/digikamimageplugins
/opt/kde3/share/apps/digikamimageplugins
/opt/kde3/share/apps/digikam/digikamimageplugin_*
/opt/kde3/share/config/digikamrc
/opt/kde3/share/services/digikamimageplugin_*.desktop
%files -n digikamimageplugins-superimpose
%defattr(-,root,root)
%dir /opt/kde3/share/apps/digikamimageplugins
/opt/kde3/share/apps/digikamimageplugins/superimpose
%changelog %changelog
* Mon Jun 18 2007 - stbinner@suse.de
- update to version 0.9.2:
* DigikamImagePlugins have been merged into digiKam tarballs.
* New depency to libkdcraw shared library used to decode RAW file.
* Removing direct Exiv2 library depency. libkexiv2 is now used
* Light Table tool to compare similar images side by side
* Red Eyes Correction tool have been completly re-writen.
* Solarize plugin is now a "Color Effects" pack including Solarize,
Velvia (new plugin), Neon, and Edge effects.
* Black & White converter now support a lots of B&W analog camera
film types (Agfa, Ilford, Kodak). A new 'strength' setting can
simulate the amount of Lens filters effect.
- split of Superimpose plugin templates into sub-package
* Wed Jun 13 2007 - stbinner@suse.de * Wed Jun 13 2007 - stbinner@suse.de
- running fdupes makes digikam.rpm 285KB smaller - running fdupes makes digikam.rpm 285KB smaller
* Fri Jun 01 2007 - coolo@suse.de * Fri Jun 01 2007 - coolo@suse.de

4
digikamrc Normal file
View File

@ -0,0 +1,4 @@
[Template Superimpose Tool Settings]
Templates Root URL=/opt/kde3/share/apps/digikamimageplugins/superimpose/TEMPLATES/
Templates URL=/opt/kde3/share/apps/digikamimageplugins/superimpose/TEMPLATES/

View File

@ -1,13 +1,15 @@
--- digikam/Makefile.am --- digikam/Makefile.am 2007/06/18 12:41:27 1.1
+++ digikam/Makefile.am +++ digikam/Makefile.am 2007/06/18 12:42:24
@@ -1,4 +1,4 @@ @@ -1,6 +1,6 @@
-SUBDIRS = sqlite libs utilities digikam kioslave imageplugins data showfoto COMPILE_FIRST = sqlite
+SUBDIRS = libs utilities digikam kioslave imageplugins data showfoto
EXTRA_DIST = Digikam.kdevelop AUTHORS COPYING ChangeLog INSTALL README TODO digikam.lsm -SUBDIRS = sqlite libs utilities digikam showfoto data kioslave imageplugins themedesigner
+SUBDIRS = libs utilities digikam showfoto data kioslave imageplugins themedesigner
--- digikam/digikam/Makefile.am 2007/03/05 15:33:45 1.1 EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO digikam.lsm
+++ digikam/digikam/Makefile.am 2007/03/05 15:51:49
--- digikam/digikam/Makefile.am 2007/06/18 12:41:27 1.1
+++ digikam/digikam/Makefile.am 2007/06/18 12:43:25
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
METASOURCES = AUTO METASOURCES = AUTO
@ -20,9 +22,9 @@
welcomepageview.cpp welcomepageview.cpp
libdigikam_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_KABC) $(LIB_KHTML) \ libdigikam_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_KABC) $(LIB_KHTML) \
- $(LIBKIPI_LIBS) $(LIB_KUTILS) $(EXIV2_LIBS) \ - $(LIBKIPI_LIBS) $(LIB_KUTILS) \
- $(top_builddir)/digikam/sqlite/libsqlite.la \ - $(top_builddir)/digikam/sqlite/libsqlite.la \
+ $(LIBKIPI_LIBS) $(LIB_KUTILS) $(EXIV2_LIBS) -lsqlite \ + $(LIBKIPI_LIBS) $(LIB_KUTILS) -lsqlite\
$(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \ $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
$(top_builddir)/digikam/libs/themeengine/libthemeengine.la \ $(top_builddir)/digikam/libs/themeengine/libthemeengine.la \
$(top_builddir)/digikam/libs/widgets/libwidgets.la \ $(top_builddir)/digikam/libs/widgets/libwidgets.la \

View File

@ -1,30 +0,0 @@
--- digikam/utilities/hotplug/digikam-mount-and-download.desktop.in 2007/03/06 16:36:35 1.1
+++ digikam/utilities/hotplug/digikam-mount-and-download.desktop.in 2007/03/06 16:36:43
@@ -3,7 +3,6 @@
Icon=digikam
Name=Download Photos with digiKam
Name[de]=Bilder mit digiKam herunterladen
-Name[fr]=télécharger photos avec digiKam
[Desktop Entry]
Actions=digiKam Mount and Download
--- ./digikam/utilities/hotplug/digikam-gphoto2-camera.desktop.in 2007/03/06 16:51:05 1.1
+++ ./digikam/utilities/hotplug/digikam-gphoto2-camera.desktop.in 2007/03/06 16:51:12
@@ -3,7 +3,6 @@
Icon=digikam
Name=digiKam Detect and Download
Name[de]=Bilder mit digiKam herunterladen
-Name[fr]=télécharger photos avec digiKam
[Desktop Entry]
Actions=digiKam Detect and Download
--- digikam/utilities/hotplug/digikam-download.desktop.in 2007/03/06 16:52:24 1.1
+++ digikam/utilities/hotplug/digikam-download.desktop.in 2007/03/06 16:52:29
@@ -3,7 +3,6 @@
Icon=digikam
Name=Download Photos with digiKam
Name[de]=Bilder mit digiKam herunterladen
-Name[fr]=télécharger photos avec digiKam
[Desktop Entry]
Actions=digiKam Download

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0f5a78efd445fbe4e7fe976536e82565c65c814b5f78c975bd02b1cbf6e1ae8
size 11556719