- merged from DEVEL

- updated to version 2.1.1

Changed files:
    control-center.spec -> 1.80

diff --git a/control-center.spec b/control-center.spec
index 333647f7d194aa3ee1509e1ea66aa8b888515073..b915027e82dbf3eebeaec1acfc8865d9c567269c 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,51 +5,45 @@ Summary(pt_BR):       O Centro de Controle do GNOME
 Summary(uk):   ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):   ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:          control-center
-Version:       1.4.0.5
-Release:       4
+Version:       2.1.1
+Release:       1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
-Source0:       ftp://ftp.gnome.org/pub/GNOME/stable/sources/control-center/%{name}-%{version}.tar.gz
-Patch0:                %{name}-macros.patch
-Patch1:                %{name}-applnk.patch
-Patch2:                %{name}-wm-properties_path.patch
-Patch3:                %{name}-esdrelease.patch
-Patch4:                %{name}-pldrelease.patch
-Patch5:                %{name}-am_conditional.patch
-Patch6:                %{name}-uipropertiesmenu.patch
-Patch7:                %{name}-setroothint.patch
-Patch8:                %{name}-no_mans.patch
-Patch9:                %{name}-omf.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
+Patch0:                %{name}-am.patch
+Patch1:                %{name}-fontconfig.patch
 URL:           http://www.gnome.org/
 Icon:          control-center.gif
-BuildRequires: GConf-devel
-BuildRequires: ORBit-devel >= 0.5.6
+BuildRequires: GConf2-devel >= 1.2.1
+BuildRequires: ORBit2-devel >= 2.4.1
+BuildRequires: audiofile >= 0.2.3-3
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex
-BuildRequires: esound-devel >= 0.2.5
+BuildRequires: esound-devel
 BuildRequires: findutils
-BuildRequires: gdk-pixbuf-devel >= 0.7.0
 BuildRequires: gettext-devel
-BuildRequires: gnome-libs-devel >= 1.2.12-3
-BuildRequires: gnome-vfs-devel >= 0.9
-BuildRequires: gtk+-devel >= 1.1.16
-BuildRequires: imlib-devel >= 1.8.2
-BuildRequires: intltool
+BuildRequires: gnome-desktop-devel >= 2.1.0
+BuildRequires: gnome-vfs2-devel >= 2.0.2
+BuildRequires: gtk+2-devel >= 2.1.0
+BuildRequires: intltool >= 0.22
+BuildRequires: libbonobo-devel >= 2.0.0
+BuildRequires: libbonoboui-devel >= 2.0.1
+BuildRequires: libglade2-devel >= 2.0.0
+BuildRequires: libgnome-devel >= 2.0.2
+BuildRequires: libgnomeui-devel >= 2.1.0
+BuildRequires: libxml2-devel >= 2.4.24
 BuildRequires: libtool
-BuildRequires: oaf-devel
-BuildRequires: zlib-devel
-BuildRequires:  libxml-devel
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): scrollkeeper
+BuildRequires: scrollkeeper >= 0.3.6
+PreReq:                scrollkeeper
+PreReq:                /sbin/ldconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     gnome
 
 %define                _prefix         /usr/X11R6
-%define                _sysconfdir     /etc/X11/GNOME
-%define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
+%define                _sysconfdir     /etc/X11/GNOME2
 
 %description
 A Configuration tool for easily setting up your GNOME environment.
@@ -89,107 +83,39 @@ GNOME 
 ãÅÊ ÐÁËÅÔ ÐÏÔÒ¦ÂÎÉÊ, ÑËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ ÓÅÒÅÄÏ×ÉÝÅ GNOME.
 
 %package devel
-Summary:       GNOME control-center includes
-Summary(es):   Archivos para desarrollo con el control-center del GNOME
-Summary(pl):   Pliki nag³ówkowe centrum kontroli GNOME
-Summary(pt_BR):        Arquivos para desenvolvimento com o control-center do GNOME
-Summary(ru):   óÒÅÄÁ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ ÄÌÑ ãÅÎÔÒÁ õÐÒÁ×ÌÅÎÉÑ GNOME
-Summary(uk):   óÅÒÅÄÏ×ÉÝÅ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ ÄÌÑ ãÅÎÔÒÕ ëÅÒÕ×ÁÎÎÑ GNOME
+Summary:       GNOME Control-Center includes
+Summary(pl):   Pliki nag³ówkowe bibliotek GNOME Control-Center
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
 
 %description devel
-Capplet development stuff.
+GNOME Control-Center header files.
 
-%description devel -l es
-Archivos para desarrollo con el control-center del GNOME
-
-%description -l pl
-Rzeczy potrzebne do kompilacji.
-
-%description devel -l pt_BR
-Se você estiver interessado em desenvolver painéis para o centro de
-controle do GNOME este pacote será necessário.
-
-O control-center-devel lhe a ajuda na criação de 'capplets', que são
-usados no centro de controle.
-
-%description devel -l ru
-ðÁËÅÔ control-center-devel ÓÏÄÅÒÖÉÔ ÓÒÅÄÕ, ÎÅÏÂÈÏÄÉÍÕÀ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ
-ÍÏÄÕÌÅÊ (`capplets'), ÉÓÐÏÌØÚÕÅÍÙÈ × ãÅÎÔÒÅ õÐÒÁ×ÌÅÎÉÑ GNOME.
-
-åÓÌÉ ×Ù ÔÏÌØËÏ ÉÓÐÏÌØÚÕÅÔÅ ÒÁÂÏÞÉÊ ÓÔÏÌ GNOME, ÎÏ ÎÅ ÒÁÚÒÁÂÁÔÙ×ÁÅÔÅ
-ÐÒÏÇÒÁÍÍ, ÔÏ ×ÁÍ ÎÅ ÎÕÖÎÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÜÔÏÔ ÐÁËÅÔ.
-
-%description devel -l uk
-ðÁËÅÔ control-center-devel ͦÓÔÉÔØ ÓÅÒÅÄÏ×ÉÝÅ, ÎÅÏÂȦÄÎÅ ÄÌÑ ÒÏÚÒÏÂËÉ
-ÍÏÄÕÌ¦× (`capplets'), Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ × ãÅÎÔÒ¦ ëÅÒÕ×ÁÎÎÑ GNOME.
-
-ñËÝÏ ×É ÌÉÛÅ ×ÉËÏÒÉÓÔÏ×Õ¤ÔÅ ÒÏÂÏÞÉÊ ÓÔ¦Ì GNOME, ÁÌÅ ÎÅ ÒÏÚÒÏÂÌѤÔÅ
-ÐÒÏÇÒÁÍ, ÔÏ ×ÁÍ ÎÅ ÐÏÔÒ¦ÂÎÏ ×ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÃÅÊ ÐÁËÅÔ.
+%description devel -l pl
+Pliki nag³ówkowe bibliotek GNOME Control-Center
 
 %package static
-Summary:       GNOME control-center static libraries
-Summary(es):   Archivos estáticos para desarrollo con el control-center del GNOME
-Summary(pl):   Statyczne biblioteki dla centrum kontroli GNOME
-Summary(pt_BR):        Arquivos estáticos para desenvolvimento com o control-center
-Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ ãÅÎÔÒÁ õÐÒÁ×ÌÅÎÉÑ GNOME
-Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ ãÅÎÔÒÕ ëÅÒÕ×ÁÎÎÑ GNOME
-Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
-
-%description static
-GNOME control-center static libraries.
-
-%description static -l es
-El control-center es una herramienta para una configuración facilitada
-el entorno GNOME.
+Summary:       GNOME Control-Center static libraries
+Summary(pl):   Statyczne biblioteki GNOME Control-Center
+Group:          X11/Development/Libraries                                       
+Requires:       %{name} = %{version}  
 
-Archivos para desarrollo con el control-center del GNOME Archivos
-estáticos del control-center del gnome.
-
-%description -l pl
-Statyczne biblioteki dla centrum kontroli GNOME.
-
-%description static -l pt_BR
-O control-center-devel lhe a ajuda na criação de 'capplets', que são
-usados no centro de controle.
-
-Se você estiver interessado em desenvolver painéis para o centro de
-controle do GNOME este pacote será necessário. Nota: este pacote
-contém somente os arquivos estáticos.
-
-%description static -l ru
-ðÁËÅÔ control-center-static ÓÏÄÅÒÖÉÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ
-ÒÁÚÒÁÂÏÔËÉ ÍÏÄÕÌÅÊ (`capplets'), ÉÓÐÏÌØÚÕÅÍÙÈ × ãÅÎÔÒÅ õÐÒÁ×ÌÅÎÉÑ
-GNOME.
-
-%description static -l uk
-ðÁËÅÔ control-center-static ͦÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÄÌÑ ÒÏÚÒÏÂËÉ
-ÍÏÄÕÌ¦× (`capplets'), Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ × ãÅÎÔÒ¦ ëÅÒÕ×ÁÎÎÑ GNOME.
+%description static                                                             
+GNOME Control-Centerp static libraries.                                                
+                                                                                
+%description static -l pl                                                       
+Statyczne biblioteki GNOME Control-Center.   
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
-sed -e s/AM_GNOME_GETTEXT/AM_GNU_GETTEXT/ configure.in > configure.in.tmp
-mv -f configure.in.tmp configure.in
-rm -f missing
-xml-i18n-toolize --copy --force
-%{__libtoolize}
-%{__gettextize}
-rm -f macros/xml-i18n-tools.m4 # have it in xml-i18n-tools
-%{__aclocal} -I macros
+glib-gettextize --copy --force
+intltoolize --copy --force
+libtoolize --copy --force
+aclocal
 %{__autoconf}
 %{__automake}
 %configure
@@ -200,49 +126,49 @@ rm -f macros/xml-i18n-tools.m4    # have it in xml-i18n-tools
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       omf_dest_dir=%{_omf_dest_dir}/%{name}
+       DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/control-center/Desktop/screensaver-properties.desktop \
-       $RPM_BUILD_ROOT%{_applnkdir}/Settings/Desktop/screensaver-properties.desktop \
-       $RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME/Desktop/screensaver-properties.desktop
-
-find $RPM_BUILD_ROOT%{_applnkdir} -name .directory | xargs rm -f
-
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/usr/bin/scrollkeeper-update
+GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" \
+/usr/X11R6/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
 
 %postun
 /sbin/ldconfig
-/usr/bin/scrollkeeper-update
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%{_sysconfdir}/CORBA/servers/*
+%{_sysconfdir}/gconf/schemas/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-
-%{_datadir}/control-center
-%{_applnkdir}/Settings/GNOME
-%{_omf_dest_dir}/%{name}
-%dir %{_datadir}/gnome/wm-properties
-%{_pixmapsdir}/*
+%{_libdir}/bonobo/servers/*
+%{_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
+%{_datadir}/gnome/cursor-fonts
+%{_datadir}/gnome/vfolders/*
+%{_datadir}/gnome-2.0/ui/*
 %{_datadir}/idl/*
+%{_pixmapsdir}/gnomecc-2
+%{_pixmapsdir}/*.png
 
 %files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
-%attr(755,root,root) %{_libdir}/*.sh
-%{_includedir}/*
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%defattr(644,root,root,755)                                                     
+%{_includedir}/gnome-window-settings-2.0
+%attr(755,root,root) %{_libdir}/lib*.??
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/window-manager-settings/*.la
+
+%files static                                                                   
+%defattr(644,root,root,755)                                                     
+%{_libdir}/*.a
+%{_libdir}/window-manager-settings/*.a