Hello community,
here is the log from the commit of package lightdm-kde-greeter for
openSUSE:13.1 checked in at 2013-10-02 20:30:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/lightdm-kde-greeter (Old)
and /work/SRC/openSUSE:13.1/.lightdm-kde-greeter.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm-kde-greeter"
Changes:
--------
--- /work/SRC/openSUSE:13.1/lightdm-kde-greeter/lightdm-kde-greeter.changes
2013-09-23 10:59:24.000000000 +0200
+++
/work/SRC/openSUSE:13.1/.lightdm-kde-greeter.new/lightdm-kde-greeter.changes
2013-10-02 20:31:02.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Oct 2 15:57:03 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Swap adjust-for-new-libqtlightdm-version.patch with upstream version:
+ FindQLightDM.cmake-Search-for-new-liblightdm-qt-3-as.patch
+- Drop kdebase4-wallpapers requires, and add kdebase4-workspace-branding
+ requires
+- Drop cmake workaround, and use macro from kde4-filesystem
+
+-------------------------------------------------------------------
Old:
----
adjust-for-new-libqtlightdm-version.patch
New:
----
FindQLightDM.cmake-Search-for-new-liblightdm-qt-3-as.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm-kde-greeter.spec ++++++
--- /var/tmp/diff_new_pack.PZOghU/_old 2013-10-02 20:31:02.000000000 +0200
+++ /var/tmp/diff_new_pack.PZOghU/_new 2013-10-02 20:31:02.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lightdm-kde-greeter
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Guido Berhoerster.
#
# All modifications and additions to the file contributed by third parties
@@ -16,20 +16,21 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: lightdm-kde-greeter
Version: 0.3.2.1
Release: 0
-License: GPL-3.0+
Summary: KDE Qt-based Greeter for LightDM
-Url: https://projects.kde.org/projects/playground/base/lightdm
+License: GPL-3.0+
Group: System/X11/Displaymanagers
+Url: https://projects.kde.org/projects/playground/base/lightdm
Source0: lightdm-kde-%{version}.tar.bz2
-# PATCH-FIX-OPENSUSE adjust-for-new-libqtlightdm-version.patch -- Change
includes/libraries searching for new libqtlightdm so
-Patch0: adjust-for-new-libqtlightdm-version.patch
+# PATCH-FIX-UPSTREAM
FindQLightDM.cmake-Search-for-new-liblightdm-qt-3-as.patch -- Change
includes/libraries searching for new libqtlightdm so
+Patch0: FindQLightDM.cmake-Search-for-new-liblightdm-qt-3-as.patch
BuildRequires: libkde4-devel
BuildRequires: lightdm-qt-devel >= 1.4.0
BuildRequires: pkgconfig(QtGui)
-Requires: kdebase4-wallpapers
+Requires: kdebase4-workspace-branding = %{_kde_branding_version}
Requires: lightdm >= 1.4.0
Provides: lightdm-greeter = %{version}
Recommends: %{name}-lang = %{version}
@@ -51,20 +52,11 @@
%endif
%build
-###Buildflags are usually exported in kde4-filesystem, but LDFLAGS
-Wl,-Bsymbolic-functions are causing kde#303576
-export CFLAGS=$RPM_OPT_FLAGS
-export CXXFLAGS=$RPM_OPT_FLAGS
-_kde_libsuffix=$(echo %_lib | cut -b4-)
-mkdir build
-cd build
-cmake -DCMAKE_SKIP_RPATH=on -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix}
-DLIBEXEC_INSTALL_DIR_PATH=%{_kde4_libexecdir} \
- -DLIB_SUFFIX="$_kde_libsuffix" -DCMAKE_BUILD=TYPE=%{_kde_build_type} ..
+%cmake_kde4 -d build
%make_jobs
%install
-pushd build
-%kde4_makeinstall
-popd
+%kde4_makeinstall -C build
%find_lang lightdm_theme_classic %{name}.lang
%find_lang kcm_lightdm %{name}.lang
++++++ FindQLightDM.cmake-Search-for-new-liblightdm-qt-3-as.patch ++++++
>From dacd25fc53ecfd8928464420c21ff52b660a0893 Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.l...@canonical.com>
Date: Thu, 1 Aug 2013 21:37:48 +1000
Subject: [PATCH 1/1] FindQLightDM.cmake: Search for new liblightdm-qt-3 as
well as old liblightdm-qt-2
BUG: 319480
---
cmake/modules/FindQLightDM.cmake | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/cmake/modules/FindQLightDM.cmake b/cmake/modules/FindQLightDM.cmake
index c055c61..f901cf6 100644
--- a/cmake/modules/FindQLightDM.cmake
+++ b/cmake/modules/FindQLightDM.cmake
@@ -19,10 +19,19 @@ set(QLIGHTDM_LIBRARIES_FIND_REQUIRED
${QLightDM_FIND_REQUIRED})
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
if (QLIGHTDM_MIN_VERSION)
- PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION})
+ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3>=${QLIGHTDM_MIN_VERSION})
else (QLIGHTDM_MIN_VERSION)
- PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2)
+ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3)
endif (QLIGHTDM_MIN_VERSION)
+ SET (QLIGHTDM_API 3)
+ if (NOT PC_QLIGHTDM_FOUND)
+ if (QLIGHTDM_MIN_VERSION)
+ PKG_CHECK_MODULES(PC_QLIGHTDM
liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION})
+ else (QLIGHTDM_MIN_VERSION)
+ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2)
+ endif (QLIGHTDM_MIN_VERSION)
+ SET (QLIGHTDM_API 2)
+ endif (NOT PC_QLIGHTDM_FOUND)
endif(PKG_CONFIG_FOUND)
@@ -34,7 +43,7 @@ find_path(QLIGHTDM_INCLUDE_DIR
)
find_library(QLIGHTDM_LIBRARIES
- NAMES lightdm-qt-2
+ NAMES lightdm-qt-${QLIGHTDM_API}
HINTS
${PC_QLIGHTDM_LIBDIR}
${PC_QLIGHTDM_LIBRARY_DIRS}
--
1.8.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
