X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=GConf2.spec;h=2a3e9f831bdb0efb4b5ffd99c65e4d9c0094d856;hb=7a1a44c61691185b325567ef7d6f15b93e7bcb57;hp=502701a3b1b0a809d560a1b65fd3d8be4b078f96;hpb=7afd2b97b8a58bd3669006568da629104867bd34;p=packages%2FGConf2.git

diff --git a/GConf2.spec b/GConf2.spec
index 502701a..2a3e9f8 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -1,32 +1,45 @@
+#
+# TODO:
+# - update documentation to follow changes introduced in Patch0
+#
+# Conditional build:
+%bcond_without	static_libs	# don't build static libraries
+#
 Summary:	GNOME2 configuration database system
-Summary(pl):	System konfiguracyjnej bazy danych dla GNOME2
-Summary(pt_BR):	Sistema de Configuração do GNOME2
+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.1.90
-Release:	1
+Version:	2.18.0.1
+Release:	2
 License:	LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/GConf/2.1/GConf-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/gnome/sources/GConf/2.18/GConf-%{version}.tar.bz2
+# Source0-md5:	aa0e0a0729fb021bab72b4166fd392f9
 Patch0:		%{name}-NO_MAJOR_VERSION.patch
-Patch1:		%{name}-am.patch
-Patch2:		%{name}-path.patch
-#Patch3:		%{name}-unlock-dialog.patch 
+Patch1:		%{name}-path.patch
+Patch2:		%{name}-reload.patch
 URL:		http://www.gnome.org/
-BuildRequires:	ORBit2-devel
+BuildRequires:	ORBit2-devel >= 1:2.14.7
 BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	bonobo-activation-devel >= 2.1.1
+BuildRequires:	automake >= 1:1.7
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2.2.0
-BuildRequires:	glib2-devel >= 2.2.0
-BuildRequires:	freetype-devel
+BuildRequires:	glib2-devel >= 1:2.12.9
+BuildRequires:	gtk+2-devel >= 2:2.10.9
+BuildRequires:	gtk-doc >= 1.8
+BuildRequires:	intltool >= 0.35.5
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel
+BuildRequires:	libxml2-devel >= 1:2.6.27
+BuildRequires:	openldap-devel
+BuildRequires:	perl-base
 BuildRequires:	pkgconfig
-BuildRequires:	popt-devel
-BuildRequires:	Xft-devel >= 2.1-2
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires:	rpmbuild(macros) >= 1.197
+Requires:	ORBit2 >= 1:2.14.7
+Requires:	findutils
+Requires:	glib2 >= 1:2.12.9
+Obsoletes:	GConf2-xinitrc
 Obsoletes:	libGConf2
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 GConf2 is a configuration database system, functionally similar to the
@@ -34,117 +47,181 @@ 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.
 
-%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
-wykryæ brak gnome i skompilowaæ tylko wersjê podstawow± GConf2.
+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
+
+%description apidocs
+GConf2 API documentation.
 
-%description -l pt_BR
-Gconf2 é o sistema de banco de dados de configuração do GNOME2.
+%description apidocs -l pl.UTF-8
+Dokumentacja API GConf2.
 
 %package devel
 Summary:	GConf2 includes, etc
-Summary(pl):	Pliki nag³ówkowe GConf2
-Summary(pt_BR):	Sistema de Configuração do GNOME2 - arquivos para desenvolvimento
+Summary(pl.UTF-8):	Pliki nagłówkowe GConf2
+Summary(pt_BR.UTF-8):	Sistema de Configuração do GNOME2 - arquivos para desenvolvimento
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}
-Requires:	ORBit2-devel
-Requires:	bonobo-activation-devel
+Requires:	%{name} = %{version}-%{release}
+Requires:	ORBit2-devel >= 1:2.14.7
 Requires:	gtk-doc-common
-Requires:	libxml2-devel
+Requires:	libxml2-devel >= 1:2.6.27
 Obsoletes:	libGConf2-devel
 
 %description devel
 GConf2 includes etc.
 
-%description devel -l pl
-Pliki nag³ówkowe GConf2.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe 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
-Summary(pl):	Biblioteki statyczne GConf2
-Summary(pt_BR):	Bibliotecas estáticas para desenvolvimento com gconf2
+Summary(pl.UTF-8):	Biblioteki statyczne GConf2
+Summary(pt_BR.UTF-8):	Bibliotecas estáticas para desenvolvimento com gconf2
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 GConf2 static libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 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 backend-evoldap
+Summary:	Evolution Data Sources LDAP backend for GConf
+Summary(pl.UTF-8):	Backend LDAP źródeł danych Evolution dla GConfa
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description backend-evoldap
+This is a special-purpose backend for GConf which enables default mail
+accounts, addressbooks and calendars for Evolution to be configured
+using each user's LDAP entry. By setting each user's mail address,
+incoming/outgoing mail server addresses and addressbook/calendar
+addresses in the user's LDAP entry, Evolution will be automatically
+configured to use these addresses.
+
+%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
+automatycznie skonfigurowane do używania tych adresów.
 
 %prep
 %setup -q -n GConf-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
 
 %build
-rm -f missing acinclude.m4
+%{__gtkdocize}
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
+%{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
-	--with-html-dir=%{_gtkdocdir} \
-%ifarch ppc
-	--disable-gtk-doc 
-%else
-	--enable-gtk-doc 
-%endif
+	%{!?with_static_libs:--disable-static} \
+	--enable-gtk-doc \
+	--with-html-dir=%{_gtkdocdir}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_aclocaldir},%{_sysconfdir}/gconf/schemas}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	HTML_DIR=%{_gtkdocdir} 
-	
-install gconf.m4 $RPM_BUILD_ROOT%{_aclocaldir}/gconf-2.m4
+	DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
+# no *.{la,a} for modules - shut up check-files
+rm -f $RPM_BUILD_ROOT%{_libdir}/GConf2/lib*.{la,a}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+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
+	    
+%postun	-p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS README
+%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.*.*
 %dir %{_libdir}/GConf2
-%attr(755,root,root) %{_libdir}/GConf2/lib*.so
-%{_sysconfdir}/gconf
+%attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-oldxml.so
+%attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-xml.so
+%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 %{_datadir}/GConf
+%dir %{_datadir}/GConf/schema
 %{_datadir}/sgml/gconf
+%{_mandir}/man1/*
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gconf
 
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog TODO
-%doc %{_gtkdocdir}/gconf
-%{_libdir}/lib*.la
 %attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/GConf2/lib*.la
+%{_libdir}/lib*.la
 %{_includedir}/gconf2
 %{_aclocaldir}/*.m4
 %{_pkgconfigdir}/*.pc
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/GConf2/lib*.a
 %{_libdir}/lib*.a
+%endif
+
+%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