X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=control-center.spec;h=8f7b921032c4368a08e5aaa850dd35f25534ed0b;hb=8f9218f346c1b2785ff3e72a733e7137465904b9;hp=02b783e222ec4800e63f2346a637934c50c519c0;hpb=cca5478826db42c486dd46fca4bc1bce807ccc7e;p=packages%2Fcontrol-center.git

diff --git a/control-center.spec b/control-center.spec
index 02b783e..8f7b921 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -1,49 +1,64 @@
 Summary:	GNOME control center
+Summary(es):	El centro de controle del GNOME
 Summary(pl):	Centrum kontroli GNOME
+Summary(pt_BR):	O Centro de Controle do GNOME
+Summary(uk):	ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
+Summary(ru):	ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:		control-center
-Version:	1.4.0.1
-Release:	5
+Version:	2.8.0
+Release:	2.6
 Epoch:		1
 License:	GPL
 Group:		X11/Applications
-Group(de):	X11/Applikationen
-Group(pl):	X11/Aplikacje
-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}-gettext.patch
-Patch3:		%{name}-wm-properties_path.patch
-Patch4:		%{name}-esdrelease.patch
-Patch5:		%{name}-pldrelease.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	300fb361af4645dd9b0154ecd18b2256
+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
+Patch6:		%{name}-dpi.patch
+Patch7:		%{name}-reduced_resources.patch
+Patch8:		%{name}-def-apps-capplet-browsers.patch
+Patch9:		%{name}-evolution.patch
+Patch10:	%{name}-capplet.patch
 URL:		http://www.gnome.org/
 Icon:		control-center.gif
-BuildRequires:	GConf-devel
-BuildRequires:	ORBit-devel
+BuildRequires:	GConf2-devel >= 2.8.0
+BuildRequires:	ORBit2-devel >= 1:2.12.0
+BuildRequires:	audiofile >= 1:0.2.6
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libtool
 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:	xml-i18n-tools
-BuildRequires:	oaf-devel
-BuildRequires:	zlib-devel
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires:	gnome-desktop-devel >= 2.8.0
+BuildRequires:	gnome-vfs2-devel >= 2.8.0
+BuildRequires:	gstreamer-plugins-devel >= 0.8.4
+BuildRequires:	gtk+2-devel >= 2:2.4.4
+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:	libtool
+BuildRequires:	metacity-devel >= 2:2.8.5
+BuildRequires:	nautilus-devel >= 2.8.0
+BuildRequires:	scrollkeeper >= 0.3.12
+BuildRequires:	startup-notification-devel >= 0.7
+BuildRequires:	xft-devel >= 2.1.1
+PreReq:		/sbin/ldconfig
+PreReq:		scrollkeeper
+Requires(post):	GConf2
+Requires:	gnome-vfs2 >= 2.8.0
+Obsoletes:	acme
+Obsoletes:	fontilus
 Obsoletes:	gnome
-
-%define		_prefix		/usr/X11R6
-%define		_bindir		%{_prefix}/bin
-%define		_datadir	%{_prefix}/share
-%define		_includedir	%{_prefix}/include
-%define		_libdir		%{_prefix}/lib
-%define		_sysconfdir	/etc/X11/GNOME
+Obsoletes:	themus
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A Configuration tool for easily setting up your GNOME environment.
@@ -51,6 +66,10 @@ GNOME is the GNU Network Object Model Environment. That's a fancy name
 but really GNOME is a nice GUI desktop environment. It makes using
 your computer easy, powerful, and easy to configure.
 
+%description -l es
+El control-center es una herramienta para una configuración facilitada
+el entorno GNOME.
+
 %description -l pl
 Narzêdzie do ³atwej konfiguracji twojego ¶rodowiska GNOME. GNOME to
 Obiektowe ¦rodowisko Sieciowe na licencji GNU (GNU Network Object
@@ -58,113 +77,137 @@ Model Environment). Nazwa jest do
 jest to mi³e ¶rodowisko pracy. Powoduje, ¿e u¿ywanie komputera jest
 proste, wydajne i ³atwe w konfiguracji.
 
+%description -l pt_BR
+O control-center é uma ferramenta para facilmente configurar seu
+ambiente GNOME.
+
+%description -l ru
+ðÁËÅÔ control-center ÓÏÄÅÒÖÉÔ ÕÔÉÌÉÔÙ, ÐÏÚ×ÏÌÑÀÝÉÅ ÎÁÓÔÒÁÉ×ÁÔØ ÓÒÅÄÕ
+GNOME ×ÁÛÅÊ ÓÉÓÔÅÍÙ (ÔÁËÉÅ ×ÅÝÉ ËÁË ÆÏÎ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ É ÔÅÍÙ,
+ÐÒÏÇÒÁÍÍÁ ÓÏÈÒÁÎÅÎÉÑ ÜËÒÁÎÁ, ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ, ÓÉÓÔÅÍÎÙÅ Ú×ÕËÉ,
+ÐÏ×ÅÄÅÎÉÅ ÍÙÛÉ É ÄÒ.)
+
+üÔÏÔ ÐÁËÅÔ ÎÕÖÅÎ, ÅÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ ÓÒÅÄÕ GNOME.
+
+%description -l uk
+ðÁËÅÔ control-center ͦÓÔÉÔØ ÕÔÉ̦ÔÉ, Ñ˦ ÄÏÚ×ÏÌÑÀÔØ ÎÁÓÔÒÏÀ×ÁÔÉ
+ÓÅÒÅÄÏ×ÉÝÅ GNOME ×ÁÛϧ ÓÉÓÔÅÍÉ (ÔÁ˦ ÒÅÞ¦ ÑË ÆÏÎ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ ÔÁ
+ÔÅÍÉ, ÐÒÏÇÒÁÍÁ ÚÂÅÒÅÖÅÎÎÑ ÅËÒÁÎÕ, צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ, ÓÉÓÔÅÍΦ Ú×ÕËÉ,
+ÐÏ×ÅĦÎËÁ ÍÉÛ¦ ÔÁ ¦Î.)
+
+ãÅÊ ÐÁËÅÔ ÐÏÔÒ¦ÂÎÉÊ, ÑËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ ÓÅÒÅÄÏ×ÉÝÅ GNOME.
+
 %package devel
-Summary:	GNOME control-center includes
-Summary(pl):	Pliki nag³ówkowe centrum kontroli GNOME
+Summary:	GNOME Control-Center header files
+Summary(pl):	Pliki nag³ówkowe bibliotek GNOME Control-Center
 Group:		X11/Development/Libraries
-Group(de):	X11/Entwicklung/Libraries
-Group(es):	X11/Desarrollo/Bibliotecas
-Group(fr):	X11/Development/Librairies
-Group(pl):	X11/Programowanie/Biblioteki
-Group(pt_BR):	X11/Desenvolvimento/Bibliotecas
-Group(ru):	X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Capplet development stuff.
+GNOME Control-Center header files.
 
-%description -l pl
-Rzeczy potrzebne do kompilacji.
+%description devel -l pl
+Pliki nag³ówkowe bibliotek GNOME Control-Center
 
 %package static
-Summary:	GNOME control-center static libraries
-Summary(pl):	Statyczne biblioteki dla centrum kontroli GNOME
+Summary:	GNOME Control-Center static libraries
+Summary(pl):	Statyczne biblioteki GNOME Control-Center
 Group:		X11/Development/Libraries
-Group(de):	X11/Entwicklung/Libraries
-Group(es):	X11/Desarrollo/Bibliotecas
-Group(fr):	X11/Development/Librairies
-Group(pl):	X11/Programowanie/Biblioteki
-Group(pt_BR):	X11/Desenvolvimento/Bibliotecas
-Group(ru):	X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
-GNOME control-center static libraries.
+GNOME Control-Center static libraries.
 
-%description -l pl
-Statyczne biblioteki dla centrum kontroli GNOME.
+%description static -l pl
+Statyczne biblioteki GNOME Control-Center.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .wiget
 %patch1 -p1
-%patch2 -p1
+##%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p0
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p0
+%patch9 -p1
+%patch10 -p1
 
 %build
-rm -f missing
-xml-i18n-toolize --copy --force
-libtoolize --copy --force
-gettextize --copy --force
-rm -f macros/xml-i18n-tools.m4	# have it in xml-i18n-tools
-aclocal -I macros
-autoconf
-automake -a -c
-%configure 
+glib-gettextize --copy --force
+intltoolize --copy --force
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
+%configure \
+	--disable-schemas-install \
+	--enable-gstreamer \
+	X_EXTRA_LIBS="-lXext"
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
-
-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
-	
-mv -f $RPM_BUILD_ROOT%{_applnkdir}/Settings/*.desktop \
-      $RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME
-cp    $RPM_BUILD_ROOT%{_applnkdir}/Settings/Desktop/*.desktop \
-      $RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME/Desktop
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT%{_applnkdir} -name .directory | xargs | rm -f
+# 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}
 
-gzip -9nf AUTHORS ChangeLog NEWS README
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+%gconf_schema_install
+
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%{_sysconfdir}/CORBA/servers/*
+%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}/gnome-settings-daemon
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-
-%{_datadir}/control-center
-%{_applnkdir}/Settings/GNOME
-%dir %{_datadir}/gnome/wm-properties
-%{_pixmapsdir}/*
+%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
+%dir %{_libdir}/window-manager-settings
+%{_libdir}/bonobo/servers/*
+%{_datadir}/application-registry/*
+%{_datadir}/control-center-2.0
+%{_datadir}/gnome/cursor-fonts
+%{_datadir}/gnome/vfolders/*
+%{_datadir}/gnome-2.0/ui/*
+%{_datadir}/gnome/capplets
+%{_datadir}/idl/*
+%{_datadir}/mime-info/*
+%{_iconsdir}/*
+%{_pixmapsdir}/gnomecc-2
+%{_pixmapsdir}/*.png
+%{_desktopdir}/*
 
 %files devel
 %defattr(644,root,root,755)
-%doc *gz
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
-%attr(755,root,root) %{_libdir}/*.sh
-%{_datadir}/idl/*
-%{_datadir}/omf/*
-%{_includedir}/*
+%{_libdir}/lib*.la
+%{_includedir}/gnome-window-settings-2.0
+%{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/*.a