From 7883c86826ea6c3e92847e74d11a47bd40f9689a4fba7a4af39c70a95fbd2c95 Mon Sep 17 00:00:00 2001 From: Jan Arne Petersen Date: Thu, 31 May 2012 10:04:27 +0000 Subject: [PATCH] Simplify package structure Update some file names OBS-URL: https://build.opensuse.org/package/show/M17N:Maliit/maliit-framework?expand=0&rev=51 --- maliit-framework.spec | 132 ++++++++---------------------------------- 1 file changed, 23 insertions(+), 109 deletions(-) diff --git a/maliit-framework.spec b/maliit-framework.spec index 5c63b0a..4755341 100644 --- a/maliit-framework.spec +++ b/maliit-framework.spec @@ -7,7 +7,7 @@ Name: maliit-framework Version: 0.92.0 -Release: 0%{dist} +Release: 1%{dist} Summary: Maliit Input Method Framework Group: System Environment/Libraries @@ -67,63 +67,6 @@ This package contains the files necessary to develop input method plugins for Maliit, and applications using the libmaliit extension library. -%package -n libmaliit-plugins-0_80-0 -Summary: Maliit Framework Input Method library -Group: Development/Libraries -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - -%description -n libmaliit-plugins-0_80-0 -Interfaces for Maliit Input Method Plugins - -%package -n libmaliit-plugins-0_80-0-devel -Summary: Maliit Framework Input Method Library Development Files -Group: Development/Libraries -Requires: libmaliit-plugins-0_80-0 - -%description -n libmaliit-plugins-0_80-0-devel -Development files the Maliit Input Method Plugins Interfaces - -%package -n libmaliit-plugins-quick-0_80-0 -Summary: Maliit Framework Input Method Quick Library -Group: Development/Libraries -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - -%package -n libmaliit-connection-0_80-0 -Summary: Maliit Framework Connection -Group: Development/Libraries - -%description -n libmaliit-connection-0_80-0 -Maliit Framework - connection interfaces - -%package -n libmaliit-connection-0_80-0-devel -Summary: Maliit Framework Connection -Group: Development/Libraries - -%description -n libmaliit-connection-0_80-0-devel -Development files for the Maliit Framework - connection interfaces - -%package -n libmaliit-server-0_80-0-devel -Summary: Maliit Framework Connection -Group: Development/Libraries - -%description -n libmaliit-server-0_80-0-devel -Development files for the Maliit Framework - server interfaces - -%description -n libmaliit-plugins-quick-0_80-0 -Qt Quick Plugin Interface - Interfaces for QML-based -Maliit Input Method Plugins - -%package -n libmaliit-plugins-quick-0_80-0-devel -Summary: Maliit Framework Input Method Quick Development Files -Group: Development/Libraries -Requires: libmaliit-plugins-quick-0_80-0 - -%description -n libmaliit-plugins-quick-0_80-0-devel -Development files for the Qt Quick Plugin Interface - -Interfaces for QML-based Maliit Input Method Plugins - %package -n libmaliit-1_0-0 Summary: Maliit Framework Input Method library Group: Development/Libraries @@ -249,14 +192,6 @@ rm -rf %{buildroot} %postun /sbin/ldconfig -%post -n libmaliit-plugins-0_80-0 -p /sbin/ldconfig - -%postun -n libmaliit-plugins-0_80-0 -p /sbin/ldconfig - -%post -n libmaliit-plugins-quick-0_80-0 -p /sbin/ldconfig - -%postun -n libmaliit-plugins-quick-0_80-0 -p /sbin/ldconfig - %post -n libmaliit-1_0-0 -p /sbin/ldconfig %postun -n libmaliit-1_0-0 -p /sbin/ldconfig @@ -269,7 +204,14 @@ rm -rf %{buildroot} %endif %defattr(-,root,root,-) %doc README LICENSE.LGPL NEWS +%dir %{_libdir}/maliit/ +%dir %{_libdir}/maliit/plugins-1.0/ +%dir %{_libdir}/maliit/plugins-1.0/factories %{_bindir}/maliit-server +%{_libdir}/libmaliit-connection-0.80.so.* +%{_libdir}/libmaliit-plugins-1.0.so.* +%{_libdir}/libmaliit-plugins-quick-0.80.so.* +%{_libdir}/maliit/plugins-1.0/factories/libmaliit-plugins-quick-factory-0.80.so %{_qt4_plugindir}/inputmethods/*.so %{_datadir}/dbus-1/services/org.maliit.server.service %if 0%{?fedora} @@ -281,55 +223,23 @@ rm -rf %{buildroot} %dir %{_includedir}/maliit/ %dir %{_includedir}/maliit/framework-0.80/ %dir %{_includedir}/maliit/framework-0.80/maliit/ +%{_includedir}/maliit/connection-0.80/ %{_includedir}/maliit/framework-0.80/maliit/namespace.h +%{_includedir}/maliit/plugins-1.0/ +%{_includedir}/maliit/plugins-quick-0.80/ +%{_includedir}/maliit/server-0.80/ +%{_libdir}/libmaliit-connection-0.80.so +%{_libdir}/libmaliit-plugins-1.0.so +%{_libdir}/libmaliit-plugins-quick-0.80.so +%{_libdir}/pkgconfig/maliit-connection-0.80.pc %{_libdir}/pkgconfig/maliit-framework-0.80.pc +%{_libdir}/pkgconfig/maliit-plugins-1.0.pc +%{_libdir}/pkgconfig/maliit-plugins-quick-0.80.pc +%{_libdir}/pkgconfig/maliit-server-0.80.pc %{_qt4_datadir}/mkspecs/features/maliit-defines.prf %{_qt4_datadir}/mkspecs/features/maliit-framework.prf - -# Plugins -%files -n libmaliit-plugins-0_80-0 -%defattr(-,root,root,-) -%{_libdir}/libmaliit-plugins-0.80.so.* - -%files -n libmaliit-plugins-0_80-0-devel -%defattr(-,root,root,-) -%{_includedir}/maliit/plugins-0.80/ -%{_libdir}/libmaliit-plugins-0.80.so -%{_libdir}/pkgconfig/maliit-plugins-0.80.pc %{_qt4_datadir}/mkspecs/features/maliit-plugins.prf -%files -n libmaliit-plugins-quick-0_80-0 -%defattr(-,root,root,-) -%{_libdir}/libmaliit-plugins-quick-0.80.so.* -%dir %{_libdir}/maliit/ -%dir %{_libdir}/maliit/plugins-0.80/ -%dir %{_libdir}/maliit/plugins-0.80/factories -%{_libdir}/maliit/plugins-0.80/factories/libmaliit-plugins-quick-factory-0.80.so - -%files -n libmaliit-plugins-quick-0_80-0-devel -%defattr(-,root,root,-) -%{_libdir}/libmaliit-plugins-quick-0.80.so -%dir %{_includedir}/maliit/ -%{_includedir}/maliit/plugins-quick-0.80/ -%{_libdir}/pkgconfig/maliit-plugins-quick-0.80.pc - -# Connection -%files -n libmaliit-connection-0_80-0 -%defattr(-,root,root,-) -%{_libdir}/libmaliit-connection-0.80.so.* - -%files -n libmaliit-connection-0_80-0-devel -%defattr(-,root,root,-) -%{_libdir}/libmaliit-connection-0.80.so -%{_includedir}/maliit/connection-0.80/ -%{_libdir}/pkgconfig/maliit-connection-0.80.pc - -# Server -%files -n libmaliit-server-0_80-0-devel -%defattr(-,root,root,-) -%{_includedir}/maliit/server-0.80/ -%{_libdir}/pkgconfig/maliit-server-0.80.pc - # libmaliit %files -n libmaliit-1_0-0 %defattr(-,root,root,-) @@ -377,6 +287,10 @@ rm -rf %{buildroot} %endif %changelog +* Thu May 31 2012 Jan Arne Petersen - 0.92.0-1 +- Simplify package structure +- Update maliit-plugins version + * Mon May 07 2012 Jan Arne Petersen - 0.92.0-0 - Update to 0.92.0