X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-panel.spec;h=78f798eeaac5f1b619c07140f3f95cf55459873a;hb=28d42e0f31a459bfb98e0c1fc5035a6ce9e529ab;hp=3185d50f0822b34f703e6faf6b3a5edd902f8fc5;hpb=2b1cc58a7fee1afbc23897a7b3c81d6047cb3e7d;p=packages%2Fgnome-panel.git

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3185d50..78f798e 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,62 +1,70 @@
+#
+# Conditional build:
+%bcond_without	apidocs	# gtk-doc documentation rebuild
+#
 Summary:	The core programs for the GNOME GUI desktop environment
 Summary(pl.UTF-8):	Podstawowe programy środowiska graficznego GNOME
 Name:		gnome-panel
-Version:	2.28.0
-Release:	1
-License:	LGPL
+Version:	3.34.1
+Release:	2
+License:	LGPL v2+ (library), GPL v2+ (the rest)
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5:	9f0ea283d44bbcce67dc2e8a02fe9fad
-Patch0:		%{name}-no_launchers_on_panel.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=552049
-Patch1:		%{name}-use-sysconfig-timezone.patch
-URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.26.0
-BuildRequires:	NetworkManager-devel >= 0.6
-BuildRequires:	ORBit2-devel >= 1:2.14.9
-BuildRequires:	autoconf
-BuildRequires:	automake > 1:1.9
-BuildRequires:	dbus-devel >= 1.1.2
-BuildRequires:	dbus-glib-devel >= 0.74
-BuildRequires:	evolution-data-server-devel >= 2.24.0
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.19.7
-BuildRequires:	gnome-common >= 2.24.0
-BuildRequires:	gnome-desktop-devel >= 2.26.0
-BuildRequires:	gnome-doc-utils >= 0.14.0
-BuildRequires:	gnome-menus-devel >= 2.27.92
-BuildRequires:	gtk+2-devel >= 2:2.16.0
-BuildRequires:	gtk-doc >= 1.9
-BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libbonoboui-devel >= 2.24.0
-BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.24.0
-BuildRequires:	libgweather-devel >= 2.27.90
-BuildRequires:	librsvg-devel >= 2.22.0
-BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.26.0
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/3.34/%{name}-%{version}.tar.xz
+# Source0-md5:	cfd5d3fd548a2afdd8bd3bbdf9646bbd
+URL:		https://wiki.gnome.org/Projects/GnomePanel
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1:1.13
+BuildRequires:	cairo-devel >= 1.0.0
+BuildRequires:	dconf-devel >= 0.14.0
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	evolution-data-server-devel >= 3.33.2
+BuildRequires:	gdk-pixbuf2-devel >= 2.26.0
+BuildRequires:	gdm-devel >= 3
+BuildRequires:	gettext-tools >= 0.19.8
+BuildRequires:	glib2-devel >= 1:2.45.3
+BuildRequires:	gnome-desktop-devel >= 3.4.0
+BuildRequires:	gnome-menus-devel >= 3.8.0
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gtk+3-devel >= 3.22.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.25}
+BuildRequires:	libgweather-devel >= 3.28.0
+BuildRequires:	libtool >= 2:2.2.6
+BuildRequires:	libwnck-devel >= 3.4.6
+BuildRequires:	pango-devel >= 1:1.15.4
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig >= 1:0.15.0
-BuildRequires:	polkit-gnome-devel >= 0.93
+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
-BuildConflicts:	GConf-devel < 1.0.9-7
-Requires(post,postun):	gtk+2
-Requires(post,postun):	hicolor-icon-theme
-Requires(post,postun):	scrollkeeper
-Requires(post,preun):	GConf2
+BuildRequires:	systemd-devel >= 1:230
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXau-devel
+BuildRequires:	xorg-lib-libXrandr-devel >= 1.3.0
+BuildRequires:	xz
+BuildRequires:	yelp-tools
+Requires(post,postun):	glib2 >= 1:2.45.3
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gnome-desktop >= 2.26.0
-Requires:	gnome-icon-theme >= 2.26.0
+Requires:	dconf >= 0.14.0
+Requires:	gdk-pixbuf2 >= 2.26.0
+Requires:	gnome-desktop >= 3.4.0
+Requires:	gnome-icon-theme >= 3.0.0
+Requires:	gnome-menus >= 3.8.0
+Requires:	hicolor-icon-theme
+Requires:	libgweather >= 3.28.0
+Requires:	libwnck >= 3.4.6
+Requires:	pango >= 1:1.15.4
+Requires:	systemd-libs >= 1:230
 Requires:	tzdata >= 2008b-4
 Requires:	xdg-menus
-Suggests:	gnome-utils-screenshot
-Suggests:	gnome-utils-search-tool
+Requires:	xorg-lib-libXrandr >= 1.3.0
+Suggests:	evolution-data-server >= 3.33.2
+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
@@ -81,8 +89,9 @@ panelu GNOME2.
 Summary:	GNOME panel library
 Summary(pl.UTF-8):	Biblioteka panelu GNOME
 Group:		X11/Libraries
-Requires:	libgnomeui >= 2.24.0
-Requires:	librsvg >= 1:2.22.0
+Requires:	cairo >= 1.0.0
+Requires:	glib2 >= 1:2.45.3
+Requires:	gtk+3 >= 3.22.0
 
 %description libs
 GNOME panel library.
@@ -95,9 +104,8 @@ 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:	gtk+2-devel >= 2:2.16.0
-Requires:	libbonoboui-devel >= 2.24.0
-Requires:	libgnomeui-devel >= 2.24.0
+Requires:	glib2-devel >= 1:2.45.3
+Requires:	gtk+3-devel >= 3.22.0
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -105,23 +113,14 @@ Panel header files for creating GNOME panels.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek panelu GNOME.
 
-%package static
-Summary:	GNOME panel static libraries
-Summary(pl.UTF-8):	Statyczne biblioteki panelu GNOME
-Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Panel static libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki panelu GNOME.
-
 %package apidocs
 Summary:	panel-applet API documentation
 Summary(pl.UTF-8):	Dokumentacja API panel-applet
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 panel-applet API documentation.
@@ -131,81 +130,45 @@ Dokumentacja API panel-applet.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
-
-# 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
 %{__gtkdocize}
-%{__gnome_doc_prepare}
-%{__gnome_doc_common}
-%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-schemas-install \
+	--disable-silent-rules \
+	--disable-static \
 	--enable-eds \
-	--enable-gtk-doc \
+	%{?with_apidocs:--enable-gtk-doc} \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %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.la \
+	$RPM_BUILD_ROOT%{_libdir}/gnome-panel/modules/*.la
 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/la
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@ije,sr@ijekavian}
 
-%find_lang %{name} --with-gnome --with-omf --all-name
+%find_lang %{name} --with-gnome --all-name
 
 %clean
 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
-
-%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
@@ -213,53 +176,45 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS MAINTAINERS NEWS README *ChangeLog
-%attr(755,root,root) %{_bindir}/gnome-desktop-item-edit
+%doc AUTHORS NEWS README.md ChangeLog
 %attr(755,root,root) %{_bindir}/gnome-panel
-%attr(755,root,root) %{_bindir}/panel-test-applets
-%attr(755,root,root) %{_libexecdir}/clock-applet
-%attr(755,root,root) %{_libexecdir}/fish-applet-2
-%attr(755,root,root) %{_libexecdir}/gnome-clock-applet-mechanism
-%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/system-services/org.gnome.ClockApplet.Mechanism.service
-%{_datadir}/gnome-2.0/ui/*.xml
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/modules
+%attr(755,root,root) %{_libdir}/%{name}/modules/clock.so
+%attr(755,root,root) %{_libdir}/%{name}/modules/fish.so
+%attr(755,root,root) %{_libdir}/%{name}/modules/menu.so
+%attr(755,root,root) %{_libdir}/%{name}/modules/notification-area.so
+%attr(755,root,root) %{_libdir}/%{name}/modules/separator.so
+%attr(755,root,root) %{_libdir}/%{name}/modules/status-notifier.so
+%attr(755,root,root) %{_libdir}/%{name}/modules/wncklet.so
+%{_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.initial-settings.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.menu-button.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.object.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
 %{_datadir}/gnome-panel
-%{_datadir}/gnome-panelrc
-%{_datadir}/idl/gnome-panel-2.0
-%{_datadir}/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
 %{_desktopdir}/gnome-panel.desktop
-%{_iconsdir}/hicolor/*/apps/*
-%{_libdir}/bonobo/servers/*.server
-%{_mandir}/man1/*.1*
-%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
-%{_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
+%{_iconsdir}/hicolor/*x*/apps/gnome-panel*.png
+%{_iconsdir}/hicolor/scalable/apps/gnome-panel*.svg
+%{_mandir}/man1/gnome-panel.1*
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpanel-applet-2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpanel-applet-2.so.0
+%attr(755,root,root) %{_libdir}/libpanel-applet.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpanel-applet.so.3
 
 %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
-%defattr(644,root,root,755)
-%{_libdir}/libpanel-applet-2.a
+%attr(755,root,root) %{_libdir}/libpanel-applet.so
+%{_includedir}/gnome-panel
+%{_pkgconfigdir}/libpanel-applet.pc
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/panel-applet
+%{_gtkdocdir}/libpanel-applet