+#
+# 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: 3.0.2
-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/3.0/%{name}-%{version}.tar.bz2
-# Source0-md5: 0f2f644dc4081b72f6df7a65282af7c6
-# http://bugzilla.gnome.org/show_bug.cgi?id=552049
-Patch0: %{name}-use-sysconfig-timezone.patch
-Patch1: %{name}-link.patch
-URL: http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.26.0
-BuildRequires: NetworkManager-devel >= 0.6
-BuildRequires: autoconf
-BuildRequires: automake >= 1:1.9
-BuildRequires: dbus-devel >= 1.1.2
-BuildRequires: dbus-glib-devel >= 0.80
-BuildRequires: dconf-devel
+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.0.0
-BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.28.0
-BuildRequires: gnome-common >= 2.24.0
-BuildRequires: gnome-desktop-devel >= 3.0.0
-BuildRequires: gnome-doc-utils >= 0.14.0
-BuildRequires: gnome-menus-devel >= 3.0.0
+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.0.0
-BuildRequires: gtk-doc >= 1.9
-BuildRequires: intltool >= 0.40.0
-BuildRequires: libgweather-devel >= 3.0.0
-BuildRequires: librsvg-devel >= 2.22.0
-BuildRequires: libtool
-BuildRequires: libwnck-devel >= 3.0.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-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: telepathy-glib-devel >= 0.14.0
-BuildRequires: xorg-lib-libSM-devel
-BuildConflicts: GConf-devel < 1.0.9-7
+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(post,postun): scrollkeeper
-Requires(post,preun): GConf2
Requires: %{name}-libs = %{version}-%{release}
-Requires: gnome-desktop >= 3.0.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
Summary: GNOME panel library
Summary(pl.UTF-8): Biblioteka panelu GNOME
Group: X11/Libraries
-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.
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.28.0
-Requires: gtk+3-devel >= 3.0.0
+Requires: glib2-devel >= 1:2.45.3
+Requires: gtk+3-devel >= 3.22.0
%description devel
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.
%prep
%setup -q
-%patch0 -p0
-%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
%{__gtkdocize}
-%{__gnome_doc_prepare}
-%{__gnome_doc_common}
-%{__intltoolize}
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
- --disable-schemas-install \
- --disable-schemas-compile \
--disable-silent-rules \
+ --disable-static \
--enable-eds \
- --enable-gtk-doc \
+ %{?with_apidocs:--enable-gtk-doc} \
--with-html-dir=%{_gtkdocdir}
%{__make}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+ DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpanel-applet.la \
+ $RPM_BUILD_ROOT%{_libdir}/gnome-panel/modules/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-4.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
%glib_compile_schemas
%update_icon_cache hicolor
-%preun
-%gconf_schema_uninstall clock.schemas
-
%postun
-%scrollkeeper_update_postun
%glib_compile_schemas
%update_icon_cache hicolor
%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
-%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}/gnome-panel
-%{_desktopdir}/gnome-panel.desktop
-%{_iconsdir}/hicolor/*/apps/*
-%{_mandir}/man1/*.1*
-%{_sysconfdir}/gconf/schemas/clock.schemas
+%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.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
+%{_desktopdir}/gnome-panel.desktop
+%{_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-4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpanel-applet-4.so.0
-%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
+%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-4.so
-%{_includedir}/gnome-panel-4.0
-%{_pkgconfigdir}/libpanelapplet-4.0.pc
-%{_datadir}/gir-1.0/PanelApplet-4.0.gir
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libpanel-applet-4.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-4.0
+%{_gtkdocdir}/libpanel-applet