Hello community, here is the log from the commit of package albert for openSUSE:Factory checked in at 2017-02-08 11:04:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/albert (Old) and /work/SRC/openSUSE:Factory/.albert.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "albert" Changes: -------- --- /work/SRC/openSUSE:Factory/albert/albert.changes 2016-08-03 11:44:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.albert.new/albert.changes 2017-02-08 11:04:26.950566380 +0100 @@ -1,0 +2,8 @@ +Mon Feb 6 19:20:22 UTC 2017 - [email protected] + +- Update to version 0.9.3: + * No changelog available. +- Add albert-fix-libdir.patch: Install libraries into a correct + directory. + +------------------------------------------------------------------- Old: ---- albert-0.8.10.tar.gz New: ---- albert-0.9.3.tar.gz albert-fix-libdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ albert.spec ++++++ --- /var/tmp/diff_new_pack.L4rFWN/_old 2017-02-08 11:04:27.634471032 +0100 +++ /var/tmp/diff_new_pack.L4rFWN/_new 2017-02-08 11:04:27.634471032 +0100 @@ -1,7 +1,7 @@ # # spec file for package albert # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,24 +17,29 @@ Name: albert -Version: 0.8.10 +Version: 0.9.3 Release: 0 Summary: Desktop agnostic launcher License: GPL-3.0+ Group: System/GUI/Other -Url: https://github.com/ManuelSchneid3r/albert -Source: https://github.com/ManuelSchneid3r/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Url: https://github.com/albertlauncher/albert +Source: https://github.com/albertlauncher/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE albert-fix-libdir.patch [email protected] -- Install libraries into a correct directory. +Patch0: %{name}-fix-libdir.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2 BuildRequires: pkgconfig(Qt5Core) >= 5.2 BuildRequires: pkgconfig(Qt5Gui) >= 5.2 BuildRequires: pkgconfig(Qt5Network) >= 5.2 +BuildRequires: pkgconfig(Qt5Sql) >= 5.2 BuildRequires: pkgconfig(Qt5Svg) >= 5.2 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2 +BuildRequires: pkgconfig(Qt5Xml) >= 5.2 BuildRequires: pkgconfig(muparser) %description @@ -44,20 +49,17 @@ %prep %setup -q +%patch0 -p1 %build %cmake \ - -DCMAKE_SHARED_LINKER_FLAGS="" -make %{?_smp_mflags} + -DCMAKE_SHARED_LINKER_FLAGS="" \ + -DCMAKE_SKIP_RPATH=OFF +make %{?_smp_mflags} V=1 %install %cmake_install -# Libraries should not be in /usr/share/. -mkdir -p %{buildroot}%{_libdir}/%{name}/ -mv -f %{buildroot}%{_datadir}/%{name}/plugins/ %{buildroot}%{_libdir}/%{name}/plugins/ -ln -s %{_libdir}/%{name}/plugins/ %{buildroot}%{_datadir}/%{name}/plugins - %suse_update_desktop_file %{name} Utility DesktopUtility %post @@ -72,8 +74,8 @@ %defattr(-,root,root) %doc README.md %{_bindir}/%{name} -%{_datadir}/%{name}/ %{_libdir}/%{name}/ +%{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* ++++++ albert-0.8.10.tar.gz -> albert-0.9.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/albert/albert-0.8.10.tar.gz /work/SRC/openSUSE:Factory/.albert.new/albert-0.9.3.tar.gz differ: char 12, line 1 ++++++ albert-fix-libdir.patch ++++++ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,10 @@ endif(CMAKE_BUILD_TYPE STREQUAL "Debug") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +if(NOT DEFINED LIB_INSTALL_DIR) + set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") +endif() + # Build project add_subdirectory(src/application/) add_subdirectory(src/lib/) --- a/src/application/CMakeLists.txt +++ b/src/application/CMakeLists.txt @@ -43,7 +43,7 @@ target_include_directories(${PROJECT_NAM ) # Set the RPATH so that libraries get found -set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/albert") +set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/albert") # Install target install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) --- a/src/lib/albert/CMakeLists.txt +++ b/src/lib/albert/CMakeLists.txt @@ -37,4 +37,4 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert") --- a/src/lib/globalshortcut/CMakeLists.txt +++ b/src/lib/globalshortcut/CMakeLists.txt @@ -42,4 +42,4 @@ target_include_directories(${PROJECT_NAM target_link_libraries(${PROJECT_NAME} PRIVATE ${LIB}) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert") --- a/src/lib/xdg/CMakeLists.txt +++ b/src/lib/xdg/CMakeLists.txt @@ -33,4 +33,4 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert") --- a/src/plugins/applications/CMakeLists.txt +++ b/src/plugins/applications/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins") --- a/src/plugins/calculator/CMakeLists.txt +++ b/src/plugins/calculator/CMakeLists.txt @@ -29,4 +29,4 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins") --- a/src/plugins/chromebookmarks/CMakeLists.txt +++ b/src/plugins/chromebookmarks/CMakeLists.txt @@ -32,4 +32,4 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins") --- a/src/plugins/debug/CMakeLists.txt +++ b/src/plugins/debug/CMakeLists.txt @@ -27,4 +27,4 @@ target_include_directories(${PROJECT_NAM target_link_libraries(${PROJECT_NAME} ${LIB}) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins") --- a/src/plugins/externalextensions/CMakeLists.txt +++ b/src/plugins/externalextensions/CMakeLists.txt @@ -26,4 +26,4 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins") --- a/src/plugins/files/CMakeLists.txt +++ b/src/plugins/files/CMakeLists.txt @@ -34,4 +34,4 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins") --- a/src/plugins/firefoxbookmarks/CMakeLists.txt +++ b/src/plugins/firefoxbookmarks/CMakeLists.txt @@ -34,4 +34,4 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins") --- a/src/plugins/system/CMakeLists.txt +++ b/src/plugins/system/CMakeLists.txt @@ -30,4 +30,4 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins") --- a/src/plugins/templateExtension/CMakeLists.txt +++ b/src/plugins/templateExtension/CMakeLists.txt @@ -25,4 +25,4 @@ target_include_directories(${PROJECT_NAM target_link_libraries(${PROJECT_NAME} ${LIB}) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins") --- a/src/plugins/terminal/CMakeLists.txt +++ b/src/plugins/terminal/CMakeLists.txt @@ -30,4 +30,4 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins") --- a/src/plugins/virtualbox/CMakeLists.txt +++ b/src/plugins/virtualbox/CMakeLists.txt @@ -30,4 +30,4 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins") --- a/src/plugins/websearch/CMakeLists.txt +++ b/src/plugins/websearch/CMakeLists.txt @@ -30,4 +30,4 @@ target_link_libraries(${PROJECT_NAME} ) # Install target -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
