Hello community, here is the log from the commit of package fcitx-unikey for openSUSE:12.3 checked in at 2013-02-05 11:07:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/fcitx-unikey (Old) and /work/SRC/openSUSE:12.3/.fcitx-unikey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-unikey", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/fcitx-unikey/fcitx-unikey.changes 2013-01-31 01:16:09.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.fcitx-unikey.new/fcitx-unikey.changes 2013-02-05 11:07:26.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Jan 28 14:02:04 UTC 2013 - i...@marguerite.su + +- add COPYING to %doc + +------------------------------------------------------------------- +Sat Jan 26 18:49:37 UTC 2013 - i...@marguerite.su + +- update version 0.2.0 + * use new custom ui to build macro editor +- fcitx-unikey-0.2.0-compat-qt474.patch + * fix qt 4.7.4 builds under 12.1 and below + * remove next release + +------------------------------------------------------------------- Old: ---- fcitx-unikey-0.1.1.tar.bz2 New: ---- fcitx-unikey-0.2.0-compat-qt474.patch fcitx-unikey-0.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-unikey.spec ++++++ --- /var/tmp/diff_new_pack.W09vSW/_old 2013-02-05 11:07:26.000000000 +0100 +++ /var/tmp/diff_new_pack.W09vSW/_new 2013-02-05 11:07:26.000000000 +0100 @@ -17,13 +17,15 @@ Name: fcitx-unikey -Version: 0.1.1 +Version: 0.2.0 Release: 0 License: GPL-3.0+ Summary: Vietnamese unikey support for Fcitx Url: https://github.com/fcitx/fcitx-unikey Group: System/I18n/Chinese Source: %{name}-%{version}.tar.bz2 +# fix-for-opensuse wen...@gmail.com - fix qt 4.7 builds +Patch1: fcitx-unikey-0.2.0-compat-qt474.patch BuildRequires: cmake BuildRequires: fcitx-devel >= 4.2.3 BuildRequires: fdupes @@ -37,19 +39,11 @@ %description fcitx-unikey provides support for Vietnamese unikey IM. -%if 0%{?suse_version} >= 1220 -%package macro-editor -Summary: Qt-based macro editor for fcitx-unikey -Group: System/I18n/Chinese - -%description macro-editor -fcitx-unikey provides support for Vietnamese unikey IM. - -This package provides a Qt-based macro editor for fcitx-unikey. -%endif - %prep %setup -q +%if 0%{?suse_version} <= 1210 +%patch1 -p1 +%endif %build mkdir build @@ -74,14 +68,12 @@ %files -f %{name}.lang %defattr(-,root,root) +%doc COPYING %{_libdir}/fcitx/%{name}.so -%{_datadir}/fcitx/ -%{_datadir}/icons/hicolor/*/apps/%{name}.png - %if 0%{?suse_version} >= 1220 -%files macro-editor -%defattr(-,root,root) -%{_bindir}/%{name}-macro-editor +%{_libdir}/fcitx/qt/libfcitx-unikey-macro-editor.so %endif +%{_datadir}/fcitx/ +%{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog ++++++ fcitx-unikey-0.2.0-compat-qt474.patch ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index cef1625..5ccf21c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,8 @@ project(fcitx-unikey) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) +option(ENABLE_QT "Enable Qt based macro editor" On) + # uninstall target configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" @@ -21,9 +23,12 @@ set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}") find_package(Fcitx 4.2.7 REQUIRED) find_package(Libiconv REQUIRED) find_package(Gettext REQUIRED) -find_package(Qt4) + +if (ENABLE_QT) +find_package(Qt4 4.8) pkg_check_modules(FCITX_QT "fcitx-qt>=4.2.7") +endif (ENABLE_QT) configure_file(config.h.in config.h) diff --git a/macro-editor/CMakeLists.txt b/macro-editor/CMakeLists.txt index fbb2482..145ee0b 100644 --- a/macro-editor/CMakeLists.txt +++ b/macro-editor/CMakeLists.txt @@ -16,9 +16,9 @@ fcitx_translate_add_sources( ${MACRO_EDITOR_SRCS} ${MACRO_EDITOR_HDRS}) -if (NOT QT_FOUND OR NOT FCITX_QT_FOUND) +if (NOT QT_FOUND OR NOT FCITX_QT_FOUND OR NOT ENABLE_QT) return() -endif (NOT QT_FOUND OR NOT FCITX_QT_FOUND) +endif (NOT QT_FOUND OR NOT FCITX_QT_FOUND OR NOT ENABLE_QT) include_directories( ${FCITX_QT_INCLUDE_DIRS} ++++++ fcitx-unikey-0.1.1.tar.bz2 -> fcitx-unikey-0.2.0.tar.bz2 ++++++ ++++ 2055 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
