- merged from DEVEL and updated to 2.6.0.1

Changed files:
    control-center.spec -> 1.140

diff --git a/control-center.spec b/control-center.spec
index dc517862b762a5e68e735d001d59e01e60ee8e27..9195e2ede3735cbabc88808702bcdcc1839bca3c 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,32 +5,27 @@ Summary(pt_BR):       O Centro de Controle do GNOME
 Summary(uk):   ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):   ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:          control-center
-Version:       2.4.0
-Release:       12
+Version:       2.6.0.1
+Release:       1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
-# Source0-md5: 44115d3174d2f603f34a336ada562bae
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
+# Source0-md5: e663e797f52514e5d5a4080ab6029542
 Patch0:                %{name}-fontconfig.patch
-Patch1:                %{name}-am17.patch
-Patch2:                %{name}-link.patch
-Patch3:                %{name}-randr.patch
-Patch4:                %{name}-def-apps-capplet.patch
-Patch5:                %{name}-wm_properties-dir.patch
-Patch6:                %{name}-additional-metacity-keybinding.patch
-Patch7:                %{name}-pixmaps-dirs.patch
-Patch8:                %{name}-capplets-dir.patch
-Patch9:                %{name}-themus-glade.patch
-Patch10:       %{name}-dpi.patch
-Patch11:       %{name}-home-themes-fix.patch
-Patch12:       %{name}-report-no-theme.patch
-Patch13:       %{name}-reduced_resources.patch
+Patch1:                %{name}-randr.patch
+Patch2:                %{name}-def-apps-capplet.patch
+Patch3:                %{name}-wm_properties-dir.patch
+Patch4:                %{name}-additional-metacity-keybinding.patch
+Patch5:                %{name}-capplets-dir.patch
+Patch6:                %{name}-dpi.patch
+Patch7:                %{name}-locale-names.patch
+Patch8:                %{name}-reduced_resources.patch
 URL:           http://www.gnome.org/
 Icon:          control-center.gif
-BuildRequires: GConf2-devel >= 2.3.3
-BuildRequires: ORBit2-devel >= 2.8.0
-BuildRequires: audiofile >= 0.2.3-3
+BuildRequires: GConf2-devel >= 2.6.0
+BuildRequires: ORBit2-devel >= 1:2.10.0
+BuildRequires: audiofile >= 1:0.2.6
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
@@ -38,26 +33,28 @@ BuildRequires:      flex
 BuildRequires: esound-devel
 BuildRequires: findutils
 BuildRequires: gettext-devel
-BuildRequires: gnome-desktop-devel >= 2.3.90
-BuildRequires: gnome-vfs2-devel >= 2.4.0
-BuildRequires: gtk+2-devel >= 2.2.3
-BuildRequires: intltool >= 0.25
-BuildRequires: libbonobo-devel >= 2.4.0
-BuildRequires: libbonoboui-devel >= 2.4.0
-BuildRequires: libglade2-devel >= 2.0.1
-BuildRequires: libgnome-devel >= 2.4.0
-BuildRequires: libgnomeui-devel >= 2.4.0
-BuildRequires: libxml2-devel >= 2.5.10
+BuildRequires: gnome-desktop-devel >= 2.6.0
+BuildRequires: gnome-vfs2-devel >= 2.6.0
+BuildRequires: gtk+2-devel >= 2:2.4.0
+BuildRequires: intltool >= 0.30
+BuildRequires: libbonobo-devel >= 2.6.0
+BuildRequires: libbonoboui-devel >= 2.6.0
+BuildRequires: libglade2-devel >= 1:2.3.6
+BuildRequires: libgnome-devel >= 2.6.0
+BuildRequires: libgnomeui-devel >= 2.6.0
+BuildRequires: libxml2-devel >= 2.6.7
+BuildRequires: libxklavier-devel >= 1.00
 BuildRequires: libtool
-BuildRequires: metacity-devel >= 2.5.1
-BuildRequires: nautilus-devel >= 2.3.90
+BuildRequires: metacity-devel >= 2.8.0
+BuildRequires: nautilus-devel >= 2.6.0
 BuildRequires: scrollkeeper >= 0.3.12
-BuildRequires: startup-notification-devel
+BuildRequires: startup-notification-devel >= 0.5
 BuildRequires: xft-devel >= 2.1.1
 PreReq:                /sbin/ldconfig
 PreReq:                scrollkeeper
 Requires(post):        GConf2
-Requires:      gnome-vfs2 >= 2.4.0
+Requires:      gnome-vfs2 >= 2.6.0
+Obsoletes:     acme
 Obsoletes:     fontilus
 Obsoletes:     gnome
 Obsoletes:     themus
@@ -104,7 +101,7 @@ GNOME 
 Summary:       GNOME Control-Center header files
 Summary(pl):   Pliki nag³ówkowe bibliotek GNOME Control-Center
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 GNOME Control-Center header files.
@@ -116,7 +113,7 @@ Pliki nag
 Summary:       GNOME Control-Center static libraries
 Summary(pl):   Statyczne biblioteki GNOME Control-Center
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 GNOME Control-Center static libraries.
@@ -126,7 +123,7 @@ Statyczne biblioteki GNOME Control-Center.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .wiget
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -135,11 +132,8 @@ Statyczne biblioteki GNOME Control-Center.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
+
+mv po/{no,nb}.po
 
 %build
 glib-gettextize --copy --force
@@ -184,6 +178,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gnome-vfs-2.0/modules/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/fontilus-context-menu
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %attr(755,root,root) %{_libdir}/bonobo/*.so
 %attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/lib*.so
@@ -196,6 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome/vfolders/*
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/gnome/capplets
+%{_datadir}/icons/*
 %{_datadir}/idl/*
 %{_datadir}/mime-info/*
 %{_pixmapsdir}/gnomecc-2