X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=control-center.spec;h=5c5c3b46f06505d450a40105ad9eb31964f8e685;hb=c4acaa79f570a4fc03398d0800305ac6a7456db0;hp=f111abb52144d76f7f0ee3e9fc7bfc786b56aeab;hpb=6493f0e739e93d2ab98c8e8c81d6ac40c384cda5;p=packages%2Fcontrol-center.git

diff --git a/control-center.spec b/control-center.spec
index f111abb..5c5c3b4 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,49 +5,62 @@ Summary(pt_BR):	O Centro de Controle do GNOME
 Summary(uk):	ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):	ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:		control-center
-Version:	1.4.0.5
-Release:	2
+Version:	2.9.4
+Release:	0.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
+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 - 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
+Patch11:	%{name}-desktop.patch
 URL:		http://www.gnome.org/
 Icon:		control-center.gif
-BuildRequires:	GConf-devel
-BuildRequires:	ORBit-devel >= 0.5.6
+BuildRequires:	GConf2-devel >= 2.8.0
+BuildRequires:	ORBit2-devel >= 1:2.12.0
+BuildRequires:	audiofile >= 1:0.2.6
 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.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.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.14
 BuildRequires:	libtool
-BuildRequires:	oaf-devel
-BuildRequires:	zlib-devel
+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
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires(post):	GConf2
+Requires:	gnome-vfs2 >= 2.8.0
+Obsoletes:	acme
+Obsoletes:	fontilus
 Obsoletes:	gnome
-
-%define		_prefix		/usr/X11R6
-%define		_sysconfdir	/etc/X11/GNOME
-%define		_omf_dest_dir	%(scrollkeeper-config --omfdir)
+Obsoletes:	themus
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A Configuration tool for easily setting up your GNOME environment.
@@ -87,109 +100,56 @@ 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 header files
+Summary(pl):	Pliki nag³ówkowe bibliotek GNOME Control-Center
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Capplet development stuff.
-
-%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 Control-Center header files.
 
-ñËÝÏ ×É ÌÉÛÅ ×ÉËÏÒÉÓÔÏ×Õ¤ÔÅ ÒÏÂÏÞÉÊ ÓÔ¦Ì 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
+Summary:	GNOME Control-Center static libraries
+Summary(pl):	Statyczne biblioteki GNOME Control-Center
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
-GNOME control-center static libraries.
+GNOME Control-Center static libraries.
 
-%description static -l es
-El control-center es una herramienta para una configuración facilitada
-el entorno GNOME.
-
-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 -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 -p1
+#%patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
+#%patch7 -p1
+#%patch8 -p1 
+#%patch9 -p1
+#%patch10 -p1
+%patch11 -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 --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 -f
-%configure
+glib-gettextize --copy --force
+intltoolize --copy --force
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
+%configure \
+	--disable-schemas-install \
+	--enable-gstreamer \
+	X_EXTRA_LIBS="-lXext"
 
 %{__make}
 
@@ -197,51 +157,62 @@ automake -a -c -f
 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
+#mv $RPM_BUILD_ROOT%{_iconsdir}/gnome/48x48/apps/accessibility-directory.png \
+#	$RPM_BUILD_ROOT%{_pixmapsdir}
 
-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}/nautilus/extensions*/*.{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
 /sbin/ldconfig
-/usr/bin/scrollkeeper-update
+%gconf_schema_install
 
-%postun
-/sbin/ldconfig
-/usr/bin/scrollkeeper-update
+%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
-%{_omf_dest_dir}/%{name}
-%dir %{_datadir}/gnome/wm-properties
-%{_pixmapsdir}/*
+%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}/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}/*/*/*/gnome-control-center.png
+%{_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
-%{_includedir}/*
+%{_libdir}/lib*.la
+%{_includedir}/gnome-window-settings-2.0
+%{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/*.a