X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=GConf2.spec;h=589bdd4d9958a4edf8c081a4175ca7e7b9f7a442;hb=HEAD;hp=a6a181e1b274254d14a6d070be7eae3a106c2df5;hpb=4edf5fec99d0d85ea5bb16b840fdf860ff0506fd;p=packages%2FGConf2.git

diff --git a/GConf2.spec b/GConf2.spec
index a6a181e..3aba1d8 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -1,35 +1,37 @@
-#
 # TODO:
 # - update documentation to follow changes introduced in Patch0
 #
 # Conditional build:
+%bcond_with	apidocs		# build apidocs (broken with new gtk-doc)
 %bcond_without	static_libs	# don't build static libraries
-#
+
 Summary:	GNOME2 configuration database system
 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:	3.2.3
-Release:	1
+Version:	3.2.6
+Release:	8
 License:	LGPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.xz
-# Source0-md5:	de9047c08d3f642c5b1990b0bef44577
+# Source0-md5:	2b16996d0e4b112856ee5c59130e822c
 Patch0:		%{name}-NO_MAJOR_VERSION.patch
 Patch1:		%{name}-reload.patch
-URL:		http://www.gnome.org/
+Patch2:		workaround-crash.patch
+Patch3:		python3.patch
+URL:		https://projects-old.gnome.org/gconf/
 BuildRequires:	ORBit2-devel >= 1:2.14.9
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-devel >= 1.0.0
 BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.28.0
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.31.0
 BuildRequires:	gobject-introspection-devel >= 0.10.0
 BuildRequires:	gtk+3-devel >= 3.0.0
-BuildRequires:	gtk-doc >= 1.8
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.30
@@ -38,12 +40,13 @@ BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel >= 0.92
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	rpmbuild(macros) >= 1.527
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires(post):	findutils
-Requires(post,postun):	glib2 >= 1:2.28.0
+Requires(post,postun):	glib2 >= 1:2.31.0
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	psmisc >= 20.1-2
 Obsoletes:	GConf2-xinitrc
 Obsoletes:	libGConf2
 # sr@Latn vs. sr@latin
@@ -70,7 +73,7 @@ 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
+Requires:	glib2 >= 1:2.31.0
 Conflicts:	GConf2 < 2.24.0-2
 
 %description libs
@@ -90,7 +93,7 @@ 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:	glib2-devel >= 1:2.31.0
 Requires:	libxml2-devel >= 1:2.6.30
 Obsoletes:	libGConf2-devel
 
@@ -124,6 +127,7 @@ Summary:	GConf2 API documentation
 Summary(pl.UTF-8):	Dokumentacja API GConf2
 Group:		Documentation
 Requires:	gtk-doc-common
+BuildArch:	noarch
 
 %description apidocs
 GConf2 API documentation.
@@ -170,9 +174,11 @@ automatycznie skonfigurowane do używania tych adresów.
 %setup -q -n GConf-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-%{__gtkdocize}
+%{?with_apidocs:%{__gtkdocize}}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -181,8 +187,9 @@ automatycznie skonfigurowane do używania tych adresów.
 %{__autoconf}
 %{__automake}
 %configure \
+	--disable-silent-rules \
 	%{!?with_static_libs:--disable-static} \
-	--enable-gtk-doc \
+	%{__enable_disable apidocs gtk-doc} \
 	--with-html-dir=%{_gtkdocdir}
 
 %{__make}
@@ -200,7 +207,12 @@ cp examples/*.schemas $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %find_lang %{name}
 
 # no *.{la,a} for modules - shut up check-files
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/{GConf2,gio/modules}/lib*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{GConf2,gio/modules}/lib*.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{GConf2,gio/modules}/lib*.a
+%endif
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgconf-2.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -230,18 +242,17 @@ exit 0
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README
+%doc AUTHORS ChangeLog NEWS README TODO
 %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
 %attr(755,root,root) %{_libdir}/gio/modules/libgsettingsgconfbackend.so
-%{_sysconfdir}/dbus-1/system.d/org.gnome.GConf.Defaults.conf
+/etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf
 %{_sysconfdir}/xdg/autostart/gsettings-data-convert.desktop
 %dir %{_sysconfdir}/gconf
 %dir %{_sysconfdir}/gconf/2
@@ -268,9 +279,7 @@ exit 0
 
 %files devel
 %defattr(644,root,root,755)
-%doc ChangeLog TODO
 %attr(755,root,root) %{_libdir}/libgconf-2.so
-%{_libdir}/libgconf-2.la
 %{_includedir}/gconf2
 %{_aclocaldir}/gconf-2.m4
 %{_pkgconfigdir}/gconf-2.0.pc
@@ -282,9 +291,11 @@ exit 0
 %{_libdir}/libgconf-2.a
 %endif
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gconf
+%endif
 
 %files examples
 %defattr(644,root,root,755)