From cb0f6fd542ad1ca7d75536d0d23fb9610c814978 Mon Sep 17 00:00:00 2001 From: Fedora Date: Tue, 2 Aug 2011 02:41:13 +0800 Subject: [PATCH] Fix that %files lists a wrong address --- fcitx.spec | 35 +++---- fcitx.spec~ | 278 ---------------------------------------------------- 2 files changed, 18 insertions(+), 295 deletions(-) delete mode 100644 fcitx.spec~ diff --git a/fcitx.spec b/fcitx.spec index beb1bff..60c958c 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -3,7 +3,7 @@ Name: fcitx Summary: Free Chinese Input Toy for X (XIM) Version: 4.0.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: User Interface/Desktops URL: http://code.google.com/p/%{name}/ @@ -191,8 +191,6 @@ fi %{_datadir}/%{name}/data/table/disable-table.conf.template %{_datadir}/%{name}/data/vk.conf - - %files devel %defattr(-,root,root,-) %doc @@ -203,46 +201,49 @@ fi %files table-bingchan %defattr(-,root,root,-) %doc -%{_datadir}/%{name}/data/qxm.conf -%{_datadir}/%{name}/data/qxm.mb +%{_datadir}/%{name}/data/table/qxm.conf +%{_datadir}/%{name}/data/table/qxm.mb %files table-cangjie %defattr(-,root,root,-) %doc -%{_datadir}/%{name}/data/cangjie.conf -%{_datadir}/%{name}/data/cj.mb +%{_datadir}/%{name}/data/table/cangjie.conf +%{_datadir}/%{name}/data/table/cj.mb %files table-erbi %defattr(-,root,root,-) %doc -%{_datadir}/%{name}/data/erbi.conf -%{_datadir}/%{name}/data/erbi.mb +%{_datadir}/%{name}/data/table/erbi.conf +%{_datadir}/%{name}/data/table/erbi.mb %files table-wanfeng %defattr(-,root,root,-) %doc -%{_datadir}/%{name}/data/wanfeng.conf -%{_datadir}/%{name}/data/wanfeng.mb +%{_datadir}/%{name}/data/table/wanfeng.conf +%{_datadir}/%{name}/data/table/wanfeng.mb %files table-wbpy %defattr(-,root,root,-) %doc -%{_datadir}/%{name}/data/wbpy.conf -%{_datadir}/%{name}/data/wbpy.mb +%{_datadir}/%{name}/data/tablew/bpy.conf +%{_datadir}/%{name}/data/table/wbpy.mb %files table-wubi %defattr(-,root,root,-) %doc -%{_datadir}/%{name}/data/wubi.conf -%{_datadir}/%{name}/data/wubi.mb +%{_datadir}/%{name}/data/table/wubi.conf +%{_datadir}/%{name}/data/table/wubi.mb %files table-ziranma %defattr(-,root,root,-) %doc -%{_datadir}/%{name}/data/zrm.conf -%{_datadir}/%{name}/data/zrm.mb +%{_datadir}/%{name}/data/table/zrm.conf +%{_datadir}/%{name}/data/table/zrm.mb %changelog +* Tue Aug 02 2011 Liang Suilong - 4.0.1-5 +- Fix that %files lists a wrong address + * Tue Aug 02 2011 Liang Suilong - 4.0.1-4 - Separates varieties of tables from FCITX - Merge fcitx-libs into fcitx diff --git a/fcitx.spec~ b/fcitx.spec~ deleted file mode 100644 index a715f91..0000000 --- a/fcitx.spec~ +++ /dev/null @@ -1,278 +0,0 @@ -%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf - -Name: fcitx -Summary: Free Chinese Input Toy for X (XIM) -Version: 4.0.1 -Release: 4%{?dist} -License: GPLv2+ -Group: User Interface/Desktops -URL: http://code.google.com/p/%{name}/ -Source0: http://%{name}.googlecode.com/files/%{name}-%{version}_all.tar.gz -Source1: xinput-%{name} -Patch0: gnome3-tray-fix.patch -Patch1: gnome3-mainwindow-pos-walkaround.patch -# These two patches are provide by Weng Xuetian, who is fcitx's author. -BuildRequires: pango-devel dbus-devel -BuildRequires: wget intltool chrpath sysconftool -BuildRequires: automake, autoconf, libtool -Requires: %{name}-data = %{version}-%{release} -Requires: imsettings -Requires(post): %{_sbindir}/alternatives -Requires(postun): %{_sbindir}/alternatives -Provides: %{name}-libs = %{version}-%{release} - -%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. - -%package data -Summary: Data files of FCITX -Group: System Environment/Libraries - -%description data -The %{name}-data 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. - -%package table-bingchan -Summary: Bingchan table of FCITX -Group: System Environment/Libraries -BuildArch: noarch - -%description table-bingchan -The %{name}-table-bingchan package provides Bingchan table for FCITX. - -%package table-cangjie -Summary: Cangjie table of FCITX -Group: System Environment/Libraries -BuildArch: noarch - -%description table-cangjie -The %{name}-table-bingchan package provides Cangjie table for FCITX. - -%package table-dianbaoma -Summary: Dianbaoma table of FCITX -Group: System Environment/Libraries -BuildArch: noarch - -%description table-dianbaoma -The %{name}-table-dianbaoma package provides Dianbaoma table for FCITX. - -%package table-erbi -Summary: Erbi table of FCITX -Group: System Environment/Libraries -BuildArch: noarch - -%description table-erbi -The %{name}-table-erbi package provides Erbi table for FCITX. - -%package table-wanfeng -Summary: Wanfeng table of FCITX -Group: System Environment/Libraries -BuildArch: noarch - -%description table-wanfeng -The %{name}-table-wanfeng package provides Wanfeng table for FCITX. - -%package table-wbpy -Summary: Wubi-pinyin table of FCITX -Group: System Environment/Libraries -BuildArch: noarch - -%description table-wbpy -The %{name}-table-wbpy package provides Wubi-pinyin table for FCITX. - -%package table-wubi -Summary: Wubi table of FCITX -Group: System Environment/Libraries -BuildArch: noarch - -%description table-wubi -The %{name}-table-wubi package provides Wubi table for FCITX. - -%package table-ziranma -Summary: Ziranma table of FCITX -Group: System Environment/Libraries -BuildArch: noarch - -%description table-ziranma -The %{name}-table-ziranma package provides Ziranma table for FCITX. - -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 - -%build -./autogen.sh -%configure --disable-static \ - --enable-dbus \ - --enable-tray -make %{?_smp_mflags} - -%install -make install INSTALL="install -p" DESTDIR=%{buildroot} -rm -f %{buildroot}%{_libdir}/*.la - -# 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 -#rm -f __doc/{API.txt,Develop_Readme*,fcitx_trunk.doxyfile} - -# install xinput config file -install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf} - -%find_lang %{name} - -%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 - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog THANKS TODO COPYING -#%doc __doc/* -%config %{_xinputconf} -%{_bindir}/* -%{_datadir}/applications/%{name}-configtool.desktop -%{_datadir}/applications/%{name}.desktop -%{_docdir}/%{name}/ -%{_libdir}/libfcitx*.so.* -%{_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 data -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/skin/* -%{_datadir}/pixmaps/* -%{_datadir}/%{name}/data/AutoEng.dat -%{_datadir}/%{name}/data/addon.desc -%{_datadir}/%{name}/data/config.desc -%{_datadir}/%{name}/data/gbks2t.tab -%{_datadir}/%{name}/data/profile.desc -%{_datadir}/%{name}/data/punc.mb -%{_datadir}/%{name}/data/pySym.mb -%{_datadir}/%{name}/data/pybase.mb -%{_datadir}/%{name}/data/pyphrase.mb -%{_datadir}/%{name}/data/skin.desc -%{_datadir}/%{name}/data/sp.dat -%{_datadir}/%{name}/data/table.desc -%{_datadir}/%{name}/data/table/disable-table.conf.template -%{_datadir}/%{name}/data/vk.conf - - - -%files devel -%defattr(-,root,root,-) -%doc -%{_libdir}/libfcitx*.so -%{_libdir}/pkgconfig/fcitx*.pc -%{_includedir}/fcitx* - -%files table-bingchan -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/qxm.conf -%{_datadir}/%{name}/data/qxm.mb - -%files table-cangjie -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/cangjie.conf -%{_datadir}/%{name}/data/cj.mb - -%files table-erbi -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/erbi.conf -%{_datadir}/%{name}/data/erbi.mb - -%files table-wanfeng -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/wanfeng.conf -%{_datadir}/%{name}/data/wanfeng.mb - -%files table-wbpy -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/wbpy.conf -%{_datadir}/%{name}/data/wbpy.mb - -%files table-wubi -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/wubi.conf -%{_datadir}/%{name}/data/wubi.mb - -%files table-ziranma -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/zrm.conf -%{_datadir}/%{name}/data/zrm.mb - -%changelog -* Tue Aug 02 2011 Liang Suilong - 4.0.1-4 -- Separates varieties of tables from FCITX -- Merge fcitx-libs into fcitx - -* Sun Jul 03 2011 Liang Suilong - 4.0.1-3 -- Support GNOME 3 tray icon -- Fix that main window is covered by GNOME Shell - -* Tue Feb 08 2011 Fedora Release Engineering - 4.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* 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 - -* 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 - -* 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