commit lxqt-policykit for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package lxqt-policykit for openSUSE:Factory checked in at 2015-02-16 21:11:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lxqt-policykit (Old)
and /work/SRC/openSUSE:Factory/.lxqt-policykit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-policykit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lxqt-policykit/lxqt-policykit.changes 2015-02-03 11:39:59.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.lxqt-policykit.new/lxqt-policykit.changes 2015-02-16 21:11:53.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Feb 9 20:54:55 UTC 2015 - sfalken@opensuse.org
+
+- New upstream version 0.9.0
+- Added -lang subpackage
+
+-------------------------------------------------------------------
Old:
----
lxqt-policykit-0.8.0.tar.xz
New:
----
lxqt-policykit-0.9.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxqt-policykit.spec ++++++
--- /var/tmp/diff_new_pack.dUlZCU/_old 2015-02-16 21:11:53.000000000 +0100
+++ /var/tmp/diff_new_pack.dUlZCU/_new 2015-02-16 21:11:53.000000000 +0100
@@ -17,26 +17,30 @@
Name: lxqt-policykit
-Version: 0.8.0
+Version: 0.9.0
Release: 0
Summary: PolicyKit authentication agent
License: 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: fdupes
BuildRequires: gcc-c++
-BuildRequires: pkgconfig(Qt5Xdg)
-BuildRequires: pkgconfig(lxqt-globalkeys-qt5)
-BuildRequires: pkgconfig(lxqt-qt5) >= 0.8.0
-BuildRequires: pkgconfig(polkit-qt5-core-1)
+BuildRequires: kwindowsystem-devel
BuildRequires: pkgconfig(Qt5UiTools)
+BuildRequires: pkgconfig(Qt5Xdg)
+BuildRequires: pkgconfig(lxqt) >= %{version}
+BuildRequires: pkgconfig(lxqt-globalkeys) = %{version}
BuildRequires: pkgconfig(polkit-agent-1)
+BuildRequires: pkgconfig(polkit-qt5-core-1)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
PolicyKit authentication agent for LXDE-Qt
+%lang_package
+
%prep
%setup -q
@@ -44,7 +48,6 @@
mkdir build
pushd build
cmake \
- -DUSE_QT5=ON \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
..
%__make %{?_smp_mflags}
@@ -54,10 +57,15 @@
pushd build
make DESTDIR=$RPM_BUILD_ROOT install
popd
+%fdupes -s %{buildroot}%{_datadir}
%files
%defattr(-,root,root)
%doc AUTHORS COPYING
%{_bindir}/lxqt-policykit-agent
+%files -n %{name}-lang
+%defattr(-,root,root)
+%{_datadir}/lxqt/translations
+
%changelog
++++++ lxqt-policykit-0.8.0.tar.xz -> lxqt-policykit-0.9.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-policykit-0.8.0/CMakeLists.txt new/lxqt-policykit-0.9.0/CMakeLists.txt
--- old/lxqt-policykit-0.8.0/CMakeLists.txt 2014-06-28 19:21:37.000000000 +0200
+++ new/lxqt-policykit-0.9.0/CMakeLists.txt 2015-01-19 13:57:00.000000000 +0100
@@ -1,128 +1,105 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 2.8.11)
project(lxqt-policykit-agent)
-# additional cmake files
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
-# Support different versions of Qt
-option(USE_QT5 "Build with Qt5." $ENV{USE_QT5})
-
-# find Qt binding of polkit
-if(USE_QT5)
- find_package(PolkitQt5-1) # Qt5 version
-else()
- find_package(PolkitQt-1) # Qt4 version
+find_package(PkgConfig)
+pkg_check_modules(POLKIT_AGENT REQUIRED polkit-agent-1)
+message(STATUS "polkit agent: ${POLKIT_AGENT_INCLUDE_DIRS} ${POLKIT_AGENT_LIBRARIES}")
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_AUTOMOC ON)
+
+find_package(PolkitQt5-1 REQUIRED)
+find_package(Qt5Widgets REQUIRED QUIET)
+find_package(Qt5LinguistTools REQUIRED QUIET)
+find_package(lxqt REQUIRED QUIET)
+find_package(qt5xdg REQUIRED QUIET)
+
+include(${LXQT_USE_FILE})
+include(${QTXDG_USE_FILE})
+
+include(LXQtTranslate)
+
+# Deal with a bug in polkit-qt5
+if (NOT IS_ABSOLUTE "${POLKITQT-1_INCLUDE_DIR}")
+ set(POLKITQT-1_INCLUDE_DIR "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_INCLUDE_DIR}")
+ set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_AGENT_LIBRARY}")
+ set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_CORE_LIBRARY}")
endif()
-
-if (NOT POLKITQT-1_LIB_DIR AND NOT POLKITQT-1_INCLUDE_DIR)
- message(WARNING "Qt bindings for policykit are not found. LxQt policykit integration won't be built")
- message(STATUS "Hint: package libpolkit-qt-1-devel on openSUSE")
-else ()
- # Deal with a bug in polkit-qt5
- if (NOT IS_ABSOLUTE "${POLKITQT-1_INCLUDE_DIR}")
- set(POLKITQT-1_INCLUDE_DIR "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_INCLUDE_DIR}")
- set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_AGENT_LIBRARY}")
- set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_CORE_LIBRARY}")
- endif()
- message(STATUS "PolkitQt-1: ${POLKITQT-1_VERSION_STRING}")
- message(STATUS " install: ${POLKITQT-1_INSTALL_DIR}")
- message(STATUS " libs: ${POLKITQT-1_CORE_LIBRARY} ${POLKITQT-1_AGENT_LIBRARY}")
- message(STATUS " include: ${POLKITQT-1_INCLUDE_DIR}")
-
- find_package(PkgConfig)
- pkg_check_modules(POLKIT_AGENT REQUIRED polkit-agent-1)
- message(STATUS "polkit agent: ${POLKIT_AGENT_INCLUDE_DIRS} ${POLKIT_AGENT_LIBRARIES}")
-
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- set(CMAKE_AUTOMOC ON)
- if(USE_QT5)
- find_package(Qt5Widgets REQUIRED QUIET)
- find_package(Qt5LinguistTools REQUIRED QUIET)
- find_package(lxqt-qt5 REQUIRED QUIET)
- find_package(qt5xdg REQUIRED QUIET)
- set(QTX_INCLUDE_DIRS ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR})
- set(QTX_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
- else()
- find_package(Qt4 REQUIRED)
- include(${QT_USE_FILE})
- find_package(LXQT REQUIRED)
- find_package(QTXDG REQUIRED QUIET)
- set(QTX_INCLUDE_DIRS ${Qt5Widgets_INCLUDE_DIR})
- set(QTX_LIBRARIES ${Qt5Widgets_LIBRARY})
- endif()
- include(${LXQT_USE_FILE})
- include(${QTXDG_USE_FILE})
-
- # TODO/FIXME: pkg-config for hardcoded paths
- # pkg-config --cflags glib-2.0
- # pkg-config --cflags polkit-agent-1
- include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/src
- ${CMAKE_CURRENT_BINARY_DIR}
- ${POLKIT_AGENT_INCLUDE_DIRS}
- ${POLKITQT-1_INCLUDE_DIR}
- ${QTX_INCLUDE_DIR}
- )
-
- set(lxqt-policykit-agent_SRCS
- src/main.cpp
- src/policykitagent.cpp
- src/policykitagentgui.cpp
- )
-
- set(lxqt-policykit-agent_H
- src/policykitagent.h
- src/policykitagentgui.h
- )
-
- set(lxqt-policykit-agent_UI
- src/policykitagentgui.ui
- )
-
- # Translations **********************************
- include(LxQtTranslate)
- lxqt_translate_ts(lxqt-policykit-agent_QM_FILES
- SOURCES
- ${lxqt-policykit-agent_H}
- ${lxqt-policykit-agent_SRCS}
- ${lxqt-policykit-agent_UI}
- )
- #************************************************
-
- if(USE_QT5)
- qt5_wrap_ui(lxqt-policykit-agent_UI_CPP ${lxqt-policykit-agent_UI})
- else()
- qt4_wrap_ui(lxqt-policykit-agent_UI_CPP ${lxqt-policykit-agent_UI})
- endif()
-
- add_executable(lxqt-policykit-agent
+message(STATUS "PolkitQt-1: ${POLKITQT-1_VERSION_STRING}")
+message(STATUS " install: ${POLKITQT-1_INSTALL_DIR}")
+message(STATUS " libs: ${POLKITQT-1_CORE_LIBRARY} ${POLKITQT-1_AGENT_LIBRARY}")
+message(STATUS " include: ${POLKITQT-1_INCLUDE_DIR}")
+
+# TODO/FIXME: pkg-config for hardcoded paths
+# pkg-config --cflags glib-2.0
+# pkg-config --cflags polkit-agent-1
+include_directories(
+ "${CMAKE_CURRENT_SOURCE_DIR}/src"
+ "${CMAKE_CURRENT_BINARY_DIR}"
+ ${POLKIT_AGENT_INCLUDE_DIRS}
+ "${POLKITQT-1_INCLUDE_DIR}"
+)
+
+set(lxqt-policykit-agent_SRCS
+ src/main.cpp
+ src/policykitagent.cpp
+ src/policykitagentgui.cpp
+)
+
+set(lxqt-policykit-agent_H
+ src/policykitagent.h
+ src/policykitagentgui.h
+)
+
+set(lxqt-policykit-agent_UI
+ src/policykitagentgui.ui
+)
+
+# Translations
+lxqt_translate_ts(lxqt-policykit-agent_QM_FILES
+ UPDATE_TRANSLATIONS
+ ${UPDATE_TRANSLATIONS}
+ SOURCES
+ ${lxqt-policykit-agent_H}
${lxqt-policykit-agent_SRCS}
- ${lxqt-policykit-agent_MOCS}
- ${lxqt-policykit-agent_UI_CPP}
- ${lxqt-policykit-agent_QM_FILES}
- )
-
- target_link_libraries(lxqt-policykit-agent
- ${QTX_LIBRARY}
- ${QTXDG_LIBRARY}
- ${LXQT_LIBRARIES}
- ${POLKITQT-1_CORE_LIBRARY}
- ${POLKITQT-1_AGENT_LIBRARY}
- ${POLKIT_AGENT_LIBRARIES}
- )
+ ${lxqt-policykit-agent_UI}
+ INSTALL_DIR
+ "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}"
+)
+
+lxqt_app_translation_loader(QM_LOADER ${PROJECT_NAME})
+
+qt5_wrap_ui(lxqt-policykit-agent_UI_CPP ${lxqt-policykit-agent_UI})
+
+add_executable(lxqt-policykit-agent
+ ${lxqt-policykit-agent_SRCS}
+ ${lxqt-policykit-agent_MOCS}
+ ${lxqt-policykit-agent_UI_CPP}
+ ${lxqt-policykit-agent_QM_FILES}
+ ${QM_LOADER}
+)
+
+target_link_libraries(lxqt-policykit-agent
+ Qt5::Widgets
+ ${QTXDG_LIBRARY}
+ ${LXQT_LIBRARIES}
+ ${POLKITQT-1_CORE_LIBRARY}
+ ${POLKITQT-1_AGENT_LIBRARY}
+ ${POLKIT_AGENT_LIBRARIES}
+)
- # install
- install(TARGETS lxqt-policykit-agent DESTINATION bin)
-
-endif()
+# install
+install(TARGETS lxqt-policykit-agent DESTINATION bin)
# 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-policykit-0.8.0/cmake/LxQtTranslate.cmake new/lxqt-policykit-0.9.0/cmake/LxQtTranslate.cmake
--- old/lxqt-policykit-0.8.0/cmake/LxQtTranslate.cmake 2014-06-28 19:21:37.000000000 +0200
+++ new/lxqt-policykit-0.9.0/cmake/LxQtTranslate.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,279 +0,0 @@
-# funtion lxqt_translate_ts(qm_files
-# SOURCES sources ...
-# [TRANSLATION_DIR] translation_directory
-# [INSTALLATION_DIR] qm_install_directory
-# )
-# out: qm_files
-# generates commands to create .ts.src and .qm files from sources.
-# The generated filenames can be found in qm_files.
-#
-# in: sources
-# List of the h, cpp and ui files
-#
-# in: translation_directory
-# A relative path to the directory with .ts files, it is relative
-# to the CMakeList.txt. By default is "translations"
-#
-# in: qm_install_directory
-# A full path to the directory n which will be installed .qm files.
-# By default is "${CMAKE_INSTALL_PREFIX}/share/lxqt/${PROJECT_NAME}"
-
-if(USE_QT5)
- get_target_property(QT_LRELEASE_EXECUTABLE ${Qt5_LRELEASE_EXECUTABLE} LOCATION)
- get_target_property(QT_LUPDATE_EXECUTABLE ${Qt5_LUPDATE_EXECUTABLE} LOCATION)
-endif()
-
-MACRO(QTX_ADD_TRANSLATION_FIXED _qm_files)
- FOREACH (_current_FILE ${ARGN})
- GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
- GET_FILENAME_COMPONENT(qm ${_abs_FILE} NAME)
- #Extract the real extension ............
- STRING(REPLACE ".ts" "" qm ${qm})
- GET_SOURCE_FILE_PROPERTY(output_location ${_abs_FILE} OUTPUT_LOCATION)
- IF(output_location)
- FILE(MAKE_DIRECTORY "${output_location}")
- SET(qm "${output_location}/${qm}.qm")
- ELSE(output_location)
- SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
- ENDIF(output_location)
-
- ADD_CUSTOM_COMMAND(OUTPUT ${qm}
- COMMAND ${QT_LRELEASE_EXECUTABLE}
- ARGS -silent -removeidentical ${_abs_FILE} -qm ${qm}
- DEPENDS ${_abs_FILE}
- )
- SET(${_qm_files} ${${_qm_files}} ${qm})
- ENDFOREACH (_current_FILE)
-ENDMACRO(QTX_ADD_TRANSLATION_FIXED)
-
-if(NOT TARGET UpdateTsFiles)
- add_custom_target(UpdateTsFiles DEPENDS)
-endif()
-
-if(NOT TARGET UpdateTxFile)
- file(WRITE ${CMAKE_BINARY_DIR}/tx/_updateTxFile.sh
- "echo '[main]'\n"
- "echo 'host = https://www.transifex.com'\n"
- "echo 'minimum_perc = 1'\n"
- "echo ''\n"
- "for f in `ls ${CMAKE_BINARY_DIR}/tx/*.tx.sh`; do\n"
- " sh $f;\n"
- "done\n"
- )
-
- add_custom_target(UpdateTxFile
- COMMAND sh ${CMAKE_BINARY_DIR}/tx/_updateTxFile.sh > ${CMAKE_SOURCE_DIR}/.tx/config
- )
-endif()
-
-
-function(lxqt_translate_ts _qmFiles)
- set(_translationDir "translations")
- set(_installDir "${CMAKE_INSTALL_PREFIX}/share/lxqt/${PROJECT_NAME}")
-
- # Parse arguments ***************************************
- set(_state "")
- foreach (_arg ${ARGN})
- if (
- ("${_arg}_I_HATE_CMAKE" STREQUAL "SOURCES_I_HATE_CMAKE") OR
- ("${_arg}_I_HATE_CMAKE" STREQUAL "TRANSLATION_DIR_I_HATE_CMAKE") OR
- ("${_arg}_I_HATE_CMAKE" STREQUAL "INSTALLATION_DIR_I_HATE_CMAKE") OR
- ("${_arg}_I_HATE_CMAKE" STREQUAL "TS_SRC_FILE_I_HATE_CMAKE")
- )
- set(_state ${_arg})
-
- else()
- if("${_state}" STREQUAL "SOURCES")
- get_filename_component (__file ${_arg} ABSOLUTE)
- set(_sources ${_sources} ${__file})
- set(_sourcesSpace "${_sourcesSpace} ${__file}")
-
- elseif("${_state}" STREQUAL "TRANSLATION_DIR")
- set(_translationDir ${_arg})
- set(_state "")
-
- elseif("${_state}" STREQUAL "INSTALLATION_DIR")
- set(_installDir ${_arg})
- set(_state "")
-
- elseif("${_state}" STREQUAL "TS_SRC_FILE")
- set(_tsSrcFile ${_arg})
- set(_state "")
-
- else()
- MESSAGE(FATAL_ERROR
- "Unknown argument '${_arg}'.\n"
- "See ${CMAKE_CURRENT_LIST_FILE} for more information.\n"
- )
- endif()
- endif()
- endforeach(_arg)
-
- get_filename_component (_translationDir ${_translationDir} ABSOLUTE)
- if ("${_tsSrcFile}" STREQUAL "")
- set(_tsSrcFile "${_translationDir}/${PROJECT_NAME}.ts.src")
- endif()
-
- get_filename_component (_tsSrcFile ${_tsSrcFile} ABSOLUTE)
- get_filename_component (_tsSrcFileName ${_tsSrcFile} NAME)
- get_filename_component (_tsSrcFileNameWE ${_tsSrcFile} NAME_WE)
-
- # TS.SRC file *******************************************
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/updateTsFile.sh
- "#/bin/sh\n"
- "\n"
- "mkdir -p ${_translationDir} 2>/dev/null\n"
- "cd ${_translationDir} && "
- "${QT_LUPDATE_EXECUTABLE} -locations none -target-language en_US ${_sourcesSpace} -ts ${_tsSrcFile}.ts &&"
- "mv ${_tsSrcFile}.ts ${_tsSrcFile}\n"
- "grep -q 'source' '${_tsSrcFile}' || rm '${_tsSrcFile}'\n"
- )
-
- add_custom_target(Update_${_tsSrcFileName}
- COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/updateTsFile.sh
- DEPENDS ${_sources}
- VERBATIM
- )
-
- add_dependencies(UpdateTsFiles Update_${_tsSrcFileName})
-
- # TX file ***********************************************
- set(_txFile "${CMAKE_BINARY_DIR}/tx/${_tsSrcFileName}.tx.sh")
- string(REPLACE "${CMAKE_SOURCE_DIR}/" "" _tx_translationDir ${_translationDir})
- string(REPLACE "${CMAKE_SOURCE_DIR}/" "" _tx_tsSrcFile ${_tsSrcFile})
-
- file(WRITE ${_txFile}
- "[ -f ${_tsSrcFile} ] || exit 0\n"
- "echo '[lxde-qt.${_tsSrcFileNameWE}]'\n"
- "echo 'type = QT'\n"
- "echo 'source_lang = en'\n"
- "echo 'source_file = ${_tx_tsSrcFile}'\n"
- "echo 'file_filter = ${_tx_translationDir}/${_tsSrcFileNameWE}_<lang>.ts'\n"
- "echo ''\n"
- )
-
- # translate.h file *************************************
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lxqttranslate.h
- "#ifndef LXQT_TRANSLATE_H\n"
- "#include
participants (1)
-
root@hilbert.suse.de