From a16c25e50ed4544a3c8a78ee8e5d2e3ee62cb5ff Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 17 Sep 2013 00:22:53 -0400 Subject: [PATCH] Cleanup packaging and reset manifest - Reset manifest to floor - Use find_lang for locale files - Use %license to install licenses Change-Id: Id9e0f7cf77ff2581142b14051aeb26eb5f3f1f7a Signed-off-by: Anas Nashif --- isf.manifest | 39 ---------------------------------- packaging/isf.manifest | 5 +++++ packaging/isf.spec | 57 +++++++++++++++++++++++++++++--------------------- 3 files changed, 38 insertions(+), 63 deletions(-) delete mode 100755 isf.manifest create mode 100644 packaging/isf.manifest diff --git a/isf.manifest b/isf.manifest deleted file mode 100755 index cae73d3..0000000 --- a/isf.manifest +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packaging/isf.manifest b/packaging/isf.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/packaging/isf.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/isf.spec b/packaging/isf.spec index ca3d066..ac261b7 100644 --- a/packaging/isf.spec +++ b/packaging/isf.spec @@ -5,9 +5,10 @@ Name: isf Summary: Input Service Framework Version: 2.4.6508 Release: 1 -Group: System Environment/Libraries -License: LGPL +Group: Graphics & UI Framework/Input +License: LGPL-2.1 Source0: %{name}-%{version}.tar.gz +Source1001: isf.manifest BuildRequires: edje-bin BuildRequires: embryo-bin BuildRequires: gettext-tools @@ -23,16 +24,15 @@ BuildRequires: pkgconfig(edje) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(notification) BuildRequires: pkgconfig(dlog) -Requires(post): /sbin/ldconfig /usr/bin/vconftool +Requires(post): /sbin/ldconfig /usr/bin/vconftool Requires(postun): /sbin/ldconfig %description -Input Service Framewok (ISF) is an input method (IM) platform, and it has been derived from SCIM. - +Input Service Framewok (ISF) is an input method (IM) platform, +and it has been derived from SCIM. %package devel Summary: ISF header files -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -40,7 +40,6 @@ This package contains ISF header files for ISE development. %package -n ug-isfsetting-efl Summary: ISF setting ug -Group: Application Requires: %{name} = %{version}-%{release} %description -n ug-isfsetting-efl @@ -48,6 +47,7 @@ ISF setting UI Gadget %prep %setup -q +cp %{SOURCE1001} . %build CFLAGS+=" -fvisibility=hidden "; export CFLAGS @@ -55,22 +55,30 @@ CXXFLAGS+=" -fvisibility=hidden -fvisibility-inlines-hidden ";export CXXFLAGS %autogen %configure --disable-static \ - --disable-tray-icon --disable-filter-sctc + --disable-tray-icon \ + --disable-filter-sctc make %{?_smp_mflags} %install -rm -rf %{buildroot} %make_install -mkdir -p %{buildroot}%{_datadir}/license -install -m0644 %{_builddir}/%{buildsubdir}/COPYING %{buildroot}%{_datadir}/license/%{name} + +install -d %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants +install -m0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/user/ +ln -sf ../scim.service %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants/scim.service +mkdir -p %{buildroot}/etc/scim/conf +mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/Helper +mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/SetupUI +mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine + +%find_lang isfsetting-efl +%find_lang keyboard-setting-wizard-efl +%find_lang scim + +cat keyboard-setting-wizard-efl.lang scim.lang > isf.lang %post /sbin/ldconfig -mkdir -p /etc/scim/conf -mkdir -p /opt/apps/scim/lib/scim-1.0/1.4.0/Helper -mkdir -p /opt/apps/scim/lib/scim-1.0/1.4.0/SetupUI -mkdir -p /opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine /usr/bin/vconftool set -t bool file/private/isf/autocapital_allow 1 -g 6514 || : @@ -79,10 +87,17 @@ mkdir -p /opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine %postun -p /sbin/ldconfig +%post -n ug-isfsetting-efl +mkdir -p /opt/ug/bin/ +ln -sf /usr/bin/ug-client /opt/ug/bin/isfsetting-efl -%files +%files -f isf.lang %manifest %{name}.manifest %defattr(-,root,root,-) +%dir /etc/scim/conf +%dir /opt/apps/scim/lib/scim-1.0/1.4.0/Helper +%dir /opt/apps/scim/lib/scim-1.0/1.4.0/SetupUI +%dir /opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine %{_libdir}/systemd/user/core-efl.target.wants/scim.service %{_libdir}/systemd/user/scim.service %attr(755,root,root) %{_sysconfdir}/profile.d/isf.sh @@ -90,7 +105,6 @@ mkdir -p /opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine %{_sysconfdir}/scim/config %{_datadir}/scim/isf_candidate_theme1.edj %{_datadir}/scim/icons/* -%{_datadir}/locale/* %{_bindir}/isf-demo-efl %{_bindir}/scim %{_bindir}/isf-log @@ -104,9 +118,8 @@ mkdir -p /opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine %{_libdir}/scim-1.0/scim-launcher %{_libdir}/scim-1.0/scim-helper-launcher %{_libdir}/libscim-*.so* -%{_ugdir}/res/locale/*/LC_MESSAGES/keyboard-setting-wizard-efl.* %{_ugdir}/lib/libug-keyboard-setting-wizard-efl.so -%{_datadir}/license/%{name} +%license COPYING %files devel %defattr(-,root,root,-) @@ -115,14 +128,10 @@ mkdir -p /opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine %{_libdir}/pkgconfig/isf.pc %{_libdir}/pkgconfig/scim.pc -%post -n ug-isfsetting-efl -mkdir -p /opt/ug/bin/ -ln -sf /usr/bin/ug-client /opt/ug/bin/isfsetting-efl -%files -n ug-isfsetting-efl +%files -n ug-isfsetting-efl -f isfsetting-efl.lang %manifest ug-isfsetting-efl.manifest /etc/smack/accesses2.d/ug.isfsetting-efl.include /usr/share/packages/ug-isfsetting-efl.xml %{_ugdir}/lib/libug-isfsetting-efl.so -%{_ugdir}/res/locale/*/LC_MESSAGES/isfsetting-efl.* %{_datadir}/scim/isfsetting.edj -- 2.7.4