- updated to 2.2.0.1

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

diff --git a/control-center.spec b/control-center.spec
index 47529b8b63c25e0cd9238d684e29a686ffd10220..48f5318c84696a8ff2508ba4f076685922ca4a84 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,19 +5,17 @@ Summary(pt_BR):       O Centro de Controle do GNOME
 Summary(uk):   ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):   ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:          control-center
-Version:       2.1.2
-Release:       3
+Version:       2.2.0.1
+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
-Patch2:                %{name}-mouse-am.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.2/%{name}-%{version}.tar.bz2
+Patch0:                %{name}-fontconfig.patch
 URL:           http://www.gnome.org/
 Icon:          control-center.gif
-BuildRequires: GConf2-devel >= 1.2.1
-BuildRequires: ORBit2-devel >= 2.5.0
+BuildRequires: GConf2-devel >= 2.2.0
+BuildRequires: ORBit2-devel >= 2.6.0
 BuildRequires: audiofile >= 0.2.3-3
 BuildRequires: autoconf
 BuildRequires: automake
@@ -26,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.2.0
+BuildRequires: gnome-vfs2-devel >= 2.2.0
+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.2.0
 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
@@ -111,17 +109,16 @@ Statyczne biblioteki GNOME Control-Center.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 glib-gettextize --copy --force
 intltoolize --copy --force
-libtoolize --copy --force
-aclocal
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
 %{__autoconf}
 %{__automake}
-%configure
+%configure --disable-schemas-install
 
 %{__make}
 
@@ -129,8 +126,7 @@ aclocal
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       pkgconfigdir=%{_pkgconfigdir}
+       DESTDIR=$RPM_BUILD_ROOT 
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -139,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
@@ -152,7 +147,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" \
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %{_libdir}/bonobo/servers/*
-%{_libdir}/window-manager-settings/*.so
+%attr(755,root,root) %{_libdir}/window-manager-settings/*.so
 %{_datadir}/applications/*
 %{_datadir}/control-center-2.0/capplets/*
 %{_datadir}/control-center-2.0/icons
@@ -168,7 +163,8 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" \
 %files devel
 %defattr(644,root,root,755)                                                     
 %{_includedir}/gnome-window-settings-2.0
-%attr(755,root,root) %{_libdir}/lib*.??
+%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/lib*.so
 %{_pkgconfigdir}/*.pc
 %{_libdir}/window-manager-settings/*.la