- moved Vala API to seperate package; rel. 2

[packages/dconf.git] / dconf.spec

diff --git a/dconf.spec b/dconf.spec
index 6b21e676640330652b516b671000a92ae36cbd75..a0aaab6be08ae3264d0430a4e2035a26769d9015 100644 (file)
--- a/dconf.spec
+++ b/dconf.spec
@@ -1,27 +1,31 @@
 #
 # Conditional build:
 %bcond_without apidocs         # do not build and package API docs
+%bcond_without vala            # do not build Vala API
 #
 Summary:       Low-level configuration system
 Name:          dconf
-Version:       0.7.2
+Version:       0.12.1
 Release:       2
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/dconf/0.7/%{name}-%{version}.tar.bz2
-# Source0-md5: 1583be314e3ea0ab483d104e791ef653
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/dconf/0.12/%{name}-%{version}.tar.xz
+# Source0-md5: 0ebbfa50ab69e5d679cf8a1c68e75bf3
 URL:           http://live.gnome.org/dconf
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.11
-BuildRequires: glib2-devel >= 1:2.28.0
+BuildRequires: dbus-devel
+BuildRequires: glib2-devel >= 1:2.31.18
 BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: gtk-doc >= 1.15
-BuildRequires: libtool >= 2:2.2
 BuildRequires: libxml2-devel
 BuildRequires: rpmbuild(macros) >= 1.527
-BuildRequires: vala >= 1:0.11.4
-Requires(post,postun): glib2 >= 1:2.28.0
+BuildRequires: tar >= 1:1.22
+%{?with_vala:BuildRequires:    vala >= 2:0.15.1}
+BuildRequires: xz
+Requires(post,postun): glib2 >= 1:2.26.0
 Requires:      dbus
+Requires:      glib2 >= 1:2.31.18
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,7 +38,8 @@ Summary:      Header files for dconf library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki dconf
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.28.0
+Requires:      dbus-devel
+Requires:      glib2-devel >= 1:2.31.18
 
 %description devel
 Header files for dconf library.
@@ -47,6 +52,8 @@ Summary:      Configuration editor for dconf
 Summary(pl.UTF-8):     Edytor konfiguracji dla dconf
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
+Requires(post,postun): gtk-update-icon-cache
+Requires:      hicolor-icon-theme
 
 %description editor
 dconf-editor allows you to browse and modify dconf database.
@@ -66,11 +73,34 @@ API documentation for dconf library.
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki dconf.
 
+%package -n bash-completion-dconf
+Summary:       bash-completion for dconf
+Summary(pl.UTF-8):     Bashowe uzupełnianie nazw dla dconf
+Group:         Applications/Shells
+Requires:      bash-completion
+
+%description -n bash-completion-dconf
+bash-completion for dconf.
+
+%description -n bash-completion-dconf -l pl.UTF-8
+Bashowe uzupełnianie nazw dla dconf.
+
+%package -n vala-dconf
+Summary:       dconf API for Vala language
+Summary(pl.UTF-8):     API dconf dla języka Vala
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description -n vala-dconf
+dconf API for Vala language.
+
+%description -n vala-dconf -l pl.UTF-8
+API dconf dla języka Vala.
+
 %prep
 %setup -q
 
 %build
-%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -88,8 +118,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/dconf/{db,profile}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
 %{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}}
 
 %clean
@@ -99,15 +127,23 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 umask 022
-%{_bindir}/gio-querymodules %{_libdir}/gio/modules
-exit 0
+%{_bindir}/gio-querymodules %{_libdir}/gio/modules || :
+
+%glib_compile_schemas
 
 %postun
 /sbin/ldconfig
 
 umask 022
-%{_bindir}/gio-querymodules %{_libdir}/gio/modules
-exit 0
+%{_bindir}/gio-querymodules %{_libdir}/gio/modules || :
+
+%glib_compile_schemas
+
+%post editor
+%update_icon_cache hicolor
+
+%postun editor
+%update_icon_cache hicolor
 
 %files
 %defattr(644,root,root,755)
@@ -120,7 +156,7 @@ exit 0
 %attr(755,root,root) %{_libexecdir}/dconf-service
 %attr(755,root,root) %{_libdir}/gio/modules/libdconfsettings.so
 %{_datadir}/dbus-1/services/ca.desrt.dconf.service
-%{_datadir}/dbus-1/system-services/ca.desrt.dconf.service
+%{_datadir}/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml
 %dir %{_sysconfdir}/dconf
 %dir %{_sysconfdir}/dconf/db
 %dir %{_sysconfdir}/dconf/profile
@@ -133,17 +169,27 @@ exit 0
 %{_includedir}/dconf-dbus-1
 %{_pkgconfigdir}/dconf.pc
 %{_pkgconfigdir}/dconf-dbus-1.pc
-# split to a separate package?
-%{_datadir}/vala/vapi/dconf.*
 
 %files editor
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/dconf-editor
 %{_desktopdir}/dconf-editor.desktop
-%{_datadir}/dconf-editor/dconf-editor.ui
+%{_datadir}/dconf-editor
+%{_iconsdir}/hicolor/*/*/*.png
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/dconf
 %endif
+
+%files -n bash-completion-dconf
+%defattr(644,root,root,755)
+%{_sysconfdir}/bash_completion.d/dconf-bash-completion.sh
+
+%if %{with vala}
+%files -n vala-dconf
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/dconf.deps
+%{_datadir}/vala/vapi/dconf.vapi
+%endif