X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-panel.spec;h=41f7819b8b3ee564fc00fdd12b6ed26e1d626b08;hb=eff30964687f18b6662673b681f636a06acc4e56;hp=ad779d334f794e094c2c2a977ca00ebe8cf892cc;hpb=fa173a8301f76706456da2ca52920f632cebc10f;p=packages%2Fgnome-panel.git

diff --git a/gnome-panel.spec b/gnome-panel.spec
index ad779d3..41f7819 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,48 +1,76 @@
 Summary:	The core programs for the GNOME GUI desktop environment
-Summary(pl):	Podstawowe programy ¶rodowiska graficznego GNOME
+Summary(pl.UTF-8):	Podstawowe programy środowiska graficznego GNOME
 Name:		gnome-panel
-Version:	2.16.3
+Version:	3.6.2
 Release:	1
-License:	LGPL
+License:	LGPL v2+ (library), GPL v2+ (the rest)
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.16/%{name}-%{version}.tar.bz2
-# Source0-md5:	4af0a1ecb940f2bb27a27db50e3071c8
-Patch0:		%{name}-finalize-memleak.patch
-Patch1:		%{name}-no_launchers_on_panel.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
+# Source0-md5:	f394ad73babbce95fd0bb65ec6fd3519
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.16.0
-BuildRequires:	ORBit2-devel >= 1:2.14.5
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	evolution-data-server-devel >= 1.8.3
-BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gnome-desktop-devel >= 2.16.3
-BuildRequires:	gnome-doc-utils >= 0.8.0
-BuildRequires:	gnome-menus-devel >= 2.16.1
-BuildRequires:	gnome-vfs2-devel >= 2.16.3
-BuildRequires:	gtk+2-devel >= 2:2.10.9
-BuildRequires:	gtk-doc >= 1.7
-BuildRequires:	intltool >= 0.35.0
-BuildRequires:	libart_lgpl-devel >= 2.3.17
-BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgnomeui-devel >= 2.16.1
-BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.16.3
-BuildRequires:	pango-devel >= 1:1.14.10
+BuildRequires:	GConf2-devel >= 2.26.0
+BuildRequires:	NetworkManager-devel >= 0.6
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	cairo-devel >= 1.0.0
+BuildRequires:	dbus-devel >= 1.1.2
+BuildRequires:	dbus-glib-devel >= 0.80
+BuildRequires:	dconf-devel >= 0.14.0
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	evolution-data-server-devel >= 3.6.0
+BuildRequires:	gdk-pixbuf2-devel >= 2.26.0
+BuildRequires:	gettext-devel >= 0.12
+BuildRequires:	glib2-devel >= 1:2.32.0
+BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	gnome-desktop-devel >= 3.4.0
+BuildRequires:	gnome-menus-devel >= 3.2.0
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gtk+3-devel >= 3.4.0
+BuildRequires:	gtk-doc >= 1.9
+BuildRequires:	intltool >= 0.40.6
+BuildRequires:	libgweather-devel >= 3.6.0
+BuildRequires:	librsvg-devel >= 2.22.0
+BuildRequires:	libtool >= 2:2.2.6
+BuildRequires:	libwnck-devel >= 3.0.0
+BuildRequires:	pango-devel >= 1:1.15.4
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig >= 1:0.15.0
-BuildRequires:	python-libxml2 >= 1:2.6.27
+BuildRequires:	polkit-devel
 BuildRequires:	rpm-build >= 4.1-10
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	scrollkeeper >= 0.3.11
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	telepathy-glib-devel >= 0.14.0
+BuildRequires:	xorg-lib-libICE-devel
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXau-devel
+BuildRequires:	xorg-lib-libXrandr-devel >= 1.2.0
+BuildRequires:	xz
+BuildRequires:	yelp-tools
 BuildConflicts:	GConf-devel < 1.0.9-7
-Requires(post,postun):	hicolor-icon-theme
-Requires(post,postun):	scrollkeeper
-Requires(post,preun):	GConf2 >= 2.16.0
+Requires(post,postun):	glib2 >= 1:2.32.0
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gnome-desktop >= 2.16.3
-Requires:	gnome-icon-theme >= 2.16.0.1
+Requires:	dconf >= 0.14.0
+Requires:	evolution-data-server >= 3.6.0
+Requires:	gdk-pixbuf2 >= 2.26.0
+Requires:	gnome-desktop >= 3.4.0
+Requires:	gnome-icon-theme >= 3.0.0
+Requires:	gnome-menus >= 3.2.0
+Requires:	hicolor-icon-theme
+Requires:	libgweather >= 3.6.0
+Requires:	pango >= 1:1.15.4
+Requires:	telepathy-glib >= 0.14.0
+Requires:	tzdata >= 2008b-4
 Requires:	xdg-menus
+Requires:	xorg-lib-libXrandr >= 1.2.0
+Suggests:	gnome-screenshot
+Suggests:	gnome-search-tool
+Suggests:	polkit-gnome >= 0.93
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -54,81 +82,76 @@ to CDE and KDE, but GNOME is based completely on free software.
 The gnome-panel packages provides the GNOME panel, menus and some
 basic applets for the panel.
 
-%description -l pl
+%description -l pl.UTF-8
 GNOME (GNU Network Object Model Environment) to zestaw przyjaznych dla
-u¿ytkownika aplikacji i narzêdzi do u¿ywania w po³±czeniu z zarz±dc±
-okien pod X. GNOME ma podobny cel jak CDE i KDE, ale bazuje ca³kowicie
+użytkownika aplikacji i narzędzi do używania w połączeniu z zarządcą
+okien pod X. GNOME ma podobny cel jak CDE i KDE, ale bazuje całkowicie
 na wolnym oprogramowaniu.
 
 Ten pakiet dostarcza panel GNOME2, menu oraz podstawowe aplety dla
 panelu GNOME2.
 
-%package devel
-Summary:	GNOME panel includes, and more
-Summary(pl):	Pliki nag³ówkowe biblioteki panelu GNOME
-Group:		X11/Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	libgnomeui-devel >= 2.16.1
-
-%description devel
-Panel header files for creating GNOME panels.
-
-%description devel -l pl
-Pliki nag³ówkowe bibliotek panelu GNOME.
-
-%package static
-Summary:	GNOME panel static libraries
-Summary(pl):	Statyczne biblioteki panelu GNOME
-Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Panel static libraries.
-
-%description static -l pl
-Statyczne biblioteki panelu GNOME.
-
 %package libs
 Summary:	GNOME panel library
-Summary(pl):	Biblioteka panelu GNOME
+Summary(pl.UTF-8):	Biblioteka panelu GNOME
 Group:		X11/Libraries
-Requires:	libgnomeui >= 2.16.1
-Requires:	librsvg >= 1:2.16.0
+Requires:	GConf2-libs >= 2.26.0
+Requires:	cairo >= 1.0.0
+Requires:	glib2 >= 1:2.32.0
+Requires:	gtk+3 >= 3.4.0
+Requires:	librsvg >= 1:2.22.0
 
 %description libs
 GNOME panel library.
 
-%description libs -l pl
+%description libs -l pl.UTF-8
 Biblioteka panelu GNOME.
 
+%package devel
+Summary:	GNOME panel includes, and more
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki panelu GNOME
+Group:		X11/Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	GConf2-devel >= 2.26.0
+Requires:	glib2-devel >= 1:2.32.0
+Requires:	gtk+3-devel >= 3.4.0
+
+%description devel
+Panel header files for creating GNOME panels.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek panelu GNOME.
+
 %package apidocs
 Summary:	panel-applet API documentation
-Summary(pl):	Dokumentacja API panel-applet
+Summary(pl.UTF-8):	Dokumentacja API panel-applet
 Group:		Documentation
 Requires:	gtk-doc-common
 
 %description apidocs
 panel-applet API documentation.
 
-%description apidocs -l pl
+%description apidocs -l pl.UTF-8
 Dokumentacja API panel-applet.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+
+# short circuit stopper (fix me!)
+mv ChangeLog main-ChangeLog
+find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
 
 %build
-%{__gnome_doc_prepare}
-%{__gnome_doc_common}
+%{__gtkdocize}
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
-%{__autoheader}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-	--disable-schemas-install \
+	--disable-silent-rules \
+	--disable-static \
 	--enable-eds \
 	--enable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir}
@@ -136,19 +159,14 @@ Dokumentacja API panel-applet.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_datadir}/%{name}}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	DESTDIR=$RPM_BUILD_ROOT
 
-install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-4.la
 
-# short circuit stopper (fix me!)
-mv ChangeLog main-ChangeLog
-find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
-
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{sr@ije,sr@ijekavian}
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -156,43 +174,11 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%scrollkeeper_update_post
-%gconf_schema_install clock.schemas
-%gconf_schema_install fish.schemas
-%gconf_schema_install panel-compatibility.schemas
-%gconf_schema_install panel-general.schemas
-%gconf_schema_install panel-global.schemas
-%gconf_schema_install panel-object.schemas
-%gconf_schema_install panel-toplevel.schemas
-%gconf_schema_install window-list.schemas
-%gconf_schema_install workspace-switcher.schemas
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%{_bindir}/gconftool-2 --direct \
-	--config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
-	--load %{_datadir}/%{name}/panel-default-setup.entries > /dev/null
-%{_bindir}/gconftool-2 --direct \
-	--config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
-	--load %{_datadir}/%{name}/panel-default-setup.entries /apps/panel/profiles/default > /dev/null
-
-%banner %{name} -e << EOF
-For full functionality, you need to install
-gnome-utils-screenshot and gnome-utils-search-tool.
-EOF
-
-%preun
-%gconf_schema_uninstall clock.schemas
-%gconf_schema_uninstall fish.schemas
-%gconf_schema_uninstall panel-compatibility.schemas
-%gconf_schema_uninstall panel-general.schemas
-%gconf_schema_uninstall panel-global.schemas
-%gconf_schema_uninstall panel-object.schemas
-%gconf_schema_uninstall panel-toplevel.schemas
-%gconf_schema_uninstall window-list.schemas
-%gconf_schema_uninstall workspace-switcher.schemas
-
 %postun
-%scrollkeeper_update_postun
+%glib_compile_schemas
 %update_icon_cache hicolor
 
 %post	libs -p /sbin/ldconfig
@@ -200,52 +186,47 @@ EOF
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README *ChangeLog
+%doc AUTHORS MAINTAINERS NEWS README *ChangeLog
 %attr(755,root,root) %{_bindir}/gnome-desktop-item-edit
 %attr(755,root,root) %{_bindir}/gnome-panel
 %attr(755,root,root) %{_bindir}/panel-test-applets
-%attr(755,root,root) %{_libdir}/clock-applet
-%attr(755,root,root) %{_libdir}/fish-applet-2
-%attr(755,root,root) %{_libdir}/notification-area-applet
-%attr(755,root,root) %{_libdir}/wnck-applet
-%{_datadir}/gnome-2.0/ui/*
+%attr(755,root,root) %{_libexecdir}/clock-applet
+%attr(755,root,root) %{_libexecdir}/fish-applet
+%attr(755,root,root) %{_libexecdir}/gnome-panel-add
+%attr(755,root,root) %{_libexecdir}/notification-area-applet
+%attr(755,root,root) %{_libexecdir}/wnck-applet
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.clock.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.fish.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.window-list.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.launcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.menu-button.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.object.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
 %{_datadir}/gnome-panel
-%{_datadir}/gnome/panel
-%{_datadir}/gnome-panelrc
-%{_datadir}/idl/gnome-panel-2.0
-%{_iconsdir}/hicolor/*/apps/*
-%{_libdir}/bonobo/servers/*
-%{_mandir}/man1/*
-%{_omf_dest_dir}/clock
-%{_omf_dest_dir}/fish
-%{_omf_dest_dir}/gnome-panel
-%{_omf_dest_dir}/window-list
-%{_omf_dest_dir}/workspace-switcher
-%{_sysconfdir}/gconf/schemas/clock.schemas
-%{_sysconfdir}/gconf/schemas/fish.schemas
-%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas
-%{_sysconfdir}/gconf/schemas/panel-general.schemas
-%{_sysconfdir}/gconf/schemas/panel-global.schemas
-%{_sysconfdir}/gconf/schemas/panel-object.schemas
-%{_sysconfdir}/gconf/schemas/panel-toplevel.schemas
-%{_sysconfdir}/gconf/schemas/window-list.schemas
-%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas
+%{_desktopdir}/gnome-panel.desktop
+%{_iconsdir}/hicolor/*/apps/gnome-panel*.*
+%{_mandir}/man1/gnome-panel.1*
 
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpanel-applet-2.so
-%{_libdir}/libpanel-applet-2.la
-%{_includedir}/panel-2.0
-%{_pkgconfigdir}/libpanelapplet-2.0.pc
-
-%files static
+%files libs
 %defattr(644,root,root,755)
-%{_libdir}/libpanel-applet-2.a
+%attr(755,root,root) %{_libdir}/libpanel-applet-4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpanel-applet-4.so.0
+%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
 
-%files libs
+%files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpanel-applet-2.so.*.*.*
+%attr(755,root,root) %{_libdir}/libpanel-applet-4.so
+%{_includedir}/gnome-panel-4.0
+%{_pkgconfigdir}/libpanelapplet-4.0.pc
+%{_datadir}/gir-1.0/PanelApplet-4.0.gir
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/panel-applet
+%{_gtkdocdir}/panel-applet-4.0