Hello community, here is the log from the commit of package keepassx for openSUSE:Factory checked in at 2016-02-16 09:18:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/keepassx (Old) and /work/SRC/openSUSE:Factory/.keepassx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "keepassx" Changes: -------- --- /work/SRC/openSUSE:Factory/keepassx/keepassx.changes 2016-02-12 11:22:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.keepassx.new/keepassx.changes 2016-02-16 09:18:42.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 11 14:15:03 UTC 2016 - mplus...@suse.com + +- Use cmake macros +- Add patch for https://www.keepassx.org/dev/issues/389 + * keepassx-fix-undefined-libraries.patch + +------------------------------------------------------------------- New: ---- keepassx-fix-undefined-libraries.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keepassx.spec ++++++ --- /var/tmp/diff_new_pack.YixCwZ/_old 2016-02-16 09:18:43.000000000 +0100 +++ /var/tmp/diff_new_pack.YixCwZ/_new 2016-02-16 09:18:43.000000000 +0100 @@ -24,6 +24,9 @@ Group: Productivity/Security Url: http://www.keepassx.org/ Source: https://www.keepassx.org/releases/%{version}/keepassx-%{version}.tar.gz +# PATCH-FIX-UPSTREAM keepassx-fix-undefined-libraries.patch +# https://www.keepassx.org/dev/issues/389 +Patch0: keepassx-fix-undefined-libraries.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: libXtst-devel @@ -43,34 +46,24 @@ %prep %setup -q +%patch0 -p1 %build -mkdir -p build -pushd build -CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \ -cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -%if %{_lib} == lib64 - -DLIB_SUFFIX=64 \ -%endif +export CFLAGS="%{optflags} -fPIC" +export CXXFLAGS="%{optflags} -fPIC" +%cmake \ -DWITH_CXX11=ON \ - -DWITH_LTO=ON \ - .. - -make %{?_smp_mflags} VERBOSE=1 + -DWITH_LTO=OM +make %{?_smp_mflags} %install -pushd build -%make_install +%cmake_install %suse_update_desktop_file %{name} X-SuSE-DesktopUtility %fdupes %{buildroot}/%{_prefix} %check -pushd build -make test +make -C build test %files %defattr(-,root,root) ++++++ keepassx-fix-undefined-libraries.patch ++++++ Index: keepassx-2.0.2/src/autotype/x11/CMakeLists.txt =================================================================== --- keepassx-2.0.2.orig/src/autotype/x11/CMakeLists.txt +++ keepassx-2.0.2/src/autotype/x11/CMakeLists.txt @@ -11,7 +11,13 @@ set(autotype_X11_MOC qt4_wrap_cpp(autotype_X11_SOURCES ${autotype_X11_MOC}) add_library(keepassx-autotype-x11 MODULE ${autotype_X11_SOURCES}) -target_link_libraries(keepassx-autotype-x11 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_XTest_LIB}) +target_link_libraries(keepassx-autotype-x11 + keepassx_core + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${X11_X11_LIB} + ${X11_Xi_LIB} + ${X11_XTest_LIB}) install(TARGETS keepassx-autotype-x11 BUNDLE DESTINATION . COMPONENT Runtime LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR} COMPONENT Runtime) Index: keepassx-2.0.2/src/autotype/test/CMakeLists.txt =================================================================== --- keepassx-2.0.2.orig/src/autotype/test/CMakeLists.txt +++ keepassx-2.0.2/src/autotype/test/CMakeLists.txt @@ -9,4 +9,8 @@ set(autotype_test_MOC qt4_wrap_cpp(autotype_test_SOURCES ${autotype_test_MOC}) add_library(keepassx-autotype-test MODULE ${autotype_test_SOURCES}) -target_link_libraries(keepassx-autotype-test testautotype ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) +target_link_libraries(keepassx-autotype-test + testautotype + keepassx_core + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY})
