- updated to version 2.1.6

[packages/control-center.git] / control-center.spec

diff --git a/control-center.spec b/control-center.spec
index a02acdda735d9a0d97dab09c3fdf9a237b40bd73..b84bc9f812914852664678c3b8f8a5a3b32e7277 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,14 +5,13 @@ Summary(pt_BR):       O Centro de Controle do GNOME
 Summary(uk):   ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):   ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:          control-center
-Version:       2.1.2
+Version:       2.1.6
 Release:       1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
-Patch0:                %{name}-am.patch
-Patch1:                %{name}-fontconfig.patch
+Patch0:                %{name}-fontconfig.patch
 URL:           http://www.gnome.org/
 Icon:          control-center.gif
 BuildRequires: GConf2-devel >= 1.2.1
@@ -25,27 +24,27 @@ BuildRequires:      flex
 BuildRequires: esound-devel
 BuildRequires: findutils
 BuildRequires: gettext-devel
-BuildRequires: gnome-desktop-devel >= 2.1.0
-BuildRequires: gnome-vfs2-devel >= 2.0.4-3
-BuildRequires: gtk+2-devel >= 2.1.2
-BuildRequires: intltool >= 0.23
-BuildRequires: libbonobo-devel >= 2.1.0
-BuildRequires: libbonoboui-devel >= 2.1.0
+BuildRequires: gnome-desktop-devel >= 2.1.90
+BuildRequires: gnome-vfs2-devel >= 2.1.6
+BuildRequires: gtk+2-devel >= 2.2.0
+BuildRequires: intltool >= 0.25
+BuildRequires: libbonobo-devel >= 2.1.1
+BuildRequires: libbonoboui-devel >= 2.1.2
 BuildRequires: libglade2-devel >= 2.0.0
-BuildRequires: libgnome-devel >= 2.1.1
-BuildRequires: libgnomeui-devel >= 2.1.2
-BuildRequires: libxml2-devel >= 2.4.24
+BuildRequires: libgnome-devel >= 2.1.90
+BuildRequires: libgnomeui-devel >= 2.1.90
+BuildRequires: libxml2-devel >= 2.5.1
 BuildRequires: libtool
-BuildRequires: scrollkeeper >= 0.3.6
-Requires:      gnome-vfs2 >= 2.1.3
+BuildRequires: scrollkeeper >= 0.3.11
+BuildRequires: startup-notification-devel
+BuildRequires: metacity-devel
+BuildRequires: Xft-devel >= 2.1
+Requires:      gnome-vfs2 >= 2.1.6
 PreReq:                scrollkeeper
 PreReq:                /sbin/ldconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     gnome
 
-%define                _prefix         /usr/X11R6
-%define                _sysconfdir     /etc/X11/GNOME2
-
 %description
 A Configuration tool for easily setting up your GNOME environment.
 GNOME is the GNU Network Object Model Environment. That's a fancy name
@@ -110,16 +109,16 @@ Statyczne biblioteki GNOME Control-Center.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 glib-gettextize --copy --force
 intltoolize --copy --force
-libtoolize --copy --force
-aclocal
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
 %{__autoconf}
 %{__automake}
-%configure
+%configure --disable-schemas-install
 
 %{__make}
 
@@ -127,7 +126,7 @@ aclocal
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT 
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -136,8 +135,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" \
-/usr/X11R6/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
+%gconf_schema_install
 
 %postun
 /sbin/ldconfig
@@ -166,7 +164,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" \
 %defattr(644,root,root,755)                                                     
 %{_includedir}/gnome-window-settings-2.0
 %attr(755,root,root) %{_libdir}/lib*.??
-%{_libdir}/pkgconfig/*.pc
+%{_pkgconfigdir}/*.pc
 %{_libdir}/window-manager-settings/*.la
 
 %files static