Hello community,

here is the log from the commit of package digikam for openSUSE:Factory
checked in at Tue Aug 30 10:42:19 CEST 2011.



--------
--- KDE/digikam/digikam.changes 2011-08-09 00:42:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/digikam/digikam.changes        2011-08-26 
10:22:19.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 26 08:18:51 UTC 2011 - idon...@novell.com
+
+ - Add digikam-link-order.patch: fix library link order,
+   bko #258931
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  digikam-link-order.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ digikam.spec ++++++
--- /var/tmp/diff_new_pack.a6eUYG/_old  2011-08-30 10:41:48.000000000 +0200
+++ /var/tmp/diff_new_pack.a6eUYG/_new  2011-08-30 10:41:48.000000000 +0200
@@ -19,7 +19,7 @@
 
 Name:           digikam
 Version:        2.0.0
-Release:        3
+Release:        5
 License:        GPL-2.0+
 Summary:        A KDE Photo Manager
 Url:            http://www.digikam.org/
@@ -31,6 +31,8 @@
 Patch1:         add_mimetype_bnc629393.diff
 # PATCH-FIX-OPENSUSE digikam-external-libs.patch -- Compile with external libs
 Patch2:         digikam-external-libs.patch
+# PATCH-FIX-UPSTREAM digikam-link-order.patch bko #258931 idoen...@suse.de -- 
Fix library link order
+Patch3:         digikam-link-order.patch
 BuildRequires:  boost-devel
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -42,8 +44,8 @@
 BuildRequires:  libkdepimlibs4-devel
 BuildRequires:  libkexiv2-devel
 BuildRequires:  libkface-devel
-BuildRequires:  libkipi-devel
 BuildRequires:  libkgeomap-devel
+BuildRequires:  libkipi-devel
 BuildRequires:  liblcms-devel
 BuildRequires:  liblqr-devel
 BuildRequires:  libsoprano-devel
@@ -74,6 +76,7 @@
 %patch0
 %patch1
 %patch2
+%patch3
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e 
%%Y')

++++++ digikam-link-order.patch ++++++
--- core/digikam/CMakeLists.txt 2011-07-28 01:28:25.000000000 +0200
+++ core/digikam/CMakeLists.txt 2011-08-26 10:10:07.010025844 +0200
@@ -278,13 +278,14 @@
 
         ${STRIGI_LIBRARIES}
         ${LCMS_LIBRARIES}
-        ${GPHOTO2_LIBRARIES}
 
         digikamcore
         digikamdatabase
         advancedrename
         queuemanager
         cameragui
+
+        ${GPHOTO2_LIBRARIES}
 )
 
 IF (NOT WIN32 AND GPHOTO2_FOUND)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to