From fa4b32f56478eb47fe2a990fc6b5b353ef92669f330e2a0093e5caed00d50608 Mon Sep 17 00:00:00 2001 From: Jon Nordby Date: Wed, 14 Dec 2011 09:14:21 +0000 Subject: [PATCH] Accepting request 96540 from home:arauho:branches:M17N:Maliit Update spec file to follow closer the Maliit packaging guidelines OBS-URL: https://build.opensuse.org/request/show/96540 OBS-URL: https://build.opensuse.org/package/show/M17N:Maliit/maliit-framework?expand=0&rev=22 --- debian.changelog | 6 -- debian.control | 32 ------ debian.rules | 97 ----------------- maliit-framework.dsc | 10 -- maliit-framework.spec | 238 +++++++++++++++++++++++++++++++++++++----- 5 files changed, 209 insertions(+), 174 deletions(-) delete mode 100644 debian.changelog delete mode 100644 debian.control delete mode 100644 debian.rules delete mode 100644 maliit-framework.dsc diff --git a/debian.changelog b/debian.changelog deleted file mode 100644 index b9eb42d..0000000 --- a/debian.changelog +++ /dev/null @@ -1,6 +0,0 @@ -maliit-framework (0.80.5-0) unstable; urgency=low - - * New release - - -- Jon Nordby Tue, 06 Sep 2011 12:41:43 +0300 - diff --git a/debian.control b/debian.control deleted file mode 100644 index 0431dfe..0000000 --- a/debian.control +++ /dev/null @@ -1,32 +0,0 @@ -Source: maliit-framework -Section: libs -Priority: extra -Maintainer: Jon Nordby -Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.6), libxcomposite-dev, libxfixes-dev, libxdamage-dev, libxext-dev, libdbus-glib-1-dev, libgconf2-dev, pkg-config, dpkg-dev, graphviz, doxygen -Standards-Version: 3.7.2 - -Package: maliit-framework -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: Maliit Input Method Framework - Maliit Input Method Framework - -Package: maliit-framework-dbg -Architecture: any -Depends: maliit-framework (= ${binary:Version}) -Description: Maliit Input Method Framework Debug symbols - Debug files for Maliit Input Method Framework - -Package: maliit-framework-dev -Section: libdevel -Architecture: all -Depends: maliit-framework (>= ${source:Version}), libqt4-dev (>= 4.7) -Description: Maliit Input Method Framework development files - Development files for Maliit Input Method Framework - -Package: maliit-framework-doc -Section: doc -Architecture: all -Description: Technical documentation of Maliit Input Method Framework - Technical documentation of Maliit Input Method Framework - Includes API reference and internal documentations. diff --git a/debian.rules b/debian.rules deleted file mode 100644 index 363fcfe..0000000 --- a/debian.rules +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 - -DEBDIR = .. - -comma :=, -empty := -space := $(empty) $(empty) - -# Build options -ENABLE_MULTITOUCH = false -QMAKE_OPTIONS+=CONFIG+=notests - -# shared library versions, option 1 -version=0.1.0 -major=0 - -QT_INSTALL_DATA:=$(shell qmake -query QT_INSTALL_DATA) -QT_INSTALL_PLUGINS:=$(shell qmake -query QT_INSTALL_PLUGINS) - -configure: configure-stamp -configure-stamp: - dh_testdir - qmake -r $(QMAKE_OPTIONS) - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - - make $(PARALLEL_MAKEFLAGS) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - - rm -f build-stamp configure-stamp - - make $(PARALLEL_MAKEFLAGS) clean || true - rm -f lib/* - rm -rf .obj - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs $(EXCLUSIONS) - - # Then proceed to normal installation - GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 INSTALL_ROOT=$(CURDIR)/debian/tmp make $(PARALLEL_MAKEFLAGS) install - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir $(EXCLUSIONS) - dh_testroot $(EXCLUSIONS) - dh_installchangelogs $(EXCLUSIONS) - dh_installdocs $(EXCLUSIONS) - dh_install --sourcedir=debian/tmp $(EXCLUSIONS) -v - dh_gconf $(EXCLUSIONS) -# dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo -# dh_installman - dh_link $(EXCLUSIONS) - dh_strip --dbg-package=maliit-framework - dh_compress $(EXCLUSIONS) - dh_fixperms $(EXCLUSIONS) -# dh_perl -# dh_python - dh_makeshlibs $(EXCLUSIONS) - dh_installdeb $(EXCLUSIONS) - dh_shlibdeps $(EXCLUSIONS) - dh_gencontrol $(EXCLUSIONS) - dh_md5sums $(EXCLUSIONS) - dh_builddeb --destdir=$(DEBDIR) $(EXCLUSIONS) - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/maliit-framework.dsc b/maliit-framework.dsc deleted file mode 100644 index b90c17c..0000000 --- a/maliit-framework.dsc +++ /dev/null @@ -1,10 +0,0 @@ -Format: 1.0 -Source: maliit-framework -Version: 0.80.5-0 -Binary: maliit-framework -Maintainer: Jon Nordby -Architecture: any -Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.6), libxcomposite-dev, libxfixes-dev, libxdamage-dev, libxext-dev, libdbus-glib-1-dev, libgconf2-dev, pkg-config, dpkg-dev, graphviz, doxygen -Files: - d57283ebb8157ae919762c58419353c8 133282 packageName_5.6.orig.tar.gz - 2fecf324a32123b08cefc0f047bca5ee 63176 packageName_5.6-1.diff.tar.gz diff --git a/maliit-framework.spec b/maliit-framework.spec index 4a41345..39684c9 100644 --- a/maliit-framework.spec +++ b/maliit-framework.spec @@ -14,7 +14,6 @@ Group: System Environment/Libraries License: LGPLv2 URL: http://www.maliit.org Source0: %{name}-%{version}.tar.bz2 -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: pkgconfig(QtCore) >= 4.7.0 BuildRequires: pkgconfig(QtDeclarative) @@ -51,7 +50,7 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description -Maliit Input Methods Framework +Core server and libraries for the Maliit Input Methods Framework %package devel Summary: Maliit Input Method Framework Development Package @@ -63,11 +62,113 @@ This package contains the files necessary to develop input method plugins for Maliit, and applications using the libmaliit extension library. -#FIXME: split up and package as per the Maliit packaging guidelines: -# https://wiki.maliit.org/PackagingGuidelines +%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 + +%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 +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description -n libmaliit-1_0-0 +Maliit toolkit support extension library for Qt applications + +%package -n libmaliit-1_0-0-devel +Summary: Maliit Framework Input Method library development files +Group: Development/Libraries +Requires: libmaliit-1_0-0 + +%description -n libmaliit-1_0-0-devel +Development files for the Maliit toolkit support extension library +for Qt applications + +%package doc +Summary: Maliit Framework Documentation +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description doc +Documentation for the Maliit Input Method Framework + +%package sdk +Summary: Maliit Framework SDK +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: maliit-framework-doc + +%description sdk +SDK environment for Maliit + +%package tests +Summary: Maliit Framework Input Method Tests Package +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description tests +This package contains the files necessary to test +the Maliit input method framework + +%package examples +Summary: Maliit Framework Input Method Examples +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description examples +This package contains examples applications for +the Maliit input method framework + +%package -n maliit-inputcontext-gtk2 +Summary: Maliit Input Context Plugin for Gtk+2 +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description -n maliit-inputcontext-gtk2 +Gtk+ plugin for basic Gtk+ version 2 toolkit support + +%package -n maliit-inputcontext-gtk3 +Summary: Maliit Input Context Plugin for Gtk+3 +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description -n maliit-inputcontext-gtk3 +Gtk+ plugin for basic Gtk+ version 3 toolkit support %prep -%setup -q -n maliit-framework-%{version} +%setup -q -n %{name}-%{version} %build %{_qt4_qmake} -r M_IM_VERSION=%{version} \ @@ -109,55 +210,134 @@ rm -rf %{buildroot} %pre %gconf_schema_prepare maliit-framework +%preun +%gconf_schema_remove maliit-framework + %post /sbin/ldconfig %gconf_schema_upgrade maliit-framework - -%preun -%gconf_schema_remove maliit-framework %endif -%postun +%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 + %if 0%{?suse_version} %files -f %{name}.schemas_list %else %files %endif - %defattr(-,root,root,-) %doc README LICENSE.LGPL NEWS %{_bindir}/maliit-server -%{_bindir}/maliit-exampleapp-* -%{_bindir}/maliit-sdk -%{_libdir}/*.so.* -%dir %{_libdir}/maliit -%dir %{_libdir}/maliit/plugins-0.80 %{_qt4_plugindir}/inputmethods/*.so -%dir %{_libdir}/maliit-framework-tests -%{_libdir}/maliit-framework-tests/* -%dir %{_datadir}/doc/maliit-framework -%{_datadir}/doc/maliit-framework/* -%{_libdir}/gtk-2.0/2.10.0/immodules/libim-maliit.so* -%{_libdir}/gtk-3.0/3.0.0/immodules/libim-maliit.so -%dir %{_libdir}/maliit/plugins-0.80/factories -%{_libdir}/maliit/plugins-0.80/factories/libmaliit-plugins-quick-factory-0.80.so %{_datadir}/dbus-1/services/org.maliit.server.service -%{_datadir}/maliit-framework-tests/* -%dir %{_datadir}/maliit-framework-tests - %if 0%{?fedora} %{_sysconfdir}/gconf/schemas/maliit-framework.schemas %endif %files devel %defattr(-,root,root,-) -%{_includedir}/maliit/ -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc +%dir %{_includedir}/maliit/ +%dir %{_includedir}/maliit/framework-0.80/ +%dir %{_includedir}/maliit/framework-0.80/maliit/ +%{_includedir}/maliit/framework-0.80/maliit/namespace.h +%{_libdir}/pkgconfig/maliit-framework-0.80.pc + +%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,-) +%dir %{_includedir}/maliit/ +%dir %{_includedir}/maliit/plugins-0.80/ +%{_includedir}/maliit/plugins-0.80/ +%{_libdir}/libmaliit-plugins-0.80.so +%{_libdir}/pkgconfig/maliit-plugins-0.80.pc + +%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 + +%files -n libmaliit-1_0-0 +%defattr(-,root,root,-) +%{_libdir}/libmaliit-1.0.so.* + +%files -n libmaliit-1_0-0-devel +%defattr(-,root,root,-) +%{_libdir}/libmaliit-1.0.so +%dir %{_includedir}/maliit/ +%{_includedir}/maliit/maliit-1.0/ +%{_libdir}/pkgconfig/maliit-1.0.pc + +%files doc +%defattr(-,root,root,-) +%dir %{_datadir}/doc/maliit-framework/ +%{_datadir}/doc/maliit-framework/html + +%files sdk +%defattr(-,root,root,-) +%{_bindir}/maliit-sdk +%dir %{_datadir}/doc/maliit-framework/ +%{_datadir}/doc/maliit-framework/maliit-sdk + +%files tests +%defattr(-,root,root,-) +%dir %{_libdir}/maliit-framework-tests/ +%{_libdir}/maliit-framework-tests/* +%dir %{_datadir}/maliit-framework-tests/ +%{_datadir}/maliit-framework-tests/* + +%files examples +%defattr(-,root,root,-) +%{_bindir}/maliit-exampleapp-widgetproperties +%{_bindir}/maliit-exampleapp-plainqt +%{_bindir}/maliit-exampleapp-twofields + +%files -n maliit-inputcontext-gtk2 +%defattr(-,root,root,-) +%{_bindir}/maliit-exampleapp-gtk2 +%{_libdir}/gtk-2.0/2.10.0/immodules/libim-maliit.so* + +%files -n maliit-inputcontext-gtk3 +%defattr(-,root,root,-) +%{_bindir}/maliit-exampleapp-gtk3 +%{_libdir}/gtk-3.0/3.0.0/immodules/libim-maliit.so* %changelog +* Tue Dec 13 2011 Luis Araujo - 0.81.1.1-0 +- Add libmaliit-plugins and libmaliit-plugins-devel packages +- Add libmaliit-plugins-quick and libmaliit-plugins-quick-dev packages +- Add libmaliit and libmaliit-dev packages +- Add doc, sdk, tests, examples, packages +- Add gtk2/gtk3 inputcontext packages +- Update some file paths inclusion +- Remove debian.{control,rules,changelog} files +- Remove maliit-framework.dsc + * Tue Dec 07 2011 Jon Nordby - 0.81.1.1-0 - Update to 0.81.1.1