Hello community,
here is the log from the commit of package digikam for openSUSE:Factory
checked in at Tue Apr 21 00:00:16 CEST 2009.
--------
--- KDE/digikam/digikam.changes 2009-04-04 17:32:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/digikam/digikam.changes 2009-04-20 17:57:55.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Apr 20 17:56:08 CEST 2009 - dmueller@suse.de
+
+- rename kde4-digikam to digikam
+
+-------------------------------------------------------------------
+Sat Apr 18 00:38:57 CEST 2009 - beineri@opensuse.org
+
+- create -lang package
+
+-------------------------------------------------------------------
@@ -6,0 +17,16 @@
+Fri Apr 3 20:38:57 CEST 2009 - coolo@suse.de
+
+- build without hard huge Marble widget dependency unless it can
+ be packaged optionally
+- mark showfoto.desktop unimportant
+- refresh patch to build in factory
+
+-------------------------------------------------------------------
+Tue Mar 17 13:56:29 CET 2009 - wstephenson@suse.de
+
+- update to 0.10.0
+ * General : Internal CImg library updated to 1.3.0.
+ * General : New "DarkRoom" colors theme.
+ * many bugfixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
digikam-0.9.5.tar.bz2
digikam-gphoto-disk.patch
digikam-load.diff
digikam-print.diff
digikamrc
external-sqlite.diff
renamepreview.patch
service.desktop
superimposetemplates-0.1.1.tar.bz2
New:
----
CMakeLists.txt.diff
digikam-0.10.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ digikam.spec ++++++
--- /var/tmp/diff_new_pack.f12491/_old 2009-04-21 00:00:02.000000000 +0200
+++ /var/tmp/diff_new_pack.f12491/_new 2009-04-21 00:00:02.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package digikam (Version 0.9.5)
+# spec file for package digikam (Version 0.10.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,49 +19,30 @@
Name: digikam
-BuildRequires: doxygen giflib-devel imlib2-devel kdelibs3-devel kdesdk3-translate
-%if %suse_version > 1100
-BuildRequires: libkdcraw3-devel libkexiv2-3-devel
-%else
-BuildRequires: libkdcraw-devel libkexiv2-devel
-%endif
-BuildRequires: libkipi0-devel sqlite-devel sqlite2-devel
+BuildRequires: graphviz-devel libgphoto2-devel libkdepimlibs4-devel libqimageblitz-devel sqlite-devel
+# build without hard huge Marble widget dependency unless it can be packaged optionally
+#BuildRequires: kde4-marble-devel
+BuildRequires: libkdcraw-devel libkexiv2-devel libkipi-devel
%if %suse_version > 1020
-BuildRequires: fdupes libjasper-devel
+BuildRequires: imlib-devel libjasper-devel
%else
BuildRequires: libjasper
%endif
-%if %suse_version > 1010
-BuildRequires: libgphoto2-devel
-%else
-BuildRequires: libgphoto2
-%endif
-%if %suse_version < 1010
-BuildRequires: libtiff-devel
-%endif
+Url: http://www.digikam.org/
License: GPL v2 or later
Group: Productivity/Graphics/Viewers
Summary: A KDE Photo Manager
-Version: 0.9.5
-Release: 2
-%define rversion 0.9.5
-Url: http://www.digikam.org/
+Version: 0.10.0
+Release: 1
+%define tar_version 0.10.0
+Source0: %name-%{tar_version}.tar.bz2
+Patch: CMakeLists.txt.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: %{name}-%{rversion}.tar.bz2
-Source1: service.desktop
-Source2: digikamrc
-Source3: superimposetemplates-0.1.1.tar.bz2
-Patch1: external-sqlite.diff
-Patch4: digikam-gphoto-disk.patch
-Patch5: digikam-load.diff
-Patch7: digikam-print.diff
-Patch9: renamepreview.patch
-Requires: imlib2-loaders
-%if %suse_version > 1020
+%kde4_runtime_requires
+Recommends: libqt4-sql-sqlite
+Requires: kde4-kipi-plugins
+Requires: oxygen-icon-theme
Requires: %{name}-lang = %{version}
-Provides: digikamimageplugins-lang = 0.9.1
-Obsoletes: digikamimageplugins-lang <= 0.9.1
-%endif
%description
digiKam is a simple digital photo management application for KDE, which
@@ -77,130 +58,44 @@
--------
Renchi Raju
-%package -n libdigikam-devel
-License: GPL v2 or later
-Group: Hardware/Camera
-Summary: A KDE Photo Manager
-Requires: kdelibs3-devel
-%if %suse_version > 1100
-Requires: libkdcraw3-devel libkexiv2-3-devel
-%else
-Requires: libkdcraw-devel libkexiv2-devel
-%endif
-%if %suse_version > 1020
-Requires: libjasper-devel libgphoto2-devel
-%else
-%if %suse_version > 1010
-Requires: libgphoto2
-%else
-Requires: libjasper
-%endif
-%endif
-
-%description -n libdigikam-devel
-digiKam is a simple digital photo management application for KDE, which
-makes importing and organizing digital photos easy. The photos can be
-organized in albums, which can be sorted chronologically, by directory
-layout, or by custom collections. An easy-to-use interface is provided
-that enables you to connect to your camera and preview, download, and
-delete your images.
-
-
-
-Authors:
---------
- Renchi Raju
-
-%package -n digikamimageplugins
-License: GPL v2 or later
-Group: Productivity/Graphics/Viewers
-Summary: Image Manipulation Plug-Ins
-Recommends: digikamimageplugins-superimpose
-
-%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
+%package devel
License: GPL v2 or later
Group: Productivity/Graphics/Viewers
-Summary: Templates for Digikam's Superimpose Plugin
+Summary: A KDE Photo Manager Build Environment
+Requires: %name = %{version}
-%description -n digikamimageplugins-superimpose
-This package contains templates for the Superimpose plugin of Digikam.
+%description devel
+digiKam is a simple digital photo management application for KDE. This
+package contains its build environment.
Authors:
--------
- Gilles Caulier <caulier dot gilles at free.fr>
- Renchi Raju <renchi at pooh.tam.uiuc.edu>
+ Renchi Raju
-%if %suse_version > 1020
%lang_package
-%endif
-
%prep
-%setup -q -n %name-%rversion
-rm -rf digikam/sqlite
-%patch1
-#%patch4 -p1
-#%patch5 -p0
-%patch7
-%patch9
+%setup -q -n %name-%{tar_version}
+%patch
%build
-. /etc/opt/kde3/common_options
-update_admin --no-unsermake
-export PKG_CONFIG_PATH=/opt/kde3/%_lib/pkgconfig
-./configure $configkde --disable-final --without-included-sqlite3
-make VERBOSE=1 %{?jobs:-j%jobs}
+ %cmake_kde4 -d build
+ %make_jobs
%install
-. /etc/opt/kde3/common_options
-make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
-%suse_update_desktop_file digikam Graphics Photography
-%suse_update_desktop_file showfoto Graphics Viewer
-echo "NoDisplay=true" >> $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/showfoto.desktop
-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
-%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
-%fdupes -s $RPM_BUILD_ROOT
-%endif
-kde_post_install
-%find_lang %name
+ cd build
+ %makeinstall
+ # Move the icons back to /usr/share/icons/hicolor because digikam started installing only to datadir/icons, relying on the theme.
+ # This is wrong - only oxygen provides a digikam icon
+ mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/
+ for i in {16,22,32,48,64,128}; do mv $RPM_BUILD_ROOT/usr/share/kde4/apps/digikam/icons/oxygen/"$i"x"$i"/apps/digikam.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/"$i"x"$i"/apps/;done
+ for i in {16,22,32,48,64,128}; do mv $RPM_BUILD_ROOT/usr/share/kde4/apps/digikam/icons/oxygen/"$i"x"$i"/apps/showfoto.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/"$i"x"$i"/apps/;done
+ cd ..
+ %suse_update_desktop_file digikam Graphics Photography
+ %suse_update_desktop_file -G "Photo Editor" showfoto Graphics 2DGraphic RasterGraphics
+ %find_lang %name
+ %kde_post_install
%post -p /sbin/ldconfig
@@ -208,59 +103,128 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%if %suse_version > 1020
+rm -rf filelists
-%files lang -f %name.lang
+%files devel
%defattr(-,root,root)
+/usr/include/digikam
+/usr/include/digikam_export.h
+%_libdir/libdigikamcore.so
+%_libdir/libdigikamdatabase.so
-%files
+%files lang -f %name.lang
%defattr(-,root,root)
-%else
-%files -f %name.lang
+%files
%defattr(-,root,root)
-%endif
-/opt/kde3/bin/*
-/opt/kde3/%_lib/*.so.*
-%exclude /opt/kde3/%_lib/kde3/digikamimageplugin*.la
-%exclude /opt/kde3/%_lib/kde3/digikamimageplugin*.so
-/opt/kde3/%_lib/kde3/*
-/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/icons/*
-%exclude /opt/kde3/share/services/digikamimageplugin_*.desktop
-/opt/kde3/share/services/*
-/opt/kde3/share/servicetypes/digikamimageplugin.desktop
+/usr/bin/digikam
+/usr/bin/digikamthemedesigner
+/usr/bin/digitaglinktree
+/usr/bin/showfoto
+%_kde4_modules/digikamimageplugin_adjustcurves.so
+%_kde4_modules/digikamimageplugin_adjustlevels.so
+%_kde4_modules/digikamimageplugin_blurfx.so
+%_kde4_modules/digikamimageplugin_border.so
+%_kde4_modules/digikamimageplugin_channelmixer.so
+%_kde4_modules/digikamimageplugin_charcoal.so
+%_kde4_modules/digikamimageplugin_colorfx.so
+%_kde4_modules/digikamimageplugin_core.so
+%_kde4_modules/digikamimageplugin_distortionfx.so
+%_kde4_modules/digikamimageplugin_emboss.so
+%_kde4_modules/digikamimageplugin_filmgrain.so
+%_kde4_modules/digikamimageplugin_freerotation.so
+%_kde4_modules/digikamimageplugin_hotpixels.so
+%_kde4_modules/digikamimageplugin_infrared.so
+%_kde4_modules/digikamimageplugin_inpainting.so
+%_kde4_modules/digikamimageplugin_inserttext.so
+%_kde4_modules/digikamimageplugin_lenscorrection.so
+%_kde4_modules/digikamimageplugin_noisereduction.so
+%_kde4_modules/digikamimageplugin_oilpaint.so
+%_kde4_modules/digikamimageplugin_perspective.so
+%_kde4_modules/digikamimageplugin_raindrop.so
+%_kde4_modules/digikamimageplugin_restoration.so
+%_kde4_modules/digikamimageplugin_sheartool.so
+%_kde4_modules/digikamimageplugin_superimpose.so
+%_kde4_modules/digikamimageplugin_texture.so
+%_kde4_modules/digikamimageplugin_whitebalance.so
+%_kde4_modules/kio_digikamalbums.so
+%_kde4_modules/kio_digikamdates.so
+%_kde4_modules/kio_digikamsearch.so
+%_kde4_modules/kio_digikamtags.so
+%_libdir/libdigikamcore.so.*
+%_libdir/libdigikamdatabase.so.*
+/usr/share/applications/kde4/digikam.desktop
+/usr/share/applications/kde4/showfoto.desktop
+/usr/share/icons/hicolor/128x128/apps/digikam.png
+/usr/share/icons/hicolor/128x128/apps/showfoto.png
+/usr/share/icons/hicolor/16x16/apps/digikam.png
+/usr/share/icons/hicolor/16x16/apps/showfoto.png
+/usr/share/icons/hicolor/22x22/apps/digikam.png
+/usr/share/icons/hicolor/22x22/apps/showfoto.png
+/usr/share/icons/hicolor/32x32/apps/digikam.png
+/usr/share/icons/hicolor/32x32/apps/showfoto.png
+/usr/share/icons/hicolor/48x48/apps/digikam.png
+/usr/share/icons/hicolor/48x48/apps/showfoto.png
+/usr/share/icons/hicolor/64x64/apps/digikam.png
+/usr/share/icons/hicolor/64x64/apps/showfoto.png
+%_kde_share_dir/apps/digikam
+%_kde_share_dir/apps/showfoto
+%_kde_share_dir/services/digikamalbums.protocol
+%_kde_share_dir/services/digikamdates.protocol
+%_kde_share_dir/services/digikamimageplugin_adjustcurves.desktop
+%_kde_share_dir/services/digikamimageplugin_adjustlevels.desktop
+%_kde_share_dir/services/digikamimageplugin_blurfx.desktop
+%_kde_share_dir/services/digikamimageplugin_border.desktop
+%_kde_share_dir/services/digikamimageplugin_channelmixer.desktop
+%_kde_share_dir/services/digikamimageplugin_charcoal.desktop
+%_kde_share_dir/services/digikamimageplugin_colorfx.desktop
+%_kde_share_dir/services/digikamimageplugin_core.desktop
+%_kde_share_dir/services/digikamimageplugin_distortionfx.desktop
+%_kde_share_dir/services/digikamimageplugin_emboss.desktop
+%_kde_share_dir/services/digikamimageplugin_filmgrain.desktop
+%_kde_share_dir/services/digikamimageplugin_freerotation.desktop
+%_kde_share_dir/services/digikamimageplugin_hotpixels.desktop
+%_kde_share_dir/services/digikamimageplugin_infrared.desktop
+%_kde_share_dir/services/digikamimageplugin_inpainting.desktop
+%_kde_share_dir/services/digikamimageplugin_inserttext.desktop
+%_kde_share_dir/services/digikamimageplugin_lenscorrection.desktop
+%_kde_share_dir/services/digikamimageplugin_noisereduction.desktop
+%_kde_share_dir/services/digikamimageplugin_oilpaint.desktop
+%_kde_share_dir/services/digikamimageplugin_perspective.desktop
+%_kde_share_dir/services/digikamimageplugin_raindrop.desktop
+%_kde_share_dir/services/digikamimageplugin_restoration.desktop
+%_kde_share_dir/services/digikamimageplugin_sheartool.desktop
+%_kde_share_dir/services/digikamimageplugin_superimpose.desktop
+%_kde_share_dir/services/digikamimageplugin_texture.desktop
+%_kde_share_dir/services/digikamimageplugin_whitebalance.desktop
+%_kde_share_dir/services/digikamsearch.protocol
+%_kde_share_dir/services/digikamtags.protocol
+%_kde_share_dir/servicetypes/digikamimageplugin.desktop
+%_kde_share_dir/apps/showfoto/data/logo-showfoto.png
+%_kde_share_dir/apps/showfoto/data/splash-showfoto.png
+%_kde_share_dir/apps/showfoto/showfotoui.rc
/usr/share/man/man1/digitaglinktree.1.gz
-%dir /opt/kde3/share/doc/HTML/en/digikam-%rversion-apidocs
-
-%files -n libdigikam-devel
-%defattr(-,root,root)
-/opt/kde3/include/digikam
-/opt/kde3/include/digikam_export.h
-/opt/kde3/%_lib/libdigikam.so
-/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
+%dir /usr/share/kde4/apps/solid
+%dir /usr/share/kde4/apps/solid/actions
+/usr/share/kde4/apps/solid/actions/digikam-opencamera.desktop
%changelog
+* Mon Apr 20 2009 dmueller@suse.de
+- rename kde4-digikam to digikam
+* Sat Apr 18 2009 beineri@opensuse.org
+- create -lang package
* Sat Apr 04 2009 coolo@suse.de
- refresh patches to fix build
+* Fri Apr 03 2009 coolo@suse.de
+- build without hard huge Marble widget dependency unless it can
+ be packaged optionally
+- mark showfoto.desktop unimportant
+- refresh patch to build in factory
+* Tue Mar 17 2009 wstephenson@suse.de
+- update to 0.10.0
+ * General : Internal CImg library updated to 1.3.0.
+ * General : New "DarkRoom" colors theme.
+ * many bugfixes
* Tue Mar 17 2009 wstephenson@suse.de
- Update to 0.9.5
* TIFF/PNG/JPEG2000 metadata can be edited or added
++++++ CMakeLists.txt.diff ++++++
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -2,6 +2,14 @@ PROJECT(digikam)
OPTION(ENABLE_GPHOTO2 "Build digiKam with libgphoto2 support (default=ON)" ON)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules )
+
+# search packages used by KDE
+find_package(KDE4 REQUIRED)
+include (KDE4Defaults)
+include (MacroLibrary)
+include(MacroOptionalAddSubdirectory)
+
# ==================================================================================================
# Information to update before to release this package.
++++++ digikam-0.9.5.tar.bz2 -> digikam-0.10.0.tar.bz2 ++++++
KDE/digikam/digikam-0.9.5.tar.bz2 /mounts/work_src_done/STABLE/digikam/digikam-0.10.0.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org