[fcitx] Separate fcitx-libs again
Liang Suilong
liangsuilong at fedoraproject.org
Tue Aug 2 09:41:35 UTC 2011
commit 66ddf350ab40107bc5f606620d5f5660ed53c2ae
Author: Fedora <fedora at fedora-desktop.(none)>
Date: Tue Aug 2 17:29:49 2011 +0800
Separate fcitx-libs again
fcitx.spec | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/fcitx.spec b/fcitx.spec
index 58f1b5b..e7ab8eb 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -19,7 +19,7 @@ Requires: %{name}-data = %{version}-%{release}
Requires: imsettings
Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives
-Provides: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description
FCITX(Free Chinese Input Toy of X) is a collection of Simplified Chinese
@@ -31,7 +31,14 @@ Summary: Data files of FCITX
Group: System Environment/Libraries
%description data
-The %{name}-data package provides shared libraries for FCITX.
+The %{name}-data package provides shared datas for FCITX.
+
+%package libs
+Summary: Shared 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
@@ -47,6 +54,7 @@ developing programs using FCITX libraries.
Summary: Bingchan table of FCITX
Group: System Environment/Libraries
BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
%description table-bingchan
The %{name}-table-bingchan package provides Bingchan table for FCITX.
@@ -55,6 +63,7 @@ The %{name}-table-bingchan package provides Bingchan table for FCITX.
Summary: Cangjie table of FCITX
Group: System Environment/Libraries
BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
%description table-cangjie
The %{name}-table-bingchan package provides Cangjie table for FCITX.
@@ -63,6 +72,7 @@ The %{name}-table-bingchan package provides Cangjie table for FCITX.
Summary: Dianbaoma table of FCITX
Group: System Environment/Libraries
BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
%description table-dianbaoma
The %{name}-table-dianbaoma package provides Dianbaoma table for FCITX.
@@ -71,6 +81,7 @@ The %{name}-table-dianbaoma package provides Dianbaoma table for FCITX.
Summary: Erbi table of FCITX
Group: System Environment/Libraries
BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
%description table-erbi
The %{name}-table-erbi package provides Erbi table for FCITX.
@@ -79,6 +90,7 @@ The %{name}-table-erbi package provides Erbi table for FCITX.
Summary: Wanfeng table of FCITX
Group: System Environment/Libraries
BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
%description table-wanfeng
The %{name}-table-wanfeng package provides Wanfeng table for FCITX.
@@ -87,6 +99,7 @@ The %{name}-table-wanfeng package provides Wanfeng table for FCITX.
Summary: Wubi-pinyin table of FCITX
Group: System Environment/Libraries
BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
%description table-wbpy
The %{name}-table-wbpy package provides Wubi-pinyin table for FCITX.
@@ -95,6 +108,7 @@ The %{name}-table-wbpy package provides Wubi-pinyin table for FCITX.
Summary: Wubi table of FCITX
Group: System Environment/Libraries
BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
%description table-wubi
The %{name}-table-wubi package provides Wubi table for FCITX.
@@ -103,6 +117,7 @@ The %{name}-table-wubi package provides Wubi table for FCITX.
Summary: Ziranma table of FCITX
Group: System Environment/Libraries
BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
%description table-ziranma
The %{name}-table-ziranma package provides Ziranma table for FCITX.
@@ -140,16 +155,20 @@ install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf}
%clean
rm -rf %{buildroot}
-%post -p /sbin/ldconfig
+%post
%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 55 || :
-%postun -p /sbin/ldconfig
+%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 libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog THANKS TODO COPYING
@@ -159,7 +178,6 @@ fi
%{_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
@@ -170,6 +188,10 @@ fi
%{_mandir}/man1/scel2org.1.gz
%{_mandir}/man1/txt2mb.1.gz
+%files libs
+%defattr(-,root,root,-)
+%doc
+%{_libdir}/libfcitx*.so.*
%files data
%defattr(-,root,root,-)
@@ -249,6 +271,7 @@ fi
%changelog
* Tue Aug 02 2011 Liang Suilong <liangsuilong at gmail.com> - 4.0.1-5
- Fix that %files lists a wrong address
+- Separate fcitx-libs again
* Tue Aug 02 2011 Liang Suilong <liangsuilong at gmail.com> - 4.0.1-4
- Separates varieties of tables from FCITX
More information about the scm-commits
mailing list