Author: baggins Date: Fri May 12 18:17:17 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - merged from HEAD
---- Files affected: SPECS: GConf2.spec (1.102 -> 1.102.2.1) ---- Diffs: ================================================================ Index: SPECS/GConf2.spec diff -u SPECS/GConf2.spec:1.102 SPECS/GConf2.spec:1.102.2.1 --- SPECS/GConf2.spec:1.102 Mon Jan 23 16:08:55 2006 +++ SPECS/GConf2.spec Fri May 12 20:17:12 2006 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # TODO: -# - install evoldap.scheme ? +# - update documentation to follow changes introduced in Patch0 # # Conditional build: %bcond_without static_libs # don't build static libraries @@ -11,17 +11,17 @@ Summary(pt_BR): Sistema de Configuraçăo do GNOME 2 Summary(ru): óÉÓÔĹÍÁ ËĎÎĆÉÇŐŇÁĂÉÉ GNOME 2 Name: GConf2 -Version: 2.12.1 -Release: 3 +Version: 2.14.0 +Release: 1 License: LGPL Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/GConf/2.12/GConf-%{version}.tar.bz2 -# Source0-md5: 247110de013ed24b17cf4191eb6daec5 +Source0: http://ftp.gnome.org/pub/gnome/sources/GConf/2.14/GConf-%{version}.tar.bz2 +# Source0-md5: d07c2efcaf477cf34225c604a04b6271 Source1: %{name}-merge-tree.xinit Patch0: %{name}-NO_MAJOR_VERSION.patch Patch1: %{name}-path.patch URL: http://www.gnome.org/ -BuildRequires: ORBit2-devel >= 1:2.12.3 +BuildRequires: ORBit2-devel >= 1:2.13.2 BuildRequires: autoconf BuildRequires: automake >= 1:1.7 BuildRequires: gettext-devel @@ -29,6 +29,7 @@ BuildRequires: gtk-doc >= 1.4-2 BuildRequires: libtool BuildRequires: libxml2-devel >= 1:2.6.21 +BuildRequires: openldap-devel BuildRequires: perl-base BuildRequires: pkgconfig BuildRequires: popt-devel @@ -87,13 +88,35 @@ %description static -l pt_BR Bibliotecas estáticas para desenvolvimento com gconf +%package backend-evoldap +Summary: Evolution Data Sources LDAP backend for GConf +Summary(pl): 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 +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 %build -rm -f acinclude.m4 %{__glib_gettextize} %{__libtoolize} %{__aclocal} @@ -101,13 +124,9 @@ %{__autoconf} %{__automake} %configure \ - --with-html-dir=%{_gtkdocdir} \ %{!?with_static_libs:--disable-static} \ -%ifarch ppc - --disable-gtk-doc -%else - --enable-gtk-doc -%endif + --enable-gtk-doc \ + --with-html-dir=%{_gtkdocdir} %{__make} @@ -141,9 +160,16 @@ %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 %attr(755,root,root) %{_sysconfdir}/X11/xinit/xinitrc.d/* +%dir %{_datadir}/GConf +%dir %{_datadir}/GConf/schema %{_datadir}/sgml/gconf %{_mandir}/man1/* @@ -163,12 +189,41 @@ %{_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 + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.102.2.1 2006/05/12 18:17:12 baggins +- merged from HEAD + +Revision 1.106 2006/04/02 14:27:02 freetz +- TODO added + +Revision 1.105 2006/04/02 12:11:54 qboosh +- separated evoldap backend (as -backend-evoldap) +- dropped old ppc/gtk-doc hack and removal of non-existing acinclude.m4 + +Revision 1.104 2006/04/02 09:35:03 qboosh +- BR: openldap-devel (for evoldap module) + +Revision 1.103 2006/03/31 20:41:08 freetz +- merged from DEVEL + +Revision 1.100.2.2 2006/03/18 22:27:37 freetz +- 2.14.0 + +Revision 1.100.2.1 2006/01/18 18:03:36 freetz +- 2.13.5 + Revision 1.102 2006/01/23 15:08:55 qboosh - current policy is not to R: pkgconfig just because package has pkgconfig support ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/GConf2.spec?r1=1.102&r2=1.102.2.1&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit