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

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 41f7819..78f798e 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,37 +1,35 @@
+#
+# 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.6.2
-Release:	1
+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.6/%{name}-%{version}.tar.xz
-# Source0-md5:	f394ad73babbce95fd0bb65ec6fd3519
-URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.26.0
-BuildRequires:	NetworkManager-devel >= 0.6
+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.11
+BuildRequires:	automake >= 1:1.13
 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:	evolution-data-server-devel >= 3.33.2
 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:	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.2.0
+BuildRequires:	gnome-menus-devel >= 3.8.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:	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.0.0
+BuildRequires:	libwnck-devel >= 3.4.6
 BuildRequires:	pango-devel >= 1:1.15.4
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig >= 1:0.15.0
@@ -40,37 +38,33 @@ BuildRequires:	rpm-build >= 4.1-10
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	systemd-devel >= 1:230
 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:	xorg-lib-libXrandr-devel >= 1.3.0
 BuildRequires:	xz
 BuildRequires:	yelp-tools
-BuildConflicts:	GConf-devel < 1.0.9-7
-Requires(post,postun):	glib2 >= 1:2.32.0
+Requires(post,postun):	glib2 >= 1:2.45.3
 Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-libs = %{version}-%{release}
 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:	gnome-menus >= 3.8.0
 Requires:	hicolor-icon-theme
-Requires:	libgweather >= 3.6.0
+Requires:	libgweather >= 3.28.0
+Requires:	libwnck >= 3.4.6
 Requires:	pango >= 1:1.15.4
-Requires:	telepathy-glib >= 0.14.0
+Requires:	systemd-libs >= 1:230
 Requires:	tzdata >= 2008b-4
 Requires:	xdg-menus
-Requires:	xorg-lib-libXrandr >= 1.2.0
+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
@@ -95,11 +89,9 @@ panelu GNOME2.
 Summary:	GNOME panel library
 Summary(pl.UTF-8):	Biblioteka panelu GNOME
 Group:		X11/Libraries
-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
+Requires:	glib2 >= 1:2.45.3
+Requires:	gtk+3 >= 3.22.0
 
 %description libs
 GNOME panel library.
@@ -112,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:	GConf2-devel >= 2.26.0
-Requires:	glib2-devel >= 1:2.32.0
-Requires:	gtk+3-devel >= 3.4.0
+Requires:	glib2-devel >= 1:2.45.3
+Requires:	gtk+3-devel >= 3.22.0
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -127,6 +118,9 @@ 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.
@@ -137,13 +131,8 @@ Dokumentacja API panel-applet.
 %prep
 %setup -q
 
-# 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}
-%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -153,7 +142,7 @@ find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst)
 	--disable-silent-rules \
 	--disable-static \
 	--enable-eds \
-	--enable-gtk-doc \
+	%{?with_apidocs:--enable-gtk-doc} \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -164,9 +153,10 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-4.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpanel-applet.la \
+	$RPM_BUILD_ROOT%{_libdir}/gnome-panel/modules/*.la
 
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{sr@ije,sr@ijekavian}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@ije,sr@ijekavian}
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -186,47 +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
-%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
+%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/*/apps/gnome-panel*.*
+%{_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
+%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