diff --git a/_service b/_service deleted file mode 100644 index 85e37ac..0000000 --- a/_service +++ /dev/null @@ -1,12 +0,0 @@ - - - 0.6git - git://git.gnome.org/dconf - git - - - *.tar - bz2 - - - diff --git a/_service:recompress:tar_scm:dconf-0.6git.1292858073.tar.bz2 b/_service:recompress:tar_scm:dconf-0.6git.1292858073.tar.bz2 deleted file mode 100644 index a9de2ab..0000000 --- a/_service:recompress:tar_scm:dconf-0.6git.1292858073.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a843bff9033499b06da233439156803d48de7efc9a6ded2aec7be05f10c55ef -size 267529 diff --git a/_service:set_version:dconf.spec b/_service:set_version:dconf.spec deleted file mode 100644 index c594a9a..0000000 --- a/_service:set_version:dconf.spec +++ /dev/null @@ -1,171 +0,0 @@ -# -# spec file for package dconf (Version 0.6) -# -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - - -Name: dconf -Version: 0.6git.1292858073 -Release: 0 -# NOTE: once vala becomes 0.12, change BuildRequires back away from vala-unstable-devel -# FIXME: remove SUSE_ASNEEDED=0 when this is fixed: https://bugzilla.gnome.org/show_bug.cgi?id=626280 -License: LGPLv2.1+ -Summary: Simple key-based configuration system -Group: System/Libraries -Url: http://live.gnome.org/dconf -Source: %{name}-%{version}.tar.bz2 -Source99: baselibs.conf -# PATCH-FIX-UPSTREAM dconf-fix-dbus-introspection-enumeration.patch vuntz@opensuse.org -- Taken from git -Patch0: dconf-fix-dbus-introspection-enumeration.patch -# For directory ownership -BuildRequires: dbus-1 -BuildRequires: vala-unstable-devel -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libxml-2.0) -%if 0%{?BUILD_FROM_VCS} -BuildRequires: gtk-doc -%endif -# dconf provides a dbus service, but has no dependency on dbus in any way -# (because it uses gdbus), so we need an explicit Requires -Requires: dbus-1 - -%description -dconf is a low-level configuration system. Its main purpose is to -provide a backend to GSettings on platforms that don't already -have configuration storage systems. - -%package -n libdconf0 -License: LGPLv2.1+ -Summary: Simple key-based configuration system -- Library -Group: System/Libraries -# The library doesn't really work if the dconf service is not reachable, so we -# need a Requires -Requires: %{name} = %{version} - -%description -n libdconf0 -dconf is a low-level configuration system. Its main purpose is to -provide a backend to GSettings on platforms that don't already -have configuration storage systems. - -%package -n gsettings-backend-dconf -License: LGPLv2.1+ -Summary: Simple key-based configuration system -- GSettings Backend -Group: System/Libraries -Requires: %{name} = %{version} -# We really want this to be used as the default GSettings backend -Supplements: libgio-2_0-0 -%glib2_gio_module_requires - -%description -n gsettings-backend-dconf -dconf is a low-level configuration system. Its main purpose is to -provide a backend to GSettings on platforms that don't already -have configuration storage systems. - -This package provides a GSettings backend that uses dconf to store -the settings. - -%package editor -License: LGPLv2.1+ -Summary: Simple key-based configuration system -- Graphical Editor -Group: System/GUI/GNOME -Requires: %{name} = %{version} - -%description editor -dconf is a low-level configuration system. Its main purpose is to -provide a backend to GSettings on platforms that don't already -have configuration storage systems. - -This package provides a graphical editor for dconf database. - -%package devel -License: LGPLv2.1+ -Summary: Simple key-based configuration system -- Development Files -Group: Development/Libraries/GNOME -Requires: libdconf0 = %{version} - -%description devel -dconf is a low-level configuration system. Its main purpose is to -provide a backend to GSettings on platforms that don't already -have configuration storage systems. - -%prep -%setup -q -%if !0%{?BUILD_FROM_VCS} -%patch0 -p1 -%endif - -%if 0%{?BUILD_FROM_VCS} -NOCONFIGURE=1 ./autogen.sh -%endif - -%build -export SUSE_ASNEEDED=0 -%configure \ -%if 0%{?BUILD_FROM_VCS} - --enable-gtk-doc -%endif - -%__make %{?_smp_mflags} - -%install -%makeinstall -find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print - -%post -n libdconf0 -p /sbin/ldconfig - -%postun -n libdconf0 -p /sbin/ldconfig - -%post -n gsettings-backend-dconf -%glib2_gio_module_post - -%postun -n gsettings-backend-dconf -%glib2_gio_module_postun - -%files -%defattr(-, root, root) -%doc COPYING NEWS -# small utility to read values in the database -%{_bindir}/dconf -# service is needed for write -%{_libexecdir}/dconf-service -%{_datadir}/dbus-1/services/ca.desrt.dconf.service -%{_datadir}/dbus-1/system-services/ca.desrt.dconf.service - -%files -n libdconf0 -%defattr(-, root, root) -%{_libdir}/libdconf.so.* - -%files -n gsettings-backend-dconf -%defattr(-, root, root) -%{_libdir}/gio/modules/libdconfsettings.so - -%files editor -%defattr(-, root, root) -%{_bindir}/dconf-editor - -%files devel -%defattr(-, root, root) -%doc %{_datadir}/gtk-doc/html/dconf/ -%{_includedir}/dconf/ -%{_libdir}/libdconf.so -%{_libdir}/pkgconfig/dconf.pc -%dir %{_datadir}/vala -%dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/dconf.* - -%changelog diff --git a/dconf.changes b/dconf.changes index 199506d..45159ff 100644 --- a/dconf.changes +++ b/dconf.changes @@ -1,7 +1,15 @@ ------------------------------------------------------------------- Mon Jan 10 14:16:46 UTC 2011 - fcrozat@novell.com -- Add support for building using source service +- Add support for source service checkout, with %BUILD_FROM_VCS: + + Add gtk-doc BuildRequires. + + Add call to ./autogen.sh. + + Do not apply dconf-fix-dbus-introspection-enumeration.patch + which is already in git. + + Enforce gtk-doc html generation by passing --enable-gtk-doc to + configure. +- Remove --disable-static from configure: it's not needed for dconf + which has an unusual setup. ------------------------------------------------------------------- Fri Jan 7 17:47:04 CET 2011 - vuntz@opensuse.org