From fffff7486e01d2cfc56beaed4f19c16f016a6007 Mon Sep 17 00:00:00 2001 From: supercyper Date: Sun, 18 Apr 2010 02:06:31 +0000 Subject: [PATCH 01/11] Initial import --- .cvsignore | 1 + fcitx.spec | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + xinput-fcitx | 7 ++++ 4 files changed, 112 insertions(+) create mode 100644 fcitx.spec create mode 100644 xinput-fcitx diff --git a/.cvsignore b/.cvsignore index e69de29..034e6f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +fcitx-20100410.tar.bz2 diff --git a/fcitx.spec b/fcitx.spec new file mode 100644 index 0000000..21ddcea --- /dev/null +++ b/fcitx.spec @@ -0,0 +1,103 @@ +%define svndate 20100410 +%define svnver 350 +%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf + +Name: fcitx +Summary: Free Chinese Input Toy for X (XIM) +Version: 3.6.3 +Release: 2.%{?svndate}svn_utf8%{?dist} +# fcitx itself is licensed under GPLv2+ +# lib/*, /src/IC.c and /src/IC.h are licensed under MIT +# src/uthash.h is licensed under BSD +License: GPLv2+ and MIT and BSD +Group: System Environment/Libraries +URL: http://code.google.com/p/%{name}/ +# +# The upstream svn trunk and the released tar ball are in GBK coding. We use the +# UTF-8 branch. And upstream has planned to move to UTF-8 coding in some future +# release. +# +#Source0: http://%{name}.googlecode.com/files/%name-%version.tar.bz2 +# The source for this package was pulled from upstream's vcs. Use the +# following commands to generate the tarball: +# svn export -r %{svnver} http://fcitx.googlecode.com/svn/branches/fcitx-utf8 fcitx-%{svndate} +# tar -cjvf fcitx-%{svndate}.tar.bz2 fcitx-%{svndate} +Source0: %{name}-%{svndate}.tar.bz2 +Source1: xinput-%{name} +BuildRequires: autoconf automake +BuildRequires: gettext-devel +BuildRequires: libXtst-devel +BuildRequires: libXft-devel +BuildRequires: libXpm-devel +BuildRequires: libXext-devel +BuildRequires: dbus-devel +Requires: im-chooser +Requires(post): %{_sbindir}/alternatives +Requires(postun): %{_sbindir}/alternatives + +%description +Fcitx(Free Chinese Input Toy of X) is a collection of Simplified Chinese +input methods for Linux. It supports Pinyin, QuWei and Table-based input +methods. It's small and fast. + +This package is the UTF-8 branch of fcitx. + +%prep +%setup -q -n %{name}-%{svndate} + +%build +# fix DSOLinking +sed -i -e 's/fcitx_LDFLAGS =/fcitx_LDFLAGS = -ldl -lXext/g' src/Makefile.am +./autogen.sh +%configure --enable-dbus +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} + +make install INSTALL="install -p" DESTDIR=%{buildroot} + +#fix doc path +mkdir __doc +mv %{buildroot}%{_datadir}/%{name}/doc/* __doc +rm -rf %{buildroot}%{_datadir}/%{name}/doc +rm -f __doc/{API.txt,Develop_Readme*,fcitx_trunk.doxyfile} + +# install xinput config file +install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf} + +chmod 0755 %{buildroot}%{_datadir}/%{name}/tools/winmb2fcitx.py + +%clean +rm -rf %{buildroot} + +%post +%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 55 || : + +%postun +if [ "$1" = "0" ]; then + %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || : + # if alternative was set to manual, reset to auto + [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || : +fi + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README THANKS TODO +%doc __doc/* +%exclude %{_datadir}/%{name}/data/*.txt +%exclude %{_datadir}/%{name}/data/*.org +# winmb2fcitx.py is a utility script, byte-compilation is useless. +%exclude %{_datadir}/%{name}/tools/winmb2fcitx.pyc +%exclude %{_datadir}/%{name}/tools/winmb2fcitx.pyo +%config %{_xinputconf} +%{_bindir}/* +%{_datadir}/%{name} + +%changelog +* Sat Apr 17 2010 Chen Lei - 3.6.3-2.20100410svn_utf8 +- Update License tag +- Add more explanation for UTF-8 branch + +* Mon Apr 12 2010 Chen Lei - 3.6.3-1.20100410svn_utf8 +- Initial Package diff --git a/sources b/sources index e69de29..e392fb8 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b2f08f13936566ec09a1c3ee5a908b64 fcitx-20100410.tar.bz2 diff --git a/xinput-fcitx b/xinput-fcitx new file mode 100644 index 0000000..2e2b5b0 --- /dev/null +++ b/xinput-fcitx @@ -0,0 +1,7 @@ +XIM=fcitx +XIM_PROGRAM=/usr/bin/fcitx +ICON="/usr/share/fcitx/xpm/Logo.png" +XIM_ARGS="-D" +SHORT_DESC="Fcitx" +GTK_IM_MODULE=xim +QT_IM_MODULE=xim From 594f5a2cfc92542247c96c88fc2062d3175f9fb1 Mon Sep 17 00:00:00 2001 From: supercyper Date: Sun, 18 Apr 2010 16:08:51 +0000 Subject: [PATCH 02/11] Exclude xpm files --- fcitx.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fcitx.spec b/fcitx.spec index 21ddcea..ed739fa 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -5,7 +5,7 @@ Name: fcitx Summary: Free Chinese Input Toy for X (XIM) Version: 3.6.3 -Release: 2.%{?svndate}svn_utf8%{?dist} +Release: 3.%{?svndate}svn_utf8%{?dist} # fcitx itself is licensed under GPLv2+ # lib/*, /src/IC.c and /src/IC.h are licensed under MIT # src/uthash.h is licensed under BSD @@ -17,7 +17,7 @@ URL: http://code.google.com/p/%{name}/ # UTF-8 branch. And upstream has planned to move to UTF-8 coding in some future # release. # -#Source0: http://%{name}.googlecode.com/files/%name-%version.tar.bz2 +#Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: # svn export -r %{svnver} http://fcitx.googlecode.com/svn/branches/fcitx-utf8 fcitx-%{svndate} @@ -83,10 +83,11 @@ fi %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README THANKS TODO +%doc AUTHORS ChangeLog COPYING THANKS TODO %doc __doc/* %exclude %{_datadir}/%{name}/data/*.txt %exclude %{_datadir}/%{name}/data/*.org +%exclude %{_datadir}/%{name}/xpm/*.xpm # winmb2fcitx.py is a utility script, byte-compilation is useless. %exclude %{_datadir}/%{name}/tools/winmb2fcitx.pyc %exclude %{_datadir}/%{name}/tools/winmb2fcitx.pyo @@ -95,6 +96,9 @@ fi %{_datadir}/%{name} %changelog +* Sun Apr 18 2010 Chen Lei - 3.6.3-3.20100410svn_utf8 +- Exclude xpm files + * Sat Apr 17 2010 Chen Lei - 3.6.3-2.20100410svn_utf8 - Update License tag - Add more explanation for UTF-8 branch From 44800cf2bad7193abaad6fdd707a31d45bd8942e Mon Sep 17 00:00:00 2001 From: supercyper Date: Sun, 16 May 2010 02:25:09 +0000 Subject: [PATCH 03/11] Update to svn 365 --- .cvsignore | 1 + fcitx.spec | 52 +++++++++++++++++++++++++--------------------------- sources | 1 + xinput-fcitx | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.cvsignore b/.cvsignore index 034e6f0..19983b0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ fcitx-20100410.tar.bz2 +fcitx-20100514.tar.bz2 diff --git a/fcitx.spec b/fcitx.spec index ed739fa..97597c6 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -1,17 +1,14 @@ -%define svndate 20100410 -%define svnver 350 +%define svndate 20100514 +%define svnver 365 %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf -Name: fcitx -Summary: Free Chinese Input Toy for X (XIM) -Version: 3.6.3 -Release: 3.%{?svndate}svn_utf8%{?dist} -# fcitx itself is licensed under GPLv2+ -# lib/*, /src/IC.c and /src/IC.h are licensed under MIT -# src/uthash.h is licensed under BSD -License: GPLv2+ and MIT and BSD -Group: System Environment/Libraries -URL: http://code.google.com/p/%{name}/ +Name: fcitx +Summary: Free Chinese Input Toy for X (XIM) +Version: 3.6.3 +Release: 4.%{?svndate}svn_utf8%{?dist} +License: GPLv2+ +Group: System Environment/Libraries +URL: http://code.google.com/p/%{name}/ # # The upstream svn trunk and the released tar ball are in GBK coding. We use the # UTF-8 branch. And upstream has planned to move to UTF-8 coding in some future @@ -22,17 +19,17 @@ URL: http://code.google.com/p/%{name}/ # following commands to generate the tarball: # svn export -r %{svnver} http://fcitx.googlecode.com/svn/branches/fcitx-utf8 fcitx-%{svndate} # tar -cjvf fcitx-%{svndate}.tar.bz2 fcitx-%{svndate} -Source0: %{name}-%{svndate}.tar.bz2 -Source1: xinput-%{name} -BuildRequires: autoconf automake -BuildRequires: gettext-devel -BuildRequires: libXtst-devel -BuildRequires: libXft-devel -BuildRequires: libXpm-devel -BuildRequires: libXext-devel -BuildRequires: dbus-devel -Requires: im-chooser -Requires(post): %{_sbindir}/alternatives +Source0: %{name}-%{svndate}.tar.bz2 +Source1: xinput-%{name} +BuildRequires: autoconf automake +BuildRequires: gettext-devel +BuildRequires: libXtst-devel +BuildRequires: libXft-devel +BuildRequires: libXpm-devel +BuildRequires: libXext-devel +BuildRequires: dbus-devel +Requires: im-chooser +Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives %description @@ -47,7 +44,7 @@ This package is the UTF-8 branch of fcitx. %build # fix DSOLinking -sed -i -e 's/fcitx_LDFLAGS =/fcitx_LDFLAGS = -ldl -lXext/g' src/Makefile.am +sed -i -e 's/fcitx_LDFLAGS =/fcitx_LDFLAGS = -ldl -lXext/g' src/core/Makefile.am ./autogen.sh %configure --enable-dbus make %{?_smp_mflags} @@ -85,17 +82,18 @@ fi %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING THANKS TODO %doc __doc/* -%exclude %{_datadir}/%{name}/data/*.txt -%exclude %{_datadir}/%{name}/data/*.org -%exclude %{_datadir}/%{name}/xpm/*.xpm # winmb2fcitx.py is a utility script, byte-compilation is useless. %exclude %{_datadir}/%{name}/tools/winmb2fcitx.pyc %exclude %{_datadir}/%{name}/tools/winmb2fcitx.pyo %config %{_xinputconf} %{_bindir}/* %{_datadir}/%{name} +%{_datadir}/pixmaps/* %changelog +* Fri May 14 2010 Chen Lei - 3.6.3-4.20100514svn_utf8 +- svn 365 + * Sun Apr 18 2010 Chen Lei - 3.6.3-3.20100410svn_utf8 - Exclude xpm files diff --git a/sources b/sources index e392fb8..7a79bac 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b2f08f13936566ec09a1c3ee5a908b64 fcitx-20100410.tar.bz2 +f95e24c760777dc85cafb2772f76a950 fcitx-20100514.tar.bz2 diff --git a/xinput-fcitx b/xinput-fcitx index 2e2b5b0..1a86b5a 100644 --- a/xinput-fcitx +++ b/xinput-fcitx @@ -1,6 +1,6 @@ XIM=fcitx XIM_PROGRAM=/usr/bin/fcitx -ICON="/usr/share/fcitx/xpm/Logo.png" +ICON="/usr/share/pixmaps/fcitx.png" XIM_ARGS="-D" SHORT_DESC="Fcitx" GTK_IM_MODULE=xim From 37215e972f87a6190e6d6541671edfd58bd208b2 Mon Sep 17 00:00:00 2001 From: supercyper Date: Mon, 14 Jun 2010 12:05:03 +0000 Subject: [PATCH 04/11] *** empty log message *** --- fcitx.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fcitx.spec b/fcitx.spec index 97597c6..e4ed7c2 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -5,7 +5,7 @@ Name: fcitx Summary: Free Chinese Input Toy for X (XIM) Version: 3.6.3 -Release: 4.%{?svndate}svn_utf8%{?dist} +Release: 5.%{?svndate}svn_utf8%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://code.google.com/p/%{name}/ @@ -25,8 +25,7 @@ BuildRequires: autoconf automake BuildRequires: gettext-devel BuildRequires: libXtst-devel BuildRequires: libXft-devel -BuildRequires: libXpm-devel -BuildRequires: libXext-devel +BuildRequires: libXpm-devel BuildRequires: dbus-devel Requires: im-chooser Requires(post): %{_sbindir}/alternatives @@ -44,7 +43,7 @@ This package is the UTF-8 branch of fcitx. %build # fix DSOLinking -sed -i -e 's/fcitx_LDFLAGS =/fcitx_LDFLAGS = -ldl -lXext/g' src/core/Makefile.am +sed -i -e 's/fcitx_LDFLAGS =/fcitx_LDFLAGS = -ldl/g' src/core/Makefile.am ./autogen.sh %configure --enable-dbus make %{?_smp_mflags} @@ -91,6 +90,9 @@ fi %{_datadir}/pixmaps/* %changelog +* Mon Jun 14 2010 Chen Lei - 3.6.3-5.20100514svn_utf8 +- Remove BR:libXext-devel + * Fri May 14 2010 Chen Lei - 3.6.3-4.20100514svn_utf8 - svn 365 From eb77747eefb7e02ad050d40e2d114288800abc61 Mon Sep 17 00:00:00 2001 From: supercyper Date: Tue, 20 Jul 2010 02:56:31 +0000 Subject: [PATCH 05/11] New snapshot --- .cvsignore | 3 +-- fcitx.spec | 25 ++++++++++++++----------- sources | 3 +-- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index 19983b0..d0b454d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -fcitx-20100410.tar.bz2 -fcitx-20100514.tar.bz2 +fcitx-20100602.tar.bz2 diff --git a/fcitx.spec b/fcitx.spec index e4ed7c2..1dcb435 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -1,14 +1,14 @@ -%define svndate 20100514 -%define svnver 365 +%define svndate 20100602 +%define svnver 366 %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf Name: fcitx -Summary: Free Chinese Input Toy for X (XIM) -Version: 3.6.3 -Release: 5.%{?svndate}svn_utf8%{?dist} -License: GPLv2+ +Summary: Free Chinese Input Toy for X (XIM) +Version: 3.6.3 +Release: 6.%{?svndate}svn_utf8%{?dist} +License: GPLv2+ Group: System Environment/Libraries -URL: http://code.google.com/p/%{name}/ +URL: http://code.google.com/p/%{name}/ # # The upstream svn trunk and the released tar ball are in GBK coding. We use the # UTF-8 branch. And upstream has planned to move to UTF-8 coding in some future @@ -19,16 +19,16 @@ URL: http://code.google.com/p/%{name}/ # following commands to generate the tarball: # svn export -r %{svnver} http://fcitx.googlecode.com/svn/branches/fcitx-utf8 fcitx-%{svndate} # tar -cjvf fcitx-%{svndate}.tar.bz2 fcitx-%{svndate} -Source0: %{name}-%{svndate}.tar.bz2 -Source1: xinput-%{name} +Source0: %{name}-%{svndate}.tar.bz2 +Source1: xinput-%{name} BuildRequires: autoconf automake BuildRequires: gettext-devel BuildRequires: libXtst-devel BuildRequires: libXft-devel BuildRequires: libXpm-devel BuildRequires: dbus-devel -Requires: im-chooser -Requires(post): %{_sbindir}/alternatives +Requires: im-chooser +Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives %description @@ -90,6 +90,9 @@ fi %{_datadir}/pixmaps/* %changelog +* Tue Jul 20 2010 Chen Lei - 3.6.3-6.20100602svn_utf8 +- svn 366 + * Mon Jun 14 2010 Chen Lei - 3.6.3-5.20100514svn_utf8 - Remove BR:libXext-devel diff --git a/sources b/sources index 7a79bac..72ef4ba 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b2f08f13936566ec09a1c3ee5a908b64 fcitx-20100410.tar.bz2 -f95e24c760777dc85cafb2772f76a950 fcitx-20100514.tar.bz2 +7f09b6c56eae10960004e7730ea18b35 fcitx-20100602.tar.bz2 From 2e5229faee54927d84876c277ad1f0ffb0c4f5eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:14:34 +0000 Subject: [PATCH 06/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 282b8ef..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: fcitx -# $Id$ -NAME := fcitx -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From ff7bde26df30ad99dac6abec4f70286f18bec9ef Mon Sep 17 00:00:00 2001 From: Chen Lei Date: Fri, 19 Nov 2010 20:47:05 +0800 Subject: [PATCH 07/11] Update to fcitx 4.0.0 --- .gitignore | 2 +- fcitx.spec | 93 ++++++++++++++++++++++++++++++---------------------- sources | 2 +- xinput-fcitx | 3 +- 4 files changed, 57 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index d0b454d..8711d34 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -fcitx-20100602.tar.bz2 +/fcitx-4.0.0_all.tar.gz diff --git a/fcitx.spec b/fcitx.spec index 1dcb435..a5573b7 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -1,57 +1,57 @@ -%define svndate 20100602 -%define svnver 366 %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf Name: fcitx Summary: Free Chinese Input Toy for X (XIM) -Version: 3.6.3 -Release: 6.%{?svndate}svn_utf8%{?dist} +Version: 4.0.0 +Release: 1%{?dist} License: GPLv2+ -Group: System Environment/Libraries +Group: User Interface/Desktops URL: http://code.google.com/p/%{name}/ -# -# The upstream svn trunk and the released tar ball are in GBK coding. We use the -# UTF-8 branch. And upstream has planned to move to UTF-8 coding in some future -# release. -# -#Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 -# The source for this package was pulled from upstream's vcs. Use the -# following commands to generate the tarball: -# svn export -r %{svnver} http://fcitx.googlecode.com/svn/branches/fcitx-utf8 fcitx-%{svndate} -# tar -cjvf fcitx-%{svndate}.tar.bz2 fcitx-%{svndate} -Source0: %{name}-%{svndate}.tar.bz2 +Source0: http://%{name}.googlecode.com/files/%{name}-%{version}_all.tar.gz Source1: xinput-%{name} -BuildRequires: autoconf automake -BuildRequires: gettext-devel -BuildRequires: libXtst-devel -BuildRequires: libXft-devel -BuildRequires: libXpm-devel -BuildRequires: dbus-devel -Requires: im-chooser +BuildRequires: pango-devel dbus-devel +BuildRequires: wget intltool +Requires: %{name}-libs = %{version}-%{release} +Requires: imsettings Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives %description -Fcitx(Free Chinese Input Toy of X) is a collection of Simplified Chinese +FCITX(Free Chinese Input Toy of X) is a collection of Simplified Chinese input methods for Linux. It supports Pinyin, QuWei and Table-based input methods. It's small and fast. -This package is the UTF-8 branch of fcitx. +%package libs +Summary: Libraries for FCITX +Group: System Environment/Libraries + +%description libs +The %{name}-libs package provides shared libraries for FCITX. + +%package devel +Summary: Development files for FCITX +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} +Requires: libX11-devel + +%description devel +The %{name}-devel package contains libraries and header files necessary for +developing programs using FCITX libraries. %prep -%setup -q -n %{name}-%{svndate} +%setup -q %build -# fix DSOLinking -sed -i -e 's/fcitx_LDFLAGS =/fcitx_LDFLAGS = -ldl/g' src/core/Makefile.am -./autogen.sh -%configure --enable-dbus +%configure --disable-static \ + --enable-dbus \ + --enable-tray +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} %install -rm -rf %{buildroot} - make install INSTALL="install -p" DESTDIR=%{buildroot} +rm -f %{buildroot}%{_libdir}/*.la #fix doc path mkdir __doc @@ -62,7 +62,7 @@ rm -f __doc/{API.txt,Develop_Readme*,fcitx_trunk.doxyfile} # install xinput config file install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf} -chmod 0755 %{buildroot}%{_datadir}/%{name}/tools/winmb2fcitx.py +%find_lang %{name} %clean rm -rf %{buildroot} @@ -77,21 +77,34 @@ if [ "$1" = "0" ]; then [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || : fi -%files +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING THANKS TODO +%doc AUTHORS ChangeLog THANKS TODO %doc __doc/* -# winmb2fcitx.py is a utility script, byte-compilation is useless. -%exclude %{_datadir}/%{name}/tools/winmb2fcitx.pyc -%exclude %{_datadir}/%{name}/tools/winmb2fcitx.pyo %config %{_xinputconf} %{_bindir}/* %{_datadir}/%{name} %{_datadir}/pixmaps/* +%files libs +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/libfcitx*.so.* + +%files devel +%defattr(-,root,root,-) +%doc +%{_libdir}/libfcitx*.so +%{_libdir}/pkgconfig/fcitx*.pc +%{_includedir}/fcitx* + %changelog -* Tue Jul 20 2010 Chen Lei - 3.6.3-6.20100602svn_utf8 -- svn 366 +* Fri Nov 19 2010 Chen Lei - 4.0.0-1 +- Update to 4.0.0 * Mon Jun 14 2010 Chen Lei - 3.6.3-5.20100514svn_utf8 - Remove BR:libXext-devel diff --git a/sources b/sources index 72ef4ba..2dfac8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f09b6c56eae10960004e7730ea18b35 fcitx-20100602.tar.bz2 +ce1156b19c719b04bd077f53fc4bd980 fcitx-4.0.0_all.tar.gz diff --git a/xinput-fcitx b/xinput-fcitx index 1a86b5a..1eb5a4d 100644 --- a/xinput-fcitx +++ b/xinput-fcitx @@ -2,6 +2,7 @@ XIM=fcitx XIM_PROGRAM=/usr/bin/fcitx ICON="/usr/share/pixmaps/fcitx.png" XIM_ARGS="-D" -SHORT_DESC="Fcitx" +PREFERENCE_PROGRAM=/usr/bin/fcitx-config +SHORT_DESC="FCITX" GTK_IM_MODULE=xim QT_IM_MODULE=xim From fe38f0595192dc9d3b410b3a442d60bc9328fe84 Mon Sep 17 00:00:00 2001 From: Chen Lei Date: Fri, 19 Nov 2010 21:31:35 +0800 Subject: [PATCH 08/11] Fix building --- fcitx.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fcitx.spec b/fcitx.spec index a5573b7..69936c3 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -47,6 +47,7 @@ developing programs using FCITX libraries. --enable-tray sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +sed -i 's|PYFA has bug" ;exit 1|PYFA has bug"|' test/Makefile.in make %{?_smp_mflags} %install From 3a0029b9aea90384ed25ab309cd88cb06cc1cd7c Mon Sep 17 00:00:00 2001 From: Chen Lei Date: Fri, 19 Nov 2010 21:44:58 +0800 Subject: [PATCH 09/11] Fix building --- fcitx.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fcitx.spec b/fcitx.spec index 69936c3..0fc2f22 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -10,7 +10,7 @@ URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}_all.tar.gz Source1: xinput-%{name} BuildRequires: pango-devel dbus-devel -BuildRequires: wget intltool +BuildRequires: wget intltool chrpath Requires: %{name}-libs = %{version}-%{release} Requires: imsettings Requires(post): %{_sbindir}/alternatives @@ -45,16 +45,16 @@ developing programs using FCITX libraries. %configure --disable-static \ --enable-dbus \ --enable-tray -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -sed -i 's|PYFA has bug" ;exit 1|PYFA has bug"|' test/Makefile.in make %{?_smp_mflags} %install make install INSTALL="install -p" DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.la -#fix doc path +# remove rpath +chrpath --delete %{buildroot}%{_bindir}/{*PYMB,mb2org,fcitx,readPYBase} + +# fix doc path mkdir __doc mv %{buildroot}%{_datadir}/%{name}/doc/* __doc rm -rf %{buildroot}%{_datadir}/%{name}/doc From 5d0874a4b5aa45c1892a580f71647ae761ea2ab4 Mon Sep 17 00:00:00 2001 From: Fedora Date: Fri, 17 Dec 2010 19:52:43 +0800 Subject: [PATCH 10/11] Upgrade to FCITX 4.0.1 --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8711d34..54bb1e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /fcitx-4.0.0_all.tar.gz +/fcitx-4.0.1_all.tar.gz diff --git a/sources b/sources index 2dfac8c..0fe6a9b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ ce1156b19c719b04bd077f53fc4bd980 fcitx-4.0.0_all.tar.gz +844f6a382ca970d6c3343e12148be641 fcitx-4.0.1_all.tar.gz From 91174bd189009cac3be194e5282121da3dcb49a5 Mon Sep 17 00:00:00 2001 From: Fedora Date: Fri, 17 Dec 2010 19:58:48 +0800 Subject: [PATCH 11/11] Upgrade to FCITX 4.0.1 --- fcitx.spec | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/fcitx.spec b/fcitx.spec index 0fc2f22..40e6ae9 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -2,7 +2,7 @@ Name: fcitx Summary: Free Chinese Input Toy for X (XIM) -Version: 4.0.0 +Version: 4.0.1 Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops @@ -13,7 +13,7 @@ BuildRequires: pango-devel dbus-devel BuildRequires: wget intltool chrpath Requires: %{name}-libs = %{version}-%{release} Requires: imsettings -Requires(post): %{_sbindir}/alternatives +Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives %description @@ -55,10 +55,10 @@ rm -f %{buildroot}%{_libdir}/*.la chrpath --delete %{buildroot}%{_bindir}/{*PYMB,mb2org,fcitx,readPYBase} # fix doc path -mkdir __doc -mv %{buildroot}%{_datadir}/%{name}/doc/* __doc -rm -rf %{buildroot}%{_datadir}/%{name}/doc -rm -f __doc/{API.txt,Develop_Readme*,fcitx_trunk.doxyfile} +#mkdir __doc +#mv %{buildroot}%{_datadir}/%{name}/doc/* __doc +#rm -rf %{buildroot}%{_datadir}/%{name}/doc +#rm -f __doc/{API.txt,Develop_Readme*,fcitx_trunk.doxyfile} # install xinput config file install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf} @@ -85,11 +85,24 @@ fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog THANKS TODO -%doc __doc/* +#%doc __doc/* %config %{_xinputconf} %{_bindir}/* %{_datadir}/%{name} %{_datadir}/pixmaps/* +%{_datadir}/applications/%{name}-configtool.desktop +%{_datadir}/applications/%{name}.desktop +%{_docdir}/%{name}/ +%{_mandir}/man1/createPYMB.1.gz +%{_mandir}/man1/fcitx-remote.1.gz +%{_mandir}/man1/fcitx.1.gz +%{_mandir}/man1/mb2org.1.gz +%{_mandir}/man1/mb2txt.1.gz +%{_mandir}/man1/readPYBase.1.gz +%{_mandir}/man1/readPYMB.1.gz +%{_mandir}/man1/scel2org.1.gz +%{_mandir}/man1/txt2mb.1.gz + %files libs %defattr(-,root,root,-) @@ -104,6 +117,9 @@ fi %{_includedir}/fcitx* %changelog +* Fri Dec 17 2010 Liang Suilong - 4.0.1-1 +- Update to 4.0.1 + * Fri Nov 19 2010 Chen Lei - 4.0.0-1 - Update to 4.0.0