pool/fcitx
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 123357 from home:MargueriteSu:branches:M17N

Browse Source 
fix sles builds

OBS-URL: https://build.opensuse.org/request/show/123357
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=29
This commit is contained in:
Marguerite Su 2012-06-03 09:36:32 +00:00 committed by Git OBS Bridge
parent 7009eb094b
commit 82cea75593
6 changed files with 105 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_service
View File

@ -1,13 +1,13 @@
<services> <services>
<service name="tar_scm" mode="localonly"> <service name="tar_scm" mode="disabled">
<param name="history-depth">all</param><param name="url">http://code.google.com/p/fcitx/</param><param name="versionprefix">4.2git</param><param name="filename">fcitx</param><param name="scm">git</param></service> <param name="history-depth">all</param><param name="url">http://code.google.com/p/fcitx/</param><param name="versionprefix">4.2git</param><param name="filename">fcitx</param><param name="scm">git</param></service>
<service name="recompress" mode="localonly"> <service name="recompress" mode="disabled">
<param name="file">*.tar</param> <param name="file">*.tar</param>
<param name="compression">bz2</param> <param name="compression">bz2</param>
</service> </service>
<service name="set_version" mode="localonly"/> <service name="set_version" mode="disabled"/>
</services> </services>

3
fcitx-4.2.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2bc67c9251ad9f51439e30ad3aa6b1d6d8c65393ea71dccd4749b5e8de7d3bf
size 844355

3
fcitx-4.2.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b7d22ada50f7e375096094c2abcf09ad114ffb68521ccf0de37d71e1014183c
size 612028

9
fcitx.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Jun 3 04:46:37 UTC 2012 - i@marguerite.su
- fix sles builds.
* add version tags.
* changed source compression.
* add a patch to downgrade gio's version.
* use xim instead of qt im module.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 12 12:49:11 UTC 2012 - i@marguerite.su Sat May 12 12:49:11 UTC 2012 - i@marguerite.su

74
fcitx.spec
View File

@ -15,16 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define libver -4_2_3 %define libver -4_2_3
Name: fcitx Name: fcitx
Version: 4.2.3 Version: 4.2.3
Release: 1 Release: 0
Summary: A Flexible Input Method Framework for CJK Summary: A Flexible Input Method Framework for CJK
Url: http://code.google.com/p/fcitx
Group: System/I18n/Chinese
License: GPL-2.0+ License: GPL-2.0+
Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz Group: System/I18n/Chinese
Url: http://code.google.com/p/fcitx
Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.bz2
Source1: xim.d-fcitx Source1: xim.d-fcitx
Source2: fcitx-README.suse Source2: fcitx-README.suse
Source3: xim.fcitx.suse.template Source3: xim.fcitx.suse.template
@ -34,30 +35,41 @@ Source6: table.tar.gz
Patch1: fix_fcitx_googlecode_resolv_error.patch Patch1: fix_fcitx_googlecode_resolv_error.patch
#FIX-FOR-UPSTREAM i@marguerite.su - fix lua51 builds on 11.4 #FIX-FOR-UPSTREAM i@marguerite.su - fix lua51 builds on 11.4
Patch2: fcitx-4.2.3-openSUSE-11.4-lua51.patch Patch2: fcitx-4.2.3-openSUSE-11.4-lua51.patch
BuildRequires: xz #FIX-FOR-SLES i@marguerite.su - downgrade gio version from 2.6 to 2.26
Patch3: fix-for-sles-downgrade-gio-version.patch
BuildRequires: cairo-devel BuildRequires: cairo-devel
BuildRequires: pango-devel
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-glib-devel
BuildRequires: pango-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
%if 0%{?suse_version} >= 1110
BuildRequires: fdupes BuildRequires: fdupes
%endif
%if 0%{?suse_version} > 1110
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
%endif
%if 0%{?suse_version} <= 1210 %if 0%{?suse_version} <= 1210
BuildRequires: lua-devel BuildRequires: lua-devel
%else %else
BuildRequires: lua51-devel BuildRequires: lua51-devel
%endif %endif
BuildRequires: opencc-devel
BuildRequires: intltool
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: opencc-devel
%if 0%{?suse_version} >= 1140
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
%endif
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libicu-devel BuildRequires: libicu-devel
Requires: lib%{name}%{libver} = %{version}-%{release}
Requires: %{name}-gtk2 = %{version}-%{release} Requires: %{name}-gtk2 = %{version}-%{release}
Requires: lib%{name}%{libver} = %{version}-%{release}
%if 0%{?suse_version} >= 1140
Requires: %{name}-gtk3 = %{version}-%{release} Requires: %{name}-gtk3 = %{version}-%{release}
%endif
%if 0%{?suse_version} > 1110
Requires: %{name}-qt4 = %{version}-%{release} Requires: %{name}-qt4 = %{version}-%{release}
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: locale(ko;zh_CN;zh_SG) Provides: locale(ko;zh_CN;zh_SG)
@ -92,6 +104,8 @@ Requires: %{name} = %{version}-%{release}
%description gtk2 %description gtk2
This package contains fcitx im module for gtk2 This package contains fcitx im module for gtk2
%if 0%{?suse_version} >= 1140
%package gtk3 %package gtk3
Summary: Gtk3 IM Module for %{name} Summary: Gtk3 IM Module for %{name}
Group: System/I18n/Chinese Group: System/I18n/Chinese
@ -101,6 +115,9 @@ Requires: %{name} = %{version}-%{release}
%description gtk3 %description gtk3
This package contains fcitx im module for gtk3 This package contains fcitx im module for gtk3
%endif
%if 0%{?suse_version} > 1110
%package qt4 %package qt4
Summary: Qt4 IM Module for %{name} Summary: Qt4 IM Module for %{name}
Group: System/I18n/Chinese Group: System/I18n/Chinese
@ -109,18 +126,25 @@ Requires: %{name} = %{version}-%{release}
%description qt4 %description qt4
This package contains fcitx im module for qt4 This package contains fcitx im module for qt4
%endif
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
mkdir build mkdir build
cd build cd build
cmake .. -DENABLE_GTK2_IM_MODULE=On \ cmake .. -DENABLE_GTK2_IM_MODULE=On \
%if 0%{?suse_version} >= 1140
-DENABLE_GTK3_IM_MODULE=On \ -DENABLE_GTK3_IM_MODULE=On \
%endif
%if 0%{?suse_version} > 1110
-DENABLE_QT_IM_MODULE=On \ -DENABLE_QT_IM_MODULE=On \
%endif
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir} \ -DLIB_INSTALL_DIR=%{_libdir} \
-DENABLE_DEBUG=On \ -DENABLE_DEBUG=On \
@ -139,7 +163,7 @@ make
%install %install
cd build cd build
make DESTDIR=$RPM_BUILD_ROOT install %makeinstall
cd .. cd ..
@ -173,14 +197,20 @@ popd
%find_lang %{name} %find_lang %{name}
%if 0%{?suse_version} >= 1110
%fdupes %{buildroot} %fdupes %{buildroot}
%endif
#strip libraries #strip libraries
%{__strip} %{buildroot}%{_libdir}/%{name}/*.so %{__strip} %{buildroot}%{_libdir}/%{name}/*.so
%{__strip} %{buildroot}%{_libdir}/libfcitx*.so.* %{__strip} %{buildroot}%{_libdir}/libfcitx*.so.*
%{__strip} %{buildroot}%{_libdir}/gtk-2.0/*/immodules/im-%{name}.so %{__strip} %{buildroot}%{_libdir}/gtk-2.0/*/immodules/im-%{name}.so
%if 0%{?suse_version} >= 1140
%{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so %{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so
%endif
%if 0%{?suse_version} > 1110
%{__strip} %{buildroot}%{_libdir}/qt4/plugins/inputmethods/qtim-%{name}.so %{__strip} %{buildroot}%{_libdir}/qt4/plugins/inputmethods/qtim-%{name}.so
%endif
#Convenient define for the scriplets #Convenient define for the scriplets
%if %{_lib} == lib64 %if %{_lib} == lib64
@ -191,6 +221,14 @@ popd
%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk.immodules %define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk.immodules
%endif %endif
%post gtk2
%{_gtk2_query_immodules_update_cache}
%postun gtk2
%{_gtk2_query_immodules_update_cache}
%if 0%{?suse_version} >= 1140
%if %{_lib} == lib64 %if %{_lib} == lib64
%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0-64 %define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0-64
%else %else
@ -198,9 +236,6 @@ popd
%endif %endif
%define _gtk3_query_immodules_update_cache %{_gtk3_query_immodules} --update-cache %define _gtk3_query_immodules_update_cache %{_gtk3_query_immodules} --update-cache
%post gtk2
%{_gtk2_query_immodules_update_cache}
%post gtk3 %post gtk3
%{_gtk3_query_immodules_update_cache} %{_gtk3_query_immodules_update_cache}
@ -211,12 +246,11 @@ mv $TARGET $TARGET-fcitx
sed "/^const STANDARD_TRAY_ICON_IMPLEMENTATIONS/a \ 'fcitx': 'input-method'," $TARGET-fcitx > $TARGET sed "/^const STANDARD_TRAY_ICON_IMPLEMENTATIONS/a \ 'fcitx': 'input-method'," $TARGET-fcitx > $TARGET
fi fi
%postun gtk2
%{_gtk2_query_immodules_update_cache}
%postun gtk3 %postun gtk3
%{_gtk3_query_immodules_update_cache} %{_gtk3_query_immodules_update_cache}
%endif
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%post -n lib%{name}%{libver} -p /sbin/ldconfig %post -n lib%{name}%{libver} -p /sbin/ldconfig
@ -246,18 +280,26 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/gtk-2.0/* %{_libdir}/gtk-2.0/*
%if 0%{?suse_version} >= 1140
%files gtk3 %files gtk3
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/gtk-3.0/* %{_libdir}/gtk-3.0/*
%endif
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_datadir}/cmake/ %{_datadir}/cmake/
%{_includedir}/* %{_includedir}/*
%if 0%{?suse_version} > 1110
%files qt4 %files qt4
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/qt4/* %{_libdir}/qt4/*
%endif
%changelog %changelog

19
fix-for-sles-downgrade-gio-version.patch Normal file
View File

@ -0,0 +1,19 @@
diff -urN fcitx-4.2.3.orig/src/frontend/CMakeLists.txt fcitx-4.2.3/src/frontend/CMakeLists.txt
--- fcitx-4.2.3.orig/src/frontend/CMakeLists.txt 2012-06-03 12:26:00.293473739 +0800
+++ fcitx-4.2.3/src/frontend/CMakeLists.txt 2012-06-03 12:26:50.285848746 +0800
@@ -7,7 +7,7 @@
if (ENABLE_GTK2_IM_MODULE OR ENABLE_GTK3_IM_MODULE)
PKG_CHECK_MODULES(GLIB2 REQUIRED "glib-2.0" )
- PKG_CHECK_MODULES(GIO2 "gio-2.0 >= 2.6")
+ PKG_CHECK_MODULES(GIO2 "gio-2.0 >= 2.26")
if (NOT GIO2_FOUND)
PKG_CHECK_MODULES(DBUS_GLIB REQUIRED "dbus-glib-1")
endif (NOT GIO2_FOUND)
@@ -20,4 +20,4 @@
add_subdirectory(gtk2)
add_subdirectory(gtk3)
add_subdirectory(qt)
-endif (_ENABLE_DBUS)
\ 文件尾没有 newline 字符
+endif (_ENABLE_DBUS)