- 2.32.0

[packages/GConf2.git] / GConf2.spec

diff --git a/GConf2.spec b/GConf2.spec
index 783e1d2db7d42fcf68ca0d799fa13d573d5f1a43..4b7543f546ab7e294c9c0a4ba6c9c5e18bf81687 100644 (file)
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -6,37 +6,44 @@
 %bcond_without static_libs     # don't build static libraries
 #
 Summary:       GNOME2 configuration database system
 %bcond_without static_libs     # don't build static libraries
 #
 Summary:       GNOME2 configuration database system

-Summary(pl):   System konfiguracyjnej bazy danych dla GNOME 2
-Summary(pt_BR):        Sistema de Configuração do GNOME 2
-Summary(ru):   óÉÓÔÅÍÁ ËÏÎÆÉÇÕÒÁÃÉÉ GNOME 2
+Summary(pl.UTF-8):     System konfiguracyjnej bazy danych dla GNOME 2
+Summary(pt_BR.UTF-8):  Sistema de Configuração do GNOME 2
+Summary(ru.UTF-8):     Система конфигурации GNOME 2

 Name:          GConf2
 Name:          GConf2

-Version:       2.14.0
-Release:       6
-License:       LGPL
+Version:       2.32.0
+Release:       1
+License:       LGPL v2+

 Group:         X11/Applications
 Group:         X11/Applications

-Source0:       http://ftp.gnome.org/pub/gnome/sources/GConf/2.14/GConf-%{version}.tar.bz2
-# Source0-md5: d07c2efcaf477cf34225c604a04b6271
-Source1:       %{name}-merge-tree.xinit
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/GConf/2.32/GConf-%{version}.tar.bz2
+# Source0-md5: b161da6a1ab090b649aed3111003b0bb

 Patch0:                %{name}-NO_MAJOR_VERSION.patch
 Patch0:                %{name}-NO_MAJOR_VERSION.patch

-Patch1:                %{name}-path.patch
+Patch1:                %{name}-reload.patch

 URL:           http://www.gnome.org/
 URL:           http://www.gnome.org/

-BuildRequires: ORBit2-devel >= 1:2.14.0
-BuildRequires: autoconf
-BuildRequires: automake >= 1:1.7
+BuildRequires: ORBit2-devel >= 1:2.14.9
+BuildRequires: autoconf >= 2.60
+BuildRequires: automake >= 1:1.9
+BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: docbook-dtd412-xml

 BuildRequires: gettext-devel
 BuildRequires: gettext-devel

-BuildRequires: glib2-devel >= 1:2.11.2
-BuildRequires: gtk+2-devel >= 2:2.9.2
-BuildRequires: gtk-doc >= 1.4-2
+BuildRequires: glib2-devel >= 1:2.26.0
+BuildRequires: gobject-introspection-devel >= 0.9.5
+BuildRequires: gtk+2-devel >= 2:2.16.0
+BuildRequires: gtk-doc >= 1.8
+BuildRequires: intltool >= 0.40.0

 BuildRequires: libtool
 BuildRequires: libtool

-BuildRequires: libxml2-devel >= 1:2.6.25
-BuildRequires: openldap-devel
+BuildRequires: libxml2-devel >= 1:2.6.30
+BuildRequires: openldap-devel >= 2.4.6

 BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: perl-base
 BuildRequires: pkgconfig

-BuildRequires: popt-devel
+BuildRequires: polkit-devel >= 0.92

 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: rpmbuild(macros) >= 1.197

-Requires:      ORBit2 >= 1:2.14.0
-Requires:      glib2 >= 1:2.11.2
+Requires(post):        findutils
+Requires(post,postun): glib2 >= 1:2.24.0
+Requires:      %{name}-libs = %{version}-%{release}
+Obsoletes:     GConf2-xinitrc

 Obsoletes:     libGConf2
 Obsoletes:     libGConf2

+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -45,54 +52,96 @@ Windows registry but lots better. :-) It's being written for the
 GNOME2 desktop but does not require GNOME2; configure should notice if
 GNOME2 is not installed and compile the basic GConf2 library anyway.
 
 GNOME2 desktop but does not require GNOME2; configure should notice if
 GNOME2 is not installed and compile the basic GConf2 library anyway.
 

-%description -l pl
+%description -l pl.UTF-8

 GConf2 jest systemem konfiguracyjnej bazy danych, funkcjonalnie
 podobnej do rejestru Windows, ale o wiele lepszej :-). Jest pisana dla
 desktopu GNOME2, ale nie wymaga GNOME2; skrypt configure powinien
 GConf2 jest systemem konfiguracyjnej bazy danych, funkcjonalnie
 podobnej do rejestru Windows, ale o wiele lepszej :-). Jest pisana dla
 desktopu GNOME2, ale nie wymaga GNOME2; skrypt configure powinien

-wykryæ brak GNOME2 i skompilowaæ tylko wersjê podstawow± GConf2.
+wykryć brak GNOME2 i skompilować tylko wersję podstawową GConf2.

 
 

-%description -l pt_BR
-Gconf2 é o sistema de banco de dados de configuração do GNOME2.
+%description -l pt_BR.UTF-8
+Gconf2 é o sistema de banco de dados de configuração do GNOME2.
+
+%package libs
+Summary:       GConf2 shared library
+Summary(pl.UTF-8):     Biblioteka współdzielona GConf2
+Group:         Libraries
+Requires:      ORBit2 >= 1:2.14.9
+Requires:      glib2 >= 1:2.26.0
+Conflicts:     GConf2 < 2.24.0-2
+
+%description libs
+GConf2 shared library and gconftool utility (used both for
+configuration management and development purposes).
+
+%description libs -l pl.UTF-8
+Biblioteka współdzielona GConf2 oraz narzędzie gconftool (używane
+zarówno przy zarządzaniu konfiguracją, jak i tworzeniu
+oprogramowania).

 
 %package devel
 
 %package devel

-Summary:       GConf2 includes, etc
-Summary(pl):   Pliki nag³ówkowe GConf2
-Summary(pt_BR):        Sistema de Configuração do GNOME2 - arquivos para desenvolvimento
-Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      ORBit2-devel >= 1:2.14.0
-Requires:      gtk-doc-common
-Requires:      libxml2-devel >= 1:2.6.25
+Summary:       Header files for GConf2 library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki GConf2
+Summary(pt_BR.UTF-8):  Sistema de Configuração do GNOME2 - arquivos para desenvolvimento
+Group:         Development/Libraries
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      ORBit2-devel >= 1:2.14.9
+Requires:      dbus-devel >= 1.0.0
+Requires:      glib2-devel >= 1:2.26.0
+Requires:      libxml2-devel >= 1:2.6.30

 Obsoletes:     libGConf2-devel
 
 %description devel
 Obsoletes:     libGConf2-devel
 
 %description devel

-GConf2 includes etc.
+Header files for GConf2 library.

 
 

-%description devel -l pl
-Pliki nag³ówkowe GConf2.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki GConf2.

 
 

-%description devel -l pt_BR
-Sistema de Configuração do GNOME2 - arquivos para desenvolvimento.
+%description devel -l pt_BR.UTF-8
+Sistema de Configuração do GNOME2 - arquivos para desenvolvimento.

 
 %package static
 Summary:       GConf2 static libraries
 
 %package static
 Summary:       GConf2 static libraries

-Summary(pl):   Biblioteki statyczne GConf2
-Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento com gconf2
-Group:         X11/Development/Libraries
+Summary(pl.UTF-8):     Biblioteki statyczne GConf2
+Summary(pt_BR.UTF-8):  Bibliotecas estáticas para desenvolvimento com gconf2
+Group:         Development/Libraries

 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 GConf2 static libraries.
 
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 GConf2 static libraries.
 

-%description static -l pl
+%description static -l pl.UTF-8

 Biblioteki statyczne GConf2.
 
 Biblioteki statyczne GConf2.
 

-%description static -l pt_BR
-Bibliotecas estáticas para desenvolvimento com gconf
+%description static -l pt_BR.UTF-8
+Bibliotecas estáticas para desenvolvimento com gconf
+
+%package apidocs
+Summary:       GConf2 API documentation
+Summary(pl.UTF-8):     Dokumentacja API GConf2
+Group:         Documentation
+Requires:      gtk-doc-common
+
+%description apidocs
+GConf2 API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API GConf2.
+
+%package examples
+Summary:       GConf2 - example programs
+Summary(pl.UTF-8):     GConf2 - przykładowe programy
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description examples
+GConf2 - example programs.
+
+%description examples -l pl.UTF-8
+GConf2 - przykładowe programy.

 
 %package backend-evoldap
 Summary:       Evolution Data Sources LDAP backend for GConf
 
 %package backend-evoldap
 Summary:       Evolution Data Sources LDAP backend for GConf

-Summary(pl):   Backend LDAP ¼róde³ danych Evolution dla GConfa
+Summary(pl.UTF-8):     Backend LDAP źródeł danych Evolution dla GConfa

 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
 
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
 


@@ -104,27 +153,14 @@ incoming/outgoing mail server addresses and addressbook/calendar
 addresses in the user's LDAP entry, Evolution will be automatically
 configured to use these addresses.
 
 addresses in the user's LDAP entry, Evolution will be automatically
 configured to use these addresses.
 

-%description backend-evoldap -l pl
-To jest backend GConfa specjalnego przeznaczenia, pozwalaj±cy na
-konfigurowanie domy¶lnych kont pocztowych, ksi±¿ek adresowych i
-kalendarzy dla Evolution przy u¿yciu wpisu LDAP dla ka¿dego
-u¿ytkownika. Poprzez ustawienie ka¿demu u¿ytkownikowi adres pocztowy,
-adresy serwerów poczty przychodz±cej/wychodz±cej oraz adresy ksi±¿ki
+%description backend-evoldap -l pl.UTF-8
+To jest backend GConfa specjalnego przeznaczenia, pozwalający na
+konfigurowanie domyślnych kont pocztowych, książek adresowych i
+kalendarzy dla Evolution przy użyciu wpisu LDAP dla każdego
+użytkownika. Poprzez ustawienie każdemu użytkownikowi adres pocztowy,
+adresy serwerów poczty przychodzącej/wychodzącej oraz adresy książki

 adresowej i kalendarza w jego wpisie LDAP, Evolution zostanie
 adresowej i kalendarza w jego wpisie LDAP, Evolution zostanie

-automatycznie skonfigurowane do u¿ywania tych adresów.
-
-%package xinitrc
-Summary:       GConf xinitrc scripts
-Summary(pl):   Skrypty xinitrc GConfa
-Group:         X11
-Requires:      %{name} = %{version}-%{release}
-Requires:      xinitrc
-
-%description xinitrc
-This is a script for xinit-rc, which monitors users .gconf dir, merging it into single tree if neceserry or creates a new default one.
-
-%description xinitrc -l pl
-To jest skrypt dla xinit-rc, który monitoruje katalog .gconf u¿ytkowników, spajaj±c go w pojedyncze drzewo, gdy to koniecznie, lub tworz±c nowe, domy¶lne.
+automatycznie skonfigurowane do używania tych adresów.

 
 %prep
 %setup -q -n GConf-%{version}
 
 %prep
 %setup -q -n GConf-%{version}


@@ -134,12 +170,14 @@ To jest skrypt dla xinit-rc, kt
 %build
 %{__gtkdocize}
 %{__glib_gettextize}
 %build
 %{__gtkdocize}
 %{__glib_gettextize}

+%{__intltoolize}

 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \

+       POLKIT_POLICY_FILE_VALIDATE=/usr/bin/polkit-policy-file-validate \

        %{!?with_static_libs:--disable-static} \
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir}
        %{!?with_static_libs:--disable-static} \
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir}


@@ -148,69 +186,111 @@ To jest skrypt dla xinit-rc, kt
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT%{_sysconfdir}{/gconf/schemas,/X11/xinit/xinitrc.d}
+install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}/gconf/{schemas,gconf.xml.system}}

 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 

-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/GConf2-merge-tree
+cp examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp examples/*.schemas $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}

 
 

-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/en@shaw

 
 %find_lang %{name}
 
 # no *.{la,a} for modules - shut up check-files
 
 %find_lang %{name}
 
 # no *.{la,a} for modules - shut up check-files

-rm -f $RPM_BUILD_ROOT%{_libdir}/GConf2/lib*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/{GConf2,gio/modules}/lib*.{la,a}

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
-
-%files -f %{name}.lang
+%post
+umask 022
+for GCONF_DIR in %{_sysconfdir}/gconf/gconf.xml.mandatory %{_sysconfdir}/gconf/gconf.xml.defaults ;
+    do
+    GCONF_TREE=$GCONF_DIR/%gconf-tree.xml
+    if [ ! -f "$GCONF_TREE" ]; then
+       gconf-merge-tree "$GCONF_DIR"
+        chmod 644 "$GCONF_TREE"
+        find "$GCONF_DIR" -mindepth 1 -maxdepth 1 -type d -exec rm -rf \{\} \;
+        rm -f "$GCONF_DIR/%gconf.xml"
+    fi
+done
+
+%{_bindir}/gio-querymodules %{_libdir}/gio/modules
+
+%postun
+umask 022
+%{_bindir}/gio-querymodules %{_libdir}/gio/modules
+exit 0
+
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
+%files

 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README

-%attr(755,root,root) %{_bindir}/gconf*
-%attr(755,root,root) %{_libdir}/gconf-sanity-check-2
-%attr(755,root,root) %{_libdir}/gconfd-2
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_bindir}/gconf-merge-tree
+%attr(755,root,root) %{_bindir}/gsettings-data-convert
+%attr(755,root,root) %{_bindir}/gsettings-schema-convert
+%attr(755,root,root) %{_libexecdir}/gconf-defaults-mechanism
+%attr(755,root,root) %{_libexecdir}/gconf-sanity-check-2
+%attr(755,root,root) %{_libexecdir}/gconfd-2

 %dir %{_libdir}/GConf2
 %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-oldxml.so
 %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-xml.so
 %dir %{_libdir}/GConf2
 %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-oldxml.so
 %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-xml.so

+%attr(755,root,root) %{_libdir}/gio/modules/libgsettingsgconfbackend.so
+%{_sysconfdir}/dbus-1/system.d/org.gnome.GConf.Defaults.conf
+%{_sysconfdir}/xdg/autostart/gsettings-data-convert.desktop

 %dir %{_sysconfdir}/gconf
 %dir %{_sysconfdir}/gconf/2
 %{_sysconfdir}/gconf/gconf.xml.*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gconf/path
 %dir %{_sysconfdir}/gconf/schemas
 %dir %{_sysconfdir}/gconf
 %dir %{_sysconfdir}/gconf/2
 %{_sysconfdir}/gconf/gconf.xml.*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gconf/path
 %dir %{_sysconfdir}/gconf/schemas

+%{_datadir}/dbus-1/services/org.gnome.GConf.service
+%{_datadir}/dbus-1/system-services/org.gnome.GConf.Defaults.service
+%{_datadir}/polkit-1/actions/org.gnome.gconf.defaults.policy

 %dir %{_datadir}/GConf
 %dir %{_datadir}/GConf/schema
 %{_datadir}/sgml/gconf
 %dir %{_datadir}/GConf
 %dir %{_datadir}/GConf/schema
 %{_datadir}/sgml/gconf

-%{_mandir}/man1/*
+%{_mandir}/man1/gsettings-data-convert.1*
+%{_mandir}/man1/gsettings-schema-convert.1*
+
+%files libs -f %{name}.lang
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgconf-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgconf-2.so.4
+%attr(755,root,root) %{_bindir}/gconftool-2
+%{_mandir}/man1/gconftool-2.1*
+%{_libdir}/girepository-1.0/GConf-2.0.typelib

 
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog TODO
 
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog TODO

-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libgconf-2.so
+%{_libdir}/libgconf-2.la

 %{_includedir}/gconf2
 %{_includedir}/gconf2

-%{_aclocaldir}/*.m4
-%{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/gconf
+%{_aclocaldir}/gconf-2.m4
+%{_pkgconfigdir}/gconf-2.0.pc
+%{_datadir}/gir-1.0/GConf-2.0.gir

 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)

-%{_libdir}/lib*.a
+%{_libdir}/libgconf-2.a

 %endif
 
 %endif
 

+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gconf
+
+%files examples
+%defattr(644,root,root,755)
+%{_examplesdir}/%{name}-%{version}
+

 %files backend-evoldap
 %defattr(644,root,root,755)
 %doc backends/README.evoldap
 %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-evoldap.so
 %{_datadir}/GConf/schema/evoldap.schema
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gconf/2/evoldap.conf
 %files backend-evoldap
 %defattr(644,root,root,755)
 %doc backends/README.evoldap
 %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-evoldap.so
 %{_datadir}/GConf/schema/evoldap.schema
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gconf/2/evoldap.conf

-
-%files xinitrc
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sysconfdir}/X11/xinit/xinitrc.d/*