Accepting request 63497 from KDE:Distro:Factory
Accepted submit request 63497 from user rwooninck OBS-URL: https://build.opensuse.org/request/show/63497 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=65
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
parent
1f23372321
commit
9d588e7067
6
_service
6
_service
@ -3,11 +3,11 @@
|
||||
<service name="download_url">
|
||||
<param name="protocol">http</param>
|
||||
<param name="host">downloads.sourceforge.net</param>
|
||||
<param name="path">/project/digikam/digikam/1.8.0/digikam-1.8.0.tar.bz2</param>
|
||||
<param name="path">/project/digikam/digikam/1.9.0/digikam-1.9.0.tar.bz2</param>
|
||||
</service>
|
||||
<service name="verify_file">
|
||||
<param name="file">_service:download_url:digikam-1.8.0.tar.bz2</param>
|
||||
<param name="file">_service:download_url:digikam-1.9.0.tar.bz2</param>
|
||||
<param name="verifier">sha256</param>
|
||||
<param name="checksum">210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa</param>
|
||||
<param name="checksum">e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5</param>
|
||||
</service>
|
||||
</services>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
|
||||
size 23376636
|
||||
3
_service:download_url:digikam-1.9.0.tar.bz2
Normal file
3
_service:download_url:digikam-1.9.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
|
||||
size 22866660
|
||||
11
correct_jpeg_lib_version.patch
Normal file
11
correct_jpeg_lib_version.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- CMakeLists.txt 2011-03-09 09:51:10.456001546 +0100
|
||||
+++ CMakeLists.txt 2011-03-09 09:51:10.456001546 +0100
|
||||
@@ -171,7 +171,7 @@
|
||||
|
||||
# Extract version of libjpeg so that we can use the appropriate dir
|
||||
# See bug #227313, #228483
|
||||
-FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
|
||||
+FILE(READ "${JPEG_INCLUDE_DIR}/jconfig.h" jpeglib_h_content)
|
||||
STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
|
||||
MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}")
|
||||
|
||||
@ -1,3 +1,52 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 9 11:29:29 UTC 2011 - tittiatcoke@gmail.com
|
||||
|
||||
- Added patch to correctly identify the version of libjpeg62.
|
||||
Due to a recent update on Factory, the new version shows the
|
||||
version number in the file /usr/include/jconfig.h
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 5 21:00:37 UTC 2011 - asterios.dramis@gmail.com
|
||||
|
||||
- Update to version 1.9.0:
|
||||
* Bugfixes:
|
||||
- png-1.5 compatibility fix (bko264181).
|
||||
- digiKam 1.8.0 (svn) crashes on startup most times (bko263697).
|
||||
- Grayscale TIFF display broken (bko237492).
|
||||
- digikam 1.7.0 crashes on startup (bko263786).
|
||||
- Inconsistant use of preview zoom-in function key-strokes (bko228531).
|
||||
- The DocumentName tag is not added when importing (bko233612).
|
||||
- Disable folder collapsing under certain circumstances (bko246778).
|
||||
- Image editor always crashes when triggering Colour Auto-Correction
|
||||
(bko264363).
|
||||
- digiKam crash on loading (bko234021).
|
||||
- Exif-dates not recognices OK (bko264999).
|
||||
- When adding new tag to multiple images, tags not in common are removed
|
||||
from metadata, though still present in database (bko264745).
|
||||
- digiKam contains a convience copy of cimg code (bko173901).
|
||||
- Underexposure indicator should always work in "pure color" mode
|
||||
(bko264208).
|
||||
- digiKam crash on startup (bko264769).
|
||||
- Raw importer broken. Not possible to revert changes (bko264830).
|
||||
- Only one digikam instance should run on the same image library path
|
||||
(bko103371).
|
||||
- digikam-1.8.0 fails to build against kde-4.6.x/gcc-4.6 (bko265445).
|
||||
- Deleteing last TAG on a picture does actually not remove the tag within
|
||||
the exif metadata (bko264631).
|
||||
- Quickfilter by tags: Exclude tags (bko195648).
|
||||
- digiKam crash at startup (bko265641).
|
||||
- Spec file updates:
|
||||
* Changes based on rpmdevtools templates and spec-cleaner run.
|
||||
* Updates in License: entry.
|
||||
* Updates in Buildrequires:, Requires: and Provides: sections.
|
||||
* Added description for the patches based on openSUSE Patches Guidelines.
|
||||
* Removed digikam-doc subpackage and merged it in digikam-lang since it
|
||||
actually contained the translated package help files.
|
||||
* Moved the english help files in the main package.
|
||||
* Updates in %description, %prep, %install and %files sections.
|
||||
* Removed support for openSUSE < 1120.
|
||||
* Minor other updates.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 24 21:14:16 UTC 2011 - wstephenson@novell.com
|
||||
|
||||
|
||||
265
digikam.spec
265
digikam.spec
@ -15,56 +15,81 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: digikam
|
||||
BuildRequires: graphviz-devel libgphoto2-devel libkdepimlibs4-devel libqimageblitz-devel sqlite-devel
|
||||
BuildRequires: libkdcraw-devel libkexiv2-devel libkipi-devel marble-devel
|
||||
BuildRequires: lensfun-devel libjasper-devel liblqr-devel soprano-backend-redland
|
||||
Url: http://www.digikam.org/
|
||||
License: GPLv2+
|
||||
Group: Productivity/Graphics/Viewers
|
||||
Summary: A KDE Photo Manager
|
||||
Version: 1.8.0
|
||||
Version: 1.9.0
|
||||
Release: 1
|
||||
%define tar_version 1.8.0
|
||||
Source0: %name-%{tar_version}.tar.bz2
|
||||
Summary: A KDE Photo Manager
|
||||
|
||||
License: GPLv2+ and LGPLv2.1+ and GFDL and X11 (BSD like) and BSD3c (or similar)
|
||||
Url: http://www.digikam.org/
|
||||
Group: Productivity/Graphics/Viewers
|
||||
Source0: http://sourceforge.net/projects/digikam/files/digikam/1.9.0/%{name}-%{version}.tar.bz2
|
||||
Source1: %{name}-docs.tar.bz2
|
||||
Patch1: %{name}-buildtime.patch
|
||||
Patch2: add_mimetype_bnc629393.diff
|
||||
# PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work
|
||||
Patch0: digikam-buildtime.patch
|
||||
# PATCH-FIX-UPSTREAM add_mimetype_bnc629393.diff bnc#629393 kde#261627 ctrippe@gmx.net -- Add MimeTypes to desktop file for better integration in GNOME
|
||||
Patch1: add_mimetype_bnc629393.diff
|
||||
# With the latest version of libjpeg62 in Factory, the version is mentioned in a different file
|
||||
%if %suse_version > 1140
|
||||
Patch2: correct_jpeg_lib_version.patch
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: lensfun-devel
|
||||
BuildRequires: libgphoto2-devel
|
||||
BuildRequires: libjasper-devel
|
||||
BuildRequires: libkdcraw-devel
|
||||
BuildRequires: libkde4-devel
|
||||
BuildRequires: libkdepimlibs4-devel
|
||||
BuildRequires: libkexiv2-devel
|
||||
BuildRequires: libkipi-devel
|
||||
BuildRequires: liblqr-devel
|
||||
BuildRequires: libsoprano-devel
|
||||
BuildRequires: marble-devel
|
||||
%if 0%{?suse_version} == 1120
|
||||
BuildRequires: mysql
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1120
|
||||
BuildRequires: mysql-community-server
|
||||
%endif
|
||||
BuildRequires: shared-desktop-ontologies-devel
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: update-desktop-files
|
||||
%endif
|
||||
%kde4_runtime_requires
|
||||
%kde4_pimlibs_requires
|
||||
Requires: libqt4-sql-sqlite libqt4-sql-mysql
|
||||
Recommends: kipi-plugins
|
||||
Requires: oxygen-icon-theme
|
||||
Recommends: %{name}-lang = %{version}
|
||||
Provides: kde4-digikam = 0.10.0
|
||||
Provides: kde4-digikam = %{version}
|
||||
Obsoletes: kde4-digikam <= 0.10.0
|
||||
|
||||
%description
|
||||
digiKam is a simple digital photo management application for KDE, which
|
||||
allows you to import and organize your digital photos easily. The
|
||||
photos can be organized in albums, which can be sorted chronologically,
|
||||
by directory layout, or by custom collections. An easy-to-use interface
|
||||
that enables you to connect to your camera and preview, download, or
|
||||
delete your images, is provided.
|
||||
digiKam is an easy to use and powerful digital photo management
|
||||
application, which makes importing, organizing and manipulating
|
||||
digital photos a "snap". An easy to use interface is provided
|
||||
to connect to your digital camera, preview the images and download
|
||||
and/or delete them.
|
||||
|
||||
The digiKam built-in image editor makes the common photo correction
|
||||
a simple task. The image editor is extensible via plugins. All useful
|
||||
image editor plugins are available in the base installation.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Gilles Caulier <caulier dot gilles at gmail dot com>
|
||||
Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
|
||||
Gilles Caulier <caulier dot gilles at gmail dot com>
|
||||
Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
|
||||
Andi Clemens <andi dot clemens at gmx dot net>
|
||||
Renchi Raju <renchi@green.tam.uiuc.edu> (Original author, retired)
|
||||
Renchi Raju <renchi dot raju at gmail dot com> (Original author, retired)
|
||||
|
||||
%package devel
|
||||
License: GPLv2+
|
||||
Group: Development/Libraries/KDE
|
||||
Summary: Development Headers for Digikam
|
||||
Requires: %name = %{version}
|
||||
License: GPLv2+ and LGPLv2.1+ and GFDL and X11 (BSD like) and BSD3c (or similar)
|
||||
Group: Development/Libraries/KDE
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description devel
|
||||
digiKam is a simple digital photo management application for KDE. This
|
||||
@ -77,34 +102,21 @@ Authors:
|
||||
Gilles Caulier <caulier dot gilles at gmail dot com>
|
||||
Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
|
||||
Andi Clemens <andi dot clemens at gmx dot net>
|
||||
Renchi Raju <renchi@green.tam.uiuc.edu>
|
||||
|
||||
%package doc
|
||||
License: GPLv2+
|
||||
Group: Productivity/Graphics/Viewers
|
||||
Summary: A KDE Photo Manager Build Environment
|
||||
Requires: %name = %{version}
|
||||
|
||||
%description doc
|
||||
digiKam is a simple digital photo management application for KDE. This
|
||||
package contains its build environment.
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Gilles Caulier <caulier dot gilles at gmail dot com>
|
||||
Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
|
||||
Andi Clemens <andi dot clemens at gmx dot net>
|
||||
Renchi Raju <renchi@green.tam.uiuc.edu>
|
||||
|
||||
Renchi Raju <renchi dot raju at gmail dot com> (Original author, retired)
|
||||
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%setup -q -n %name-%{tar_version} -a 1
|
||||
%setup -q -a 1
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
%if %suse_version > 1140
|
||||
%patch2 -p0
|
||||
%endif
|
||||
# Remove build time references so build-compare can do its work
|
||||
FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y')
|
||||
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" digikam/version.h.cmake
|
||||
# Add digikam-docs.tar.bz2 directories
|
||||
echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt
|
||||
echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt
|
||||
echo "add_subdirectory( doc-translations )" >> CMakeLists.txt
|
||||
@ -112,99 +124,82 @@ echo "add_subdirectory( doc/digikam )" >> CMakeLists.txt
|
||||
echo "add_subdirectory( doc/showfoto )" >> CMakeLists.txt
|
||||
|
||||
%build
|
||||
%cmake_kde4 -d build
|
||||
%make_jobs
|
||||
%cmake_kde4 -d build
|
||||
%make_jobs
|
||||
|
||||
%install
|
||||
cd build
|
||||
%makeinstall
|
||||
cd ..
|
||||
%suse_update_desktop_file digikam Graphics Photography
|
||||
%suse_update_desktop_file -G "Photo Editor" showfoto Graphics Photography
|
||||
%find_lang %name
|
||||
%kde_post_install
|
||||
%if %suse_version < 1120
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/et/common
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/it/common
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/uk/common
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/sv/common
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/pt_BR/common
|
||||
%endif
|
||||
cd build
|
||||
%kde4_makeinstall
|
||||
cd ..
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%suse_update_desktop_file %{name} Qt KDE Graphics Photography
|
||||
%suse_update_desktop_file -G "Photo Editor" showfoto Qt KDE Graphics Photography
|
||||
%endif
|
||||
|
||||
# Remove unneeded locales
|
||||
%if 0%{?suse_version} < 1140
|
||||
rm -rf %{buildroot}%{_datadir}/locale/hne/
|
||||
%endif
|
||||
|
||||
%find_lang %{name} --all-name
|
||||
|
||||
%kde_post_install
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
rm -rf filelists
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
/usr/include/digikam
|
||||
/usr/include/digikam_export.h
|
||||
%_libdir/libdigikamcore.so
|
||||
%_libdir/libdigikamdatabase.so
|
||||
|
||||
%files lang -f %name.lang
|
||||
%defattr(-,root,root)
|
||||
%exclude /usr/share/doc/kde/HTML/*/digikam
|
||||
%exclude /usr/share/doc/kde/HTML/*/showfoto
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/share/doc/kde/HTML/*/digikam
|
||||
%dir /usr/share/doc/kde/HTML/*/showfoto
|
||||
%if %suse_version < 1120
|
||||
%dir /usr/share/doc/kde/HTML/*/common
|
||||
%endif
|
||||
%doc %lang(en) /usr/share/doc/kde/HTML/en/*
|
||||
%doc %lang(et) /usr/share/doc/kde/HTML/et/*
|
||||
%doc %lang(it) /usr/share/doc/kde/HTML/it/*
|
||||
%doc %lang(pt_BR) /usr/share/doc/kde/HTML/pt_BR/*
|
||||
%doc %lang(uk) /usr/share/doc/kde/HTML/uk/*
|
||||
%doc %lang(sv) /usr/share/doc/kde/HTML/sv/*
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
/usr/bin/digikam
|
||||
/usr/bin/digitaglinktree
|
||||
/usr/bin/showfoto
|
||||
/usr/bin/cleanup_digikamdb
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING COPYING.DOC COPYING.LIB ChangeLog NEWS README TODO TODO.MYSQLPORT
|
||||
%{_kde4_bindir}/cleanup_digikamdb
|
||||
%{_kde4_bindir}/digikam
|
||||
%{_kde4_bindir}/digitaglinktree
|
||||
%{_kde4_bindir}/showfoto
|
||||
# new
|
||||
%_kde4_modules/digikam*.so
|
||||
%{_kde4_modules}/digikam*.so
|
||||
# old
|
||||
%_kde4_modules/kio_digikamalbums.so
|
||||
%_kde4_modules/kio_digikamdates.so
|
||||
%_kde4_modules/kio_digikamsearch.so
|
||||
%_kde4_modules/kio_digikamtags.so
|
||||
%_kde4_modules/plugins/marble/ExternalDraw.so
|
||||
%_libdir/libdigikamcore.so.*
|
||||
%_libdir/libdigikamdatabase.so.*
|
||||
/usr/share/applications/kde4/digikam.desktop
|
||||
/usr/share/applications/kde4/showfoto.desktop
|
||||
/usr/share/icons/hicolor/*/apps/digikam.*
|
||||
/usr/share/icons/hicolor/*/apps/showfoto.*
|
||||
%_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/digikam*.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
|
||||
/usr/share/man/man1/cleanup_digikamdb.1.gz
|
||||
%dir /usr/share/kde4/apps/solid
|
||||
%dir /usr/share/kde4/apps/solid/actions
|
||||
%_kde_share_dir/apps/solid/actions/digikam-opencamera.desktop
|
||||
%if %suse_version < 1120
|
||||
%dir /usr/share/locale/hne
|
||||
%dir /usr/share/locale/hne/LC_MESSAGES
|
||||
%endif
|
||||
%_kde4_libexecdir/digikamdatabaseserver
|
||||
%{_kde4_modules}/kio_digikamalbums.so
|
||||
%{_kde4_modules}/kio_digikamdates.so
|
||||
%{_kde4_modules}/kio_digikamsearch.so
|
||||
%{_kde4_modules}/kio_digikamtags.so
|
||||
%{_kde4_libexecdir}/digikamdatabaseserver
|
||||
%{_kde4_modules}/plugins/marble/ExternalDraw.so
|
||||
%{_kde4_libdir}/libdigikamcore.so.*
|
||||
%{_kde4_libdir}/libdigikamdatabase.so.*
|
||||
%{_kde4_applicationsdir}/digikam.desktop
|
||||
%{_kde4_applicationsdir}/showfoto.desktop
|
||||
%doc %lang(en) %{_kde4_htmldir}/en/digikam/
|
||||
%{_kde4_iconsdir}/hicolor/*/apps/digikam.*
|
||||
%{_kde4_iconsdir}/hicolor/*/apps/showfoto.*
|
||||
%{_kde4_appsdir}/digikam/
|
||||
%{_kde4_appsdir}/showfoto/
|
||||
%dir %{_kde4_appsdir}/solid
|
||||
%dir %{_kde4_appsdir}/solid/actions
|
||||
%{_kde4_appsdir}/solid/actions/digikam-opencamera.desktop
|
||||
%{_kde4_servicesdir}/digikamalbums.protocol
|
||||
%{_kde4_servicesdir}/digikamdates.protocol
|
||||
%{_kde4_servicesdir}/digikamimageplugin_*.desktop
|
||||
%{_kde4_servicesdir}/digikamnepomukservice.desktop
|
||||
%{_kde4_servicesdir}/digikamsearch.protocol
|
||||
%{_kde4_servicesdir}/digikamtags.protocol
|
||||
%{_kde4_servicetypesdir}/digikamimageplugin.desktop
|
||||
%doc %{_mandir}/man1/digitaglinktree.1%{ext_man}
|
||||
%doc %{_mandir}/man1/cleanup_digikamdb.1%{ext_man}
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/digikam/
|
||||
%{_includedir}/digikam_export.h
|
||||
%{_kde4_libdir}/libdigikamcore.so
|
||||
%{_kde4_libdir}/libdigikamdatabase.so
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%exclude %{_kde4_htmldir}/en/digikam/
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user