Hello community,

here is the log from the commit of package fcitx-unikey for openSUSE:Factory 
checked in at 2013-07-18 16:06:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx-unikey (Old)
 and      /work/SRC/openSUSE:Factory/.fcitx-unikey.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "fcitx-unikey"

Changes:
--------
--- /work/SRC/openSUSE:Factory/fcitx-unikey/fcitx-unikey.changes        
2013-07-08 13:35:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx-unikey.new/fcitx-unikey.changes   
2013-07-18 16:06:44.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jul 16 19:35:24 UTC 2013 - i...@marguerite.su
+
+- update version 0.2.2
+  * Fix unikey doesn't show in list
+  * fix icon install path
+
+-------------------------------------------------------------------

Old:
----
  fcitx-unikey-0.2.1.tar.xz
  fcitx-unikey-imicon.patch

New:
----
  fcitx-unikey-0.2.2.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fcitx-unikey.spec ++++++
--- /var/tmp/diff_new_pack.tcd2HX/_old  2013-07-18 16:06:44.000000000 +0200
+++ /var/tmp/diff_new_pack.tcd2HX/_new  2013-07-18 16:06:44.000000000 +0200
@@ -17,15 +17,13 @@
 
 
 Name:           fcitx-unikey
-Version:        0.2.1
+Version:        0.2.2
 Release:        0
 Summary:        Vietnamese unikey support for Fcitx
 License:        GPL-3.0+
 Group:          System/I18n/Chinese
 Url:            https://github.com/fcitx/fcitx-unikey
 Source:         
http://download.fcitx-im.org/fcitx-unikey/%{name}-%{version}.tar.xz
-# FIX-PATCH-UPSTREAM marguer...@opensuse.org - fix imicon directory
-Patch1:         fcitx-unikey-imicon.patch
 BuildRequires:  cmake
 BuildRequires:  fcitx-devel >= 4.2.3
 BuildRequires:  fdupes
@@ -43,7 +41,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 mkdir build
@@ -75,6 +72,7 @@
 %endif
 %{_fcitx_addondir}/%{name}.conf
 %{_fcitx_imicondir}/unikey.png
+%{_fcitx_inputmethoddir}/unikey.conf
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog

++++++ fcitx-unikey-0.2.1.tar.xz -> fcitx-unikey-0.2.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fcitx-unikey-0.2.1/CMakeLists.txt 
new/fcitx-unikey-0.2.2/CMakeLists.txt
--- old/fcitx-unikey-0.2.1/CMakeLists.txt       2013-06-03 20:03:15.000000000 
+0200
+++ new/fcitx-unikey-0.2.2/CMakeLists.txt       2013-07-15 22:35:46.000000000 
+0200
@@ -20,14 +20,14 @@
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
 set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}")
 
-find_package(Fcitx 4.2.7 REQUIRED)
+find_package(Fcitx 4.2.8 REQUIRED)
 find_package(Libiconv REQUIRED)
 find_package(Gettext REQUIRED)
 
 if (ENABLE_QT)
 find_package(Qt4 4.8)
 
-pkg_check_modules(FCITX_QT "fcitx-qt>=4.2.7")
+pkg_check_modules(FCITX_QT "fcitx-qt>=4.2.8")
 endif (ENABLE_QT)
 
 configure_file(config.h.in config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fcitx-unikey-0.2.1/ChangeLog 
new/fcitx-unikey-0.2.2/ChangeLog
--- old/fcitx-unikey-0.2.1/ChangeLog    1970-01-01 01:00:00.000000000 +0100
+++ new/fcitx-unikey-0.2.2/ChangeLog    2013-07-15 22:35:46.000000000 +0200
@@ -0,0 +1,4 @@
+2013-07-15: CSSlayer <wen...@gmail.com>
+       * 0.2.2
+         - Fix unikey doesn't show in list
+         - fix icon install path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fcitx-unikey-0.2.1/data/CMakeLists.txt 
new/fcitx-unikey-0.2.2/data/CMakeLists.txt
--- old/fcitx-unikey-0.2.1/data/CMakeLists.txt  2013-06-03 20:03:15.000000000 
+0200
+++ new/fcitx-unikey-0.2.2/data/CMakeLists.txt  2013-07-15 22:35:46.000000000 
+0200
@@ -1,2 +1,2 @@
-install(FILES unikey.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/imicon/)
+install(FILES unikey.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/imicon/)
 install(FILES unikey.png RENAME fcitx-unikey.png DESTINATION 
share/icons/hicolor/256x256/apps/)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fcitx-unikey-0.2.1/data/unikey.conf.in 
new/fcitx-unikey-0.2.2/data/unikey.conf.in
--- old/fcitx-unikey-0.2.1/data/unikey.conf.in  2013-06-03 20:03:15.000000000 
+0200
+++ new/fcitx-unikey-0.2.2/data/unikey.conf.in  1970-01-01 01:00:00.000000000 
+0100
@@ -1,7 +0,0 @@
-[InputMethod]
-UniqueName=unikey
-_Name=Unikey
-IconName=unikey
-Priority=1
-LangCode=vi
-Parent=fcitx-unikey
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fcitx-unikey-0.2.1/macro-editor/editor.cpp 
new/fcitx-unikey-0.2.2/macro-editor/editor.cpp
--- old/fcitx-unikey-0.2.1/macro-editor/editor.cpp      2013-06-03 
20:03:15.000000000 +0200
+++ new/fcitx-unikey-0.2.2/macro-editor/editor.cpp      2013-07-15 
22:35:46.000000000 +0200
@@ -66,6 +66,11 @@
     return "fcitx-unikey";
 }
 
+QString MacroEditor::icon()
+{
+    return "fcitx-unikey";
+}
+
 QString MacroEditor::title()
 {
     return _("Unikey Macro Editor");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fcitx-unikey-0.2.1/macro-editor/editor.h 
new/fcitx-unikey-0.2.2/macro-editor/editor.h
--- old/fcitx-unikey-0.2.1/macro-editor/editor.h        2013-06-03 
20:03:15.000000000 +0200
+++ new/fcitx-unikey-0.2.2/macro-editor/editor.h        2013-07-15 
22:35:46.000000000 +0200
@@ -36,6 +36,8 @@
     virtual void save();
     virtual QString title();
     virtual QString addon();
+    virtual QString icon();
+
     static QString getData(CMacroTable* table, int i, bool iskey);
 private slots:
     void addWord();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fcitx-unikey-0.2.1/src/CMakeLists.txt 
new/fcitx-unikey-0.2.2/src/CMakeLists.txt
--- old/fcitx-unikey-0.2.1/src/CMakeLists.txt   2013-06-03 20:03:15.000000000 
+0200
+++ new/fcitx-unikey-0.2.2/src/CMakeLists.txt   2013-07-15 22:35:46.000000000 
+0200
@@ -19,4 +19,5 @@
 fcitx_add_addon_full(unikey
    SOURCES ${fcitx_unikey_sources}
    LINK_LIBS unikey
+   IM_CONFIG unikey.conf
    )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fcitx-unikey-0.2.1/src/unikey.conf.in 
new/fcitx-unikey-0.2.2/src/unikey.conf.in
--- old/fcitx-unikey-0.2.1/src/unikey.conf.in   1970-01-01 01:00:00.000000000 
+0100
+++ new/fcitx-unikey-0.2.2/src/unikey.conf.in   2013-07-15 22:35:46.000000000 
+0200
@@ -0,0 +1,7 @@
+[InputMethod]
+UniqueName=unikey
+_Name=Unikey
+IconName=unikey
+Priority=1
+LangCode=vi
+Parent=fcitx-unikey

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to