- cosmetics

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

diff --git a/control-center.spec b/control-center.spec
index 48f5318c84696a8ff2508ba4f076685922ca4a84..ea08e93f458b931e61c249f3f1509cb06addbe86 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,17 +5,20 @@ Summary(pt_BR):       O Centro de Controle do GNOME
 Summary(uk):   ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):   ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:          control-center
-Version:       2.2.0.1
+Version:       2.3.5
 Release:       1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.2/%{name}-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.3/%{name}-%{version}.tar.bz2
+# Source0-md5: d2bdaedcb5c9b4e94cb6f3dc07bec834
 Patch0:                %{name}-fontconfig.patch
+Patch1:                %{name}-am17.patch
+Patch2:                %{name}-link.patch
 URL:           http://www.gnome.org/
 Icon:          control-center.gif
-BuildRequires: GConf2-devel >= 2.2.0
-BuildRequires: ORBit2-devel >= 2.6.0
+BuildRequires: GConf2-devel >= 2.3.3
+BuildRequires: ORBit2-devel >= 2.7.6
 BuildRequires: audiofile >= 0.2.3-3
 BuildRequires: autoconf
 BuildRequires: automake
@@ -24,26 +27,30 @@ BuildRequires:      flex
 BuildRequires: esound-devel
 BuildRequires: findutils
 BuildRequires: gettext-devel
-BuildRequires: gnome-desktop-devel >= 2.2.0
-BuildRequires: gnome-vfs2-devel >= 2.2.0
-BuildRequires: gtk+2-devel >= 2.2.0
+BuildRequires: gnome-desktop-devel >= 2.3.6
+BuildRequires: gnome-vfs2-devel >= 2.3.7
+BuildRequires: gtk+2-devel >= 2.2.1
 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.90
-BuildRequires: libgnomeui-devel >= 2.1.90
-BuildRequires: libxml2-devel >= 2.5.1
+BuildRequires: libbonobo-devel >= 2.2.1
+BuildRequires: libbonoboui-devel >= 2.3.6
+BuildRequires: libglade2-devel >= 2.0.1
+BuildRequires: libgnome-devel >= 2.3.0
+BuildRequires: libgnomeui-devel >= 2.3.3.1-2
+BuildRequires: libxml2-devel >= 2.5.7
 BuildRequires: libtool
-BuildRequires: scrollkeeper >= 0.3.11
+BuildRequires: nautilus-devel >= 2.3.8
+BuildRequires: scrollkeeper >= 0.3.12
 BuildRequires: startup-notification-devel
-BuildRequires: metacity-devel
-BuildRequires: Xft-devel >= 2.1
-Requires:      gnome-vfs2 >= 2.2.0
-PreReq:                scrollkeeper
+BuildRequires: metacity-devel >= 2.5.1
+BuildRequires: xft-devel >= 2.1.1
 PreReq:                /sbin/ldconfig
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+PreReq:                scrollkeeper
+Requires(post):        GConf2
+Requires:      gnome-vfs2 >= 2.3.7
+Obsoletes:     fontilus
 Obsoletes:     gnome
+Obsoletes:     themus
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A Configuration tool for easily setting up your GNOME environment.
@@ -86,7 +93,7 @@ GNOME 
 Summary:       GNOME Control-Center includes
 Summary(pl):   Pliki nag³ówkowe bibliotek GNOME Control-Center
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}
 
 %description devel
 GNOME Control-Center header files.
@@ -97,18 +104,20 @@ Pliki nag
 %package static
 Summary:       GNOME Control-Center static libraries
 Summary(pl):   Statyczne biblioteki GNOME Control-Center
-Group:          X11/Development/Libraries                                       
-Requires:       %{name} = %{version}  
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{epoch}:%{version}
+
+%description static
+GNOME Control-Centerp static libraries.
 
-%description static                                                             
-GNOME Control-Centerp static libraries.                                                
-                                                                                
-%description static -l pl                                                       
-Statyczne biblioteki GNOME Control-Center.   
+%description static -l pl
+Statyczne biblioteki GNOME Control-Center.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 glib-gettextize --copy --force
@@ -126,7 +135,12 @@ intltoolize --copy --force
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT 
+       DESTDIR=$RPM_BUILD_ROOT
+
+# 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}/gnome-vfs-2.0/modules/*.{a,la}
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -144,31 +158,34 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %{_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}/lib*.so.*.*
-%{_libdir}/bonobo/servers/*
+%attr(755,root,root) %{_libdir}/bonobo/*.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/lib*.so
 %attr(755,root,root) %{_libdir}/window-manager-settings/*.so
-%{_datadir}/applications/*
-%{_datadir}/control-center-2.0/capplets/*
-%{_datadir}/control-center-2.0/icons
-%{_datadir}/control-center-2.0/interfaces
-%{_datadir}/control-center-2.0/pixmaps
+%dir %{_libdir}/window-manager-settings
+%{_libdir}/bonobo/servers/*
+%{_datadir}/application-registry/*
+%{_datadir}/control-center-2.0
+%{_datadir}/control-center
 %{_datadir}/gnome/cursor-fonts
 %{_datadir}/gnome/vfolders/*
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/idl/*
+%{_datadir}/mime-info/*
 %{_pixmapsdir}/gnomecc-2
 %{_pixmapsdir}/*.png
+%{_desktopdir}/*
 
 %files devel
-%defattr(644,root,root,755)                                                     
-%{_includedir}/gnome-window-settings-2.0
-%{_libdir}/lib*.la
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
+%{_includedir}/gnome-window-settings-2.0
 %{_pkgconfigdir}/*.pc
-%{_libdir}/window-manager-settings/*.la
 
-%files static                                                                   
-%defattr(644,root,root,755)                                                     
+%files static
+%defattr(644,root,root,755)
 %{_libdir}/*.a
-%{_libdir}/window-manager-settings/*.a