- up to version 2.9.4, needs patch review, cleanups and maybe splitting nautilus...

Changed files:
    control-center.spec -> 1.159

diff --git a/control-center.spec b/control-center.spec
index 7783f4eaa1435b151cd324acab7b201e8ac8cbdf..5c5c3b46f06505d450a40105ad9eb31964f8e685 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,24 +5,24 @@ Summary(pt_BR):       O Centro de Controle do GNOME
 Summary(uk):   ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):   ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:          control-center
-Version:       2.8.1
-Release:       3
+Version:       2.9.4
+Release:       0.1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
-# Source0-md5: 7bd9c12b9abb05b6fcf7b4906b6918ea
-Patch0:                %{name}-fontconfig.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.9/%{name}-%{version}.tar.bz2
+# Source0-md5: b95677dc4caf09c1143804bc54f1b468
+#Patch0:               %{name}-fontconfig.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
+#Patch5:               %{name}-capplets-dir.patch - needs fixes
 Patch6:                %{name}-dpi.patch
-Patch7:                %{name}-reduced_resources.patch
-Patch8:                %{name}-def-apps-capplet-browsers.patch
-Patch9:                %{name}-evolution.patch
-Patch10:       %{name}-capplet.patch
+#Patch7:               %{name}-reduced_resources.patch
+#Patch8:               %{name}-def-apps-capplet-browsers.patch
+#Patch9:               %{name}-evolution.patch
+#Patch10:      %{name}-capplet.patch
 Patch11:       %{name}-desktop.patch
 URL:           http://www.gnome.org/
 Icon:          control-center.gif
@@ -37,14 +37,15 @@ BuildRequires:      esound-devel
 BuildRequires: findutils
 BuildRequires: gettext-devel
 BuildRequires: gnome-desktop-devel >= 2.8.0
+BuildRequires: gnome-menus-devel
 BuildRequires: gnome-vfs2-devel >= 2.8.0
 BuildRequires: gstreamer-plugins-devel >= 0.8.4
-BuildRequires: gtk+2-devel >= 2:2.4.4
+BuildRequires: gtk+2-devel >= 2:2.6.1
 BuildRequires: intltool >= 0.30
 BuildRequires: libglade2-devel >= 1:2.4.0
 BuildRequires: libgnomeui-devel >= 2.8.0
 BuildRequires: libxml2-devel >= 2.6.13
-BuildRequires: libxklavier-devel >= 1.03
+BuildRequires: libxklavier-devel >= 1.14
 BuildRequires: libtool
 BuildRequires: metacity-devel >= 2:2.8.5
 BuildRequires: nautilus-devel >= 2.8.0
@@ -124,17 +125,17 @@ Statyczne biblioteki GNOME Control-Center.
 
 %prep
 %setup -q
-%patch0 -p1 -b .wiget
+#%patch0 -p1 -b .wiget
 %patch1 -p1
 ##%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+#%patch7 -p1
+#%patch8 -p1 
+#%patch9 -p1
+#%patch10 -p1
 %patch11 -p1
 
 %build
@@ -158,12 +159,12 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_iconsdir}/gnome/48x48/apps/accessibility-directory.png \
-       $RPM_BUILD_ROOT%{_pixmapsdir}
+#mv $RPM_BUILD_ROOT%{_iconsdir}/gnome/48x48/apps/accessibility-directory.png \
+#      $RPM_BUILD_ROOT%{_pixmapsdir}
 
 # no static modules - shut up check-files
 rm -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.{a,la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions*/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.{a,la}
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
@@ -185,23 +186,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gconf/schemas/*
 %{_sysconfdir}/gnome-vfs-2.0/modules/*
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/fontilus-context-menu
+#%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}/nautilus/extensions*/*.so
 %attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/lib*.so
 %attr(755,root,root) %{_libdir}/window-manager-settings/*.so
 %dir %{_libdir}/window-manager-settings
 %{_libdir}/bonobo/servers/*
-%{_datadir}/application-registry/*
+#%{_datadir}/application-registry/*
 %{_datadir}/control-center-2.0
 %{_datadir}/gnome/cursor-fonts
 %{_datadir}/gnome/vfolders/*
-%{_datadir}/gnome-2.0/ui/*
-%{_datadir}/gnome/capplets
+#%{_datadir}/gnome-2.0/ui/*
+#%{_datadir}/gnome/capplets
 %{_datadir}/idl/*
-%{_datadir}/mime-info/*
-%{_pixmapsdir}/gnomecc-2
+#%{_datadir}/mime-info/*
+%{_iconsdir}/*/*/*/gnome-control-center.png
 %{_pixmapsdir}/*.png
 %{_desktopdir}/*