X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=GConf2.spec;h=c47a206ee105eb4a5675defc3bcd992b3cea4b1e;hb=709c75ed0262b5aba6c628f8c75b5a03e090a3b5;hp=f8381aa88fb4fe0967f901b3dff8b2f39a05dea0;hpb=90a43b00d8af9f67d0869935321d7f4e44880bdc;p=packages%2FGConf2.git

diff --git a/GConf2.spec b/GConf2.spec
index f8381aa..c47a206 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -10,34 +10,37 @@ 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
-Version:	2.24.0
+Version:	2.32.3
 Release:	1
 License:	LGPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/GConf/2.24/GConf-%{version}.tar.bz2
-# Source0-md5:	4971d96f5ba94fe4a69396267bd5afe8
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/GConf/2.32/GConf-%{version}.tar.bz2
+# Source0-md5:	a7c683fe6566e05a67ecb1ee3b20056c
 Patch0:		%{name}-NO_MAJOR_VERSION.patch
-Patch1:		%{name}-path.patch
-Patch2:		%{name}-reload.patch
+Patch1:		%{name}-reload.patch
 URL:		http://www.gnome.org/
 BuildRequires:	ORBit2-devel >= 1:2.14.9
-BuildRequires:	PolicyKit-devel >= 0.9
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.9
+BuildRequires:	dbus-glib-devel >= 0.74
+BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.18.0
-BuildRequires:	gtk+2-devel >= 2:2.12.8
+BuildRequires:	glib2-devel >= 1:2.28.0
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gtk+2-devel >= 2:2.16.0
 BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	intltool >= 0.36.2
+BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.30
 BuildRequires:	openldap-devel >= 2.4.6
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
+BuildRequires:	polkit-devel >= 0.92
+BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.197
 Requires(post):	findutils
-Requires:	ORBit2 >= 1:2.14.9
-Requires:	glib2 >= 1:2.18.0
+Requires(post,postun):	glib2 >= 1:2.28.0
+Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	GConf2-xinitrc
 Obsoletes:	libGConf2
 # sr@Latn vs. sr@latin
@@ -59,33 +62,40 @@ wykryć brak GNOME2 i skompilować tylko wersję podstawową GConf2.
 %description -l pt_BR.UTF-8
 Gconf2 é o sistema de banco de dados de configuração do GNOME2.
 
-%package apidocs
-Summary:	GConf2 API documentation
-Summary(pl.UTF-8):	Dokumentacja API GConf2
-Group:		Documentation
-Requires:	gtk-doc-common
+%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.28.0
+Conflicts:	GConf2 < 2.24.0-2
 
-%description apidocs
-GConf2 API documentation.
+%description libs
+GConf2 shared library and gconftool utility (used both for
+configuration management and development purposes).
 
-%description apidocs -l pl.UTF-8
-Dokumentacja API GConf2.
+%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
-Summary:	GConf2 includes, etc
-Summary(pl.UTF-8):	Pliki nagłówkowe GConf2
+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:		X11/Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+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.28.0
 Requires:	libxml2-devel >= 1:2.6.30
 Obsoletes:	libGConf2-devel
 
 %description devel
-GConf2 includes etc.
+Header files for GConf2 library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe GConf2.
+Pliki nagłówkowe biblioteki GConf2.
 
 %description devel -l pt_BR.UTF-8
 Sistema de Configuração do GNOME2 - arquivos para desenvolvimento.
@@ -94,7 +104,7 @@ Sistema de Configuração do GNOME2 - arquivos para desenvolvimento.
 Summary:	GConf2 static libraries
 Summary(pl.UTF-8):	Biblioteki statyczne GConf2
 Summary(pt_BR.UTF-8):	Bibliotecas estáticas para desenvolvimento com gconf2
-Group:		X11/Development/Libraries
+Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
@@ -106,10 +116,22 @@ Biblioteki statyczne GConf2.
 %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:		X11/Development/Libraries
+Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description examples
@@ -145,7 +167,6 @@ automatycznie skonfigurowane do używania tych adresów.
 %setup -q -n GConf-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__gtkdocize}
@@ -157,16 +178,16 @@ automatycznie skonfigurowane do używania tych adresów.
 %{__autoconf}
 %{__automake}
 %configure \
-	POLKIT_POLICY_FILE_VALIDATE=/usr/bin/polkit-policy-file-validate \
 	%{!?with_static_libs:--disable-static} \
 	--enable-gtk-doc \
+	--with-gtk=2.0 \
 	--with-html-dir=%{_gtkdocdir}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}/gconf/schemas}
+install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}/gconf/{schemas,gconf.xml.system},%{_datadir}/GConf/gsettings}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -177,13 +198,12 @@ cp examples/*.schemas $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %find_lang %{name}
 
 # no *.{la,a} for modules - shut up check-files
-rm -f $RPM_BUILD_ROOT%{_libdir}/GConf2/lib*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{GConf2,gio/modules}/lib*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 umask 022
 for GCONF_DIR in %{_sysconfdir}/gconf/gconf.xml.mandatory %{_sysconfdir}/gconf/gconf.xml.defaults ;
     do
@@ -196,38 +216,53 @@ for GCONF_DIR in %{_sysconfdir}/gconf/gconf.xml.mandatory %{_sysconfdir}/gconf/g
     fi
 done
 
-%postun	-p /sbin/ldconfig
+%{_bindir}/gio-querymodules %{_libdir}/gio/modules
+
+%postun
+umask 022
+%{_bindir}/gio-querymodules %{_libdir}/gio/modules
+exit 0
 
-%files -f %{name}.lang
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
+%files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/gconf-merge-tree
-%attr(755,root,root) %{_bindir}/gconftool-2
+%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
-%attr(755,root,root) %{_libdir}/libgconf-2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgconf-2.so.4
 %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
-%{_datadir}/PolicyKit/policy/org.gnome.gconf.defaults.policy
 %{_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/gsettings
 %dir %{_datadir}/GConf/schema
 %{_datadir}/sgml/gconf
-%{_mandir}/man1/gconftool-2.1*
+%{_mandir}/man1/gsettings-data-convert.1*
+%{_mandir}/man1/gsettings-schema-convert.1*
 
-%files apidocs
+%files libs -f %{name}.lang
 %defattr(644,root,root,755)
-%{_gtkdocdir}/gconf
+%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)
@@ -237,6 +272,7 @@ done
 %{_includedir}/gconf2
 %{_aclocaldir}/gconf-2.m4
 %{_pkgconfigdir}/gconf-2.0.pc
+%{_datadir}/gir-1.0/GConf-2.0.gir
 
 %if %{with static_libs}
 %files static
@@ -244,6 +280,10 @@ done
 %{_libdir}/libgconf-2.a
 %endif
 
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gconf
+
 %files examples
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}