X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=GConf2.spec;h=95ce9fd518c149e63859410e57e037d9930c4d31;hb=cd5b8d89745431d893502979da5c95e274a2b918;hp=48fa18ee82f48e5fdcec3b1f2d353ba46240b8dc;hpb=935526ea8c4c557a7a628e903d1eabddb0a9e2f5;p=packages%2FGConf2.git

diff --git a/GConf2.spec b/GConf2.spec
index 48fa18e..95ce9fd 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -1,32 +1,38 @@
+#
+# TODO:
+# - install evoldap.scheme ?
+#
+# 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):	System konfiguracyjnej bazy danych dla GNOME 2
+Summary(pt_BR):	Sistema de Configuração do GNOME 2
+Summary(ru):	óÉÓÔÅÍÁ ËÏÎÆÉÇÕÒÁÃÉÉ GNOME 2
 Name:		GConf2
-Version:	1.2.1
-Release:	8.1
+Version:	2.12.1
+Release:	1
 License:	LGPL
 Group:		X11/Applications
-Source0:	ftp://ftp.gnome.org/pub/GNOME/sources/GConf/1.2/GConf-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/gnome/sources/GConf/2.12/GConf-%{version}.tar.bz2
+# Source0-md5:	247110de013ed24b17cf4191eb6daec5
 Patch0:		%{name}-NO_MAJOR_VERSION.patch
-Patch1:		%{name}-am.patch
-Patch2:		%{name}-path.patch
-Patch3:		%{name}-unlock-dialog.patch
+Patch1:		%{name}-path.patch
 URL:		http://www.gnome.org/
-BuildRequires:	ORBit2-devel
+BuildRequires:	ORBit2-devel >= 1:2.12.3
 BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	bonobo-activation-devel >= 1.0.3
+BuildRequires:	automake >= 1:1.7
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2.0.6
-BuildRequires:	glib2-devel >= 2.0.6
+BuildRequires:	gtk+2-devel >= 2:2.8.3
+BuildRequires:	gtk-doc >= 1.4-2
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel
+BuildRequires:	libxml2-devel >= 1:2.6.21
+BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires:	rpmbuild(macros) >= 1.197
 Obsoletes:	libGConf2
-
-%define		_sysconfdir	/etc/gconf
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 GConf2 is a configuration database system, functionally similar to the
@@ -38,7 +44,7 @@ GNOME2 is not installed and compile the basic GConf2 library anyway.
 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
 Gconf2 é o sistema de banco de dados de configuração do GNOME2.
@@ -48,11 +54,10 @@ 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}
-Requires:	ORBit2-devel
-Requires:	bonobo-activation-devel
+Requires:	%{name} = %{version}-%{release}
+Requires:	ORBit2-devel >= 1:2.12.3
 Requires:	gtk-doc-common
-Requires:	libxml2-devel
+Requires:	libxml2-devel >= 1:2.6.21
 Obsoletes:	libGConf2-devel
 
 %description devel
@@ -69,7 +74,7 @@ Summary:	GConf2 static libraries
 Summary(pl):	Biblioteki statyczne GConf2
 Summary(pt_BR):	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.
@@ -84,46 +89,49 @@ Bibliotecas est
 %setup -q -n GConf-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
-rm -f missing acinclude.m4
+rm -f acinclude.m4
+%{__glib_gettextize}
 %{__libtoolize}
 %{__aclocal}
+%{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
 	--with-html-dir=%{_gtkdocdir} \
+	%{!?with_static_libs:--disable-static} \
 %ifarch ppc
-	--disable-gtk-doc 
+	--disable-gtk-doc
 %else
-	--enable-gtk-doc 
+	--enable-gtk-doc
 %endif
 
 %{__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
+
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 %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	-p /sbin/ldconfig
+%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
@@ -131,18 +139,21 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/GConf2
 %attr(755,root,root) %{_libdir}/GConf2/lib*.so
 %{_sysconfdir}/gconf
+%{_datadir}/sgml/gconf
+%{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog TODO
-%doc %{_gtkdocdir}/gconf
-%attr(755,root,root) %{_libdir}/lib*.??
-%{_libdir}/GConf2/lib*.la
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/gconf2
 %{_aclocaldir}/*.m4
 %{_pkgconfigdir}/*.pc
+%{_gtkdocdir}/gconf
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/GConf2/lib*.a
 %{_libdir}/lib*.a
+%endif