Hello community,
here is the log from the commit of package lxqt-openssh-askpass for openSUSE:Factory checked in at 2015-02-16 21:12:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lxqt-openssh-askpass (Old)
and /work/SRC/openSUSE:Factory/.lxqt-openssh-askpass.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-openssh-askpass"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lxqt-openssh-askpass/lxqt-openssh-askpass.changes 2015-02-03 11:39:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.lxqt-openssh-askpass.new/lxqt-openssh-askpass.changes 2015-02-16 21:12:06.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Feb 9 20:19:39 UTC 2015 - sfalken@opensuse.org
+
+- New upstream version 0.9.0
+- Added -lang subpackage
+
+-------------------------------------------------------------------
Old:
----
lxqt-openssh-askpass-0.8.0.tar.xz
New:
----
lxqt-openssh-askpass-0.9.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxqt-openssh-askpass.spec ++++++
--- /var/tmp/diff_new_pack.nwYy2i/_old 2015-02-16 21:12:06.000000000 +0100
+++ /var/tmp/diff_new_pack.nwYy2i/_new 2015-02-16 21:12:06.000000000 +0100
@@ -17,21 +17,26 @@
Name: lxqt-openssh-askpass
-Version: 0.8.0
+Version: 0.9.0
Release: 0
Summary: Openssh password tool
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: fdupes
+BuildRequires: kwindowsystem-devel
BuildRequires: pkgconfig(Qt5UiTools)
-BuildRequires: pkgconfig(lxqt-qt5) >= 0.8.0
+BuildRequires: pkgconfig(lxqt) >= %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Tool that will prompt user for password when using openssh in lxqt
+%lang_package
+
+
%prep
%setup -q
@@ -49,10 +54,15 @@
pushd build
make DESTDIR=$RPM_BUILD_ROOT install
popd
+%fdupes -s %{buildroot}%{_datadir}
%files
%defattr(-,root,root)
%doc AUTHORS COPYING
%{_bindir}/%{name}
+%files -n %{name}-lang
+%defattr(-,root,root)
+%{_datadir}/lxqt/translations
+
%changelog
++++++ lxqt-openssh-askpass-0.8.0.tar.xz -> lxqt-openssh-askpass-0.9.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-openssh-askpass-0.8.0/CMakeLists.txt new/lxqt-openssh-askpass-0.9.0/CMakeLists.txt
--- old/lxqt-openssh-askpass-0.8.0/CMakeLists.txt 2014-07-01 00:41:18.000000000 +0200
+++ new/lxqt-openssh-askpass-0.9.0/CMakeLists.txt 2015-01-25 12:18:56.000000000 +0100
@@ -1,88 +1,87 @@
-cmake_minimum_required( VERSION 2.6 )
+cmake_minimum_required(VERSION 2.8.11)
+project(lxqt-openssh-askpass)
-# 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)
-project( lxqt-openssh-askpass )
-
-if (NOT CMAKE_BUILD_TYPE)
- set ( CMAKE_BUILD_TYPE Release )
-endif (NOT CMAKE_BUILD_TYPE)
+if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE Release)
+endif()
-add_definitions ( -Wall )
+add_definitions(-Wall)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-option(USE_QT5 "Build with Qt5." $ENV{USE_QT5})
-if(USE_QT5)
- find_package(Qt5Widgets REQUIRED QUIET)
- find_package(Qt5LinguistTools REQUIRED QUIET)
-
- find_package(lxqt-qt5 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)
- set(QTX_INCLUDE_DIRS ${Qt4Widgets_INCLUDE_DIR})
- set(QTX_LIBRARIES ${Qt4Widgets_LIBRARY})
-endif()
+find_package(Qt5Widgets REQUIRED QUIET)
+find_package(Qt5LinguistTools REQUIRED QUIET)
+
+find_package(lxqt REQUIRED QUIET)
include(${LXQT_USE_FILE})
include_directories (
${LXQT_INCLUDE_DIRS}
- ${CMAKE_CURRENT_BINARY_DIR}
+ "${CMAKE_CURRENT_BINARY_DIR}"
${QTX_INCLUDE_DIRS}
src
)
-set ( lxqt-openssh-askpass_HDRS
+set(lxqt-openssh-askpass_HDRS
src/mainwindow.h
- )
+)
-set ( lxqt-openssh-askpass_SRCS
+set(lxqt-openssh-askpass_SRCS
src/main.cpp
src/mainwindow.cpp
- )
+)
-set ( lxqt-openssh-askpass_UIS
- src/mainwindow.ui
- )
+set(lxqt-openssh-askpass_UIS
+ src/mainwindow.ui
+)
# Translations **********************************
-include(LxQtTranslate)
+include(LXQtTranslate)
+
lxqt_translate_ts(QM_FILES
+ UPDATE_TRANSLATIONS
+ ${UPDATE_TRANSLATIONS}
SOURCES
${lxqt-openssh-askpass_HDRS}
${lxqt-openssh-askpass_SRCS}
${lxqt-openssh-askpass_UIS}
+ INSTALL_DIR
+ "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}"
)
+
+lxqt_app_translation_loader(lxqt-openssh_QM_LOADER ${PROJECT_NAME})
#************************************************
-if(USE_QT5)
- qt5_wrap_cpp(MOCS ${lxqt-openssh-askpass_HDRS})
- qt5_wrap_ui(UIS ${lxqt-openssh-askpass_UIS})
-else()
- qt4_wrap_cpp(MOCS ${lxqt-openssh-askpass_HDRS})
- qt4_wrap_ui(UIS ${lxqt-openssh-askpass_UIS})
-endif()
+qt5_wrap_cpp(MOCS ${lxqt-openssh-askpass_HDRS})
+qt5_wrap_ui(UIS ${lxqt-openssh-askpass_UIS})
+
+add_executable(lxqt-openssh-askpass
+ ${lxqt-openssh-askpass_SRCS}
+ ${UIS}
+ ${RSCS}
+ ${TRS}
+ ${MOCS}
+ ${QM_FILES}
+ ${lxqt-openssh_QM_LOADER}
+)
+target_link_libraries(lxqt-openssh-askpass
+ Qt5::Widgets
+ ${LXQT_LIBRARIES}
+)
-add_executable ( lxqt-openssh-askpass ${lxqt-openssh-askpass_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} ${QM_FILES} )
-target_link_libraries(lxqt-openssh-askpass ${QTX_LIBRARIES} ${LXQT_LIBRARIES})
INSTALL(TARGETS lxqt-openssh-askpass RUNTIME 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-openssh-askpass-0.8.0/cmake/LxQtTranslate.cmake new/lxqt-openssh-askpass-0.9.0/cmake/LxQtTranslate.cmake
--- old/lxqt-openssh-askpass-0.8.0/cmake/LxQtTranslate.cmake 2014-07-01 00:41:18.000000000 +0200
+++ new/lxqt-openssh-askpass-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