Hello community, here is the log from the commit of package lxqt-about for openSUSE:Factory checked in at 2015-02-16 21:08:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-about (Old) and /work/SRC/openSUSE:Factory/.lxqt-about.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxqt-about" Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-about/lxqt-about.changes 2015-02-03 11:39:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lxqt-about.new/lxqt-about.changes 2015-02-16 21:08:05.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 9 16:56:04 UTC 2015 - sfalken@opensuse.org + +- New upstream version 0.9.0 + +------------------------------------------------------------------- Old: ---- lxqt-about-0.8.0.tar.xz New: ---- lxqt-about-0.9.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-about.spec ++++++ --- /var/tmp/diff_new_pack.M7atpl/_old 2015-02-16 21:08:06.000000000 +0100 +++ /var/tmp/diff_new_pack.M7atpl/_new 2015-02-16 21:08:06.000000000 +0100 @@ -17,16 +17,17 @@ Name: lxqt-about -Version: 0.8.0 +Version: 0.9.0 Release: 0 Summary: About Dialog License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/LXDE-Qt Url: http://www.lxde.org -Source: %{name}-%{version}.tar.xz +Source: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz BuildRequires: cmake -BuildRequires: pkgconfig(lxqt-qt5) >= 0.8.0 +BuildRequires: kwindowsystem-devel BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(lxqt) >= %{version} Requires(pre): desktop-file-utils Requires(post): desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,7 +42,6 @@ mkdir build pushd build cmake \ - -DUSE_QT5=ON \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ .. %__make %{?_smp_mflags} ++++++ lxqt-about-0.8.0.tar.xz -> lxqt-about-0.9.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-about-0.8.0/CMakeLists.txt new/lxqt-about-0.9.0/CMakeLists.txt --- old/lxqt-about-0.8.0/CMakeLists.txt 2014-06-01 06:56:02.000000000 +0200 +++ new/lxqt-about-0.9.0/CMakeLists.txt 2015-01-11 19:44:39.000000000 +0100 @@ -1,114 +1,60 @@ -cmake_minimum_required( VERSION 2.6 ) +cmake_minimum_required(VERSION 2.8.11) project(lxqt-about) -set(H_FILES -) - -set(MOC_FILES -) - set(CPP_FILES main.cpp ) - -set(UI_FILES -) - -set(QRC_FILES - -) - -cmake_minimum_required( VERSION 2.6 ) - -option(USE_QT5 "Force use the Qt5." $ENV{USE_QT5}) -option(USE_QT4 "Force use the Qt4." $ENV{USE_QT4}) - -if((USE_QT4 AND USE_QT5) OR - (NOT USE_QT4 AND NOT USE_QT5)) - - # Autodetect Qt version - find_package(Qt4 QUIET) - if (QT4_FOUND) - set(USE_QT4 ON) - set(USE_QT5 OFF) - else() - set(USE_QT4 OFF) - set(USE_QT5 ON) - endif() -endif() - -if(USE_QT5) - find_package(Qt5Widgets REQUIRED QUIET) - find_package(Qt5DBus REQUIRED QUIET) - find_package(Qt5X11Extras REQUIRED QUIET) - find_package(lxqt-qt5 REQUIRED QUIET) - include(${LXQT_USE_FILE}) - - qt5_wrap_cpp(MOC_SOURCES ${MOC_FILES}) - qt5_wrap_ui(UI_HEADERS ${UI_FILES}) - qt5_add_resources(QRC_SOURCES ${QRC_FILES}) - - set(QTX_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5DBus_LIBRARIES} ${Qt5X11Extras_LIBRARIES}) -else() - find_package(Qt4 REQUIRED QtCore QtGui QUIET) - find_package(LXQT REQUIRED QUIET) - include(${LXQT_USE_FILE}) - - qt4_wrap_cpp(MOC_SOURCES ${MOC_FILES}) - qt4_wrap_ui(UI_HEADERS ${UI_FILES}) - qt4_add_resources(QRC_SOURCES ${QRC_FILES}) - - set(QTX_LIBRARIES ${QT_LIBRARIES}) -endif() - +find_package(Qt5Widgets REQUIRED QUIET) +find_package(Qt5DBus REQUIRED QUIET) +find_package(Qt5X11Extras REQUIRED QUIET) +find_package(lxqt REQUIRED QUIET) +include(${LXQT_USE_FILE}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} - ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${LXQT_INCLUDE_DIR} ) - if(NOT CMAKE_BUILD_TYPE) - set( CMAKE_BUILD_TYPE Release ) -endif (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +endif() set(APP_SHARE_DIR share/lxqt/${PROJECT_NAME}) -#************************************************ - # Translations ********************************** +include(LXQtTranslateDesktop) lxqt_translate_desktop(DESKTOP_FILES SOURCES - resources/lxqt-about.desktop.in + resources/lxqt-about.desktop.in ) #************************************************ add_executable(${PROJECT_NAME} ${CPP_FILES} - ${UI_FILES} - ${RESOURCES} - ${QRC_SOURCES} ${QM_FILES} - ${MOC_SOURCES} ${DESKTOP_FILES} ) -#add_dependencies(${PROJECT_NAME} ${LXQT_LIBRARIES}) -target_link_libraries(${PROJECT_NAME} ${QTX_LIBRARIES} ${LXQT_LIBRARIES}) + +target_link_libraries(${PROJECT_NAME} + Qt5::Widgets + Qt5::DBus + Qt5::X11Extras + ${LXQT_LIBRARIES} +) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) -install(FILES ${CONFIG_FILES} DESTINATION ${APP_SHARE_DIR}) -install(FILES ${DESKTOP_FILES} DESTINATION share/applications) +install(FILES ${CONFIG_FILES} DESTINATION ${APP_SHARE_DIR}) +install(FILES ${DESKTOP_FILES} DESTINATION share/applications) # building tarball with CPack ------------------------------------------------- -include (InstallRequiredSystemLibraries) -set (CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION}) -set (CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION}) -set (CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION}) -set (CPACK_GENERATOR TBZ2) -set (CPACK_SOURCE_GENERATOR TBZ2) -set (CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp) -include (CPack) +include(InstallRequiredSystemLibraries) +set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION}) +set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION}) +set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION}) +set(CPACK_GENERATOR TBZ2) +set(CPACK_SOURCE_GENERATOR TBZ2) +set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp) +include(CPack) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-about-0.8.0/translations/lxqt-about_fr.desktop new/lxqt-about-0.9.0/translations/lxqt-about_fr.desktop --- old/lxqt-about-0.8.0/translations/lxqt-about_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-about-0.9.0/translations/lxqt-about_fr.desktop 2015-01-11 19:44:39.000000000 +0100 @@ -0,0 +1,3 @@ +# Translations +GenericName[fr]=À propos de LXQt +Name[fr]=À propos de LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-about-0.8.0/translations/lxqt-about_ja.desktop new/lxqt-about-0.9.0/translations/lxqt-about_ja.desktop --- old/lxqt-about-0.8.0/translations/lxqt-about_ja.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-about-0.9.0/translations/lxqt-about_ja.desktop 2015-01-11 19:44:39.000000000 +0100 @@ -0,0 +1,3 @@ +# Translations +GenericName[ja]=LXQtについて +Name[ja]=LXQtについて diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-about-0.8.0/translations/lxqt-about_pt.desktop new/lxqt-about-0.9.0/translations/lxqt-about_pt.desktop --- old/lxqt-about-0.8.0/translations/lxqt-about_pt.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-about-0.9.0/translations/lxqt-about_pt.desktop 2015-01-11 19:44:39.000000000 +0100 @@ -0,0 +1,4 @@ +# Translations +Name[pt]=Sobre o LxQt +GenericName[pt]=Sobre o LxQt +Comment[pt]=Saber mais sobre o LxQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-about-0.8.0/translations/lxqt-about_ru.desktop new/lxqt-about-0.9.0/translations/lxqt-about_ru.desktop --- old/lxqt-about-0.8.0/translations/lxqt-about_ru.desktop 2014-06-01 06:56:02.000000000 +0200 +++ new/lxqt-about-0.9.0/translations/lxqt-about_ru.desktop 2015-01-11 19:44:39.000000000 +0100 @@ -1,3 +1,3 @@ # Translations -GenericName[ru]=Узнать больше о LXDE-Qt -Name[ru]=О LXDE-Qt +GenericName[ru]=Узнать больше о LXQt +Name[ru]=О LXQt -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org