X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmate-utils.git;a=blobdiff_plain;f=mate-utils.spec;h=8972851013a23a5ed0a51b366e0083c9c4c9c55f;hp=f642e0b3cd291a34eedfecce4e3dc23971c9d247;hb=cfb3510;hpb=855cd23f57e402e7cda50793e85a0076582a4119

diff --git a/mate-utils.spec b/mate-utils.spec
index f642e0b..8972851 100644
--- a/mate-utils.spec
+++ b/mate-utils.spec
@@ -1,40 +1,42 @@
 Summary:	MATE utility programs
 Summary(pl.UTF-8):	Programy użytkowe dla środowiska MATE
 Name:		mate-utils
-Version:	1.6.0
-Release:	2
+Version:	1.18.0
+Release:	1
 License:	LGPL v2+ (libmatedict), GPL v2+ (programs), FDL (documentation)
 Group:		X11/Applications/Multimedia
-Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
-# Source0-md5:	47e832003c4c56854b3c6c79ae4400b9
+Source0:	http://pub.mate-desktop.org/releases/1.18/%{name}-%{version}.tar.xz
+# Source0-md5:	0ba5c416e59338f633ac3a7d092823bd
 URL:		https://github.com/mate-desktop/mate-utils
 BuildRequires:	autoconf >= 2.53
-BuildRequires:	automake >= 1:1.9
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	glib2-devel >= 1:2.26.0
-BuildRequires:	gtk+2-devel >= 2:2.20.0
+BuildRequires:	glib2-devel >= 1:2.36.0
+BuildRequires:	gtk+3-devel >= 3.14
 BuildRequires:	gtk-doc >= 1.10
-BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libcanberra-gtk-devel >= 0.4
+BuildRequires:	intltool >= 0.50.1
+BuildRequires:	libcanberra-gtk3-devel >= 0.4
 BuildRequires:	libgtop-devel >= 1:2.12.0
 BuildRequires:	libtool >= 1:1.4.3
 BuildRequires:	mate-common
-BuildRequires:	mate-doc-utils
-BuildRequires:	mate-panel-devel >= 1.5.0
-BuildRequires:	rarian-compat
+BuildRequires:	mate-panel-devel >= 1.17.0
 BuildRequires:	rpmbuild(find_lang) >= 1.36
 BuildRequires:	tar >= 1:1.22
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xz
+BuildRequires:	yelp-tools
 BuildRequires:	zlib-devel
 Requires(post,postun):	desktop-file-utils
-Requires(post,postun):	glib2 >= 1:2.26.0
+Requires(post,postun):	glib2 >= 1:2.36.0
 Requires(post,postun):	gtk-update-icon-cache
-Requires:	glib2 >= 1:2.26.0
-Requires:	gtk+2 >= 2:2.20.0
-Requires:	libcanberra-gtk >= 0.4
+Requires:	glib2 >= 1:2.36.0
+Requires:	gtk+3 >= 3.14
+Requires:	hicolor-icon-theme
+Requires:	libcanberra-gtk3 >= 0.4
+Requires:	libgtop >= 1:2.12.0
 Requires:	libmatedict = %{version}-%{release}
-Requires:	mate-icon-theme
-Requires:	mate-panel >= 1.5.0
+Requires:	mate-panel >= 1.17.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir	%{_libdir}/mate-panel
@@ -50,8 +52,8 @@ Summary:	MATE Dictionary Protocol client library
 Summary(pl.UTF-8):	Biblioteka kliencka protokołu słownika MATE
 License:	LGPL v2+
 Group:		X11/Libraries
-Requires:	glib2 >= 1:2.20.0
-Requires:	gtk+2 >= 2:2.20.0
+Requires:	glib2 >= 1:2.36.0
+Requires:	gtk+3 >= 3.14
 
 %description -n libmatedict
 MATE Dictionary Protocol client library.
@@ -64,9 +66,9 @@ Summary:	Header files for libmatedict library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libmatedict
 License:	LGPL v2+
 Group:		X11/Development/Libraries
+Requires:	glib2-devel >= 1:2.36.0
+Requires:	gtk+3 >= 3.14
 Requires:	libmatedict = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.20.0
-Requires:	gtk+2-devel >= 2:2.20.0
 
 %description -n libmatedict-devel
 Header files for libmatedict library.
@@ -78,6 +80,9 @@ Pliki nagłówkowe biblioteki libmatedict.
 Summary:	API documentation for libmatedict library
 Summary(pl.UTF-8):	Dokumentacja API biblioteki libmatedict
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n libmatedict-apidocs
 API documentation for libmatedict library.
@@ -85,11 +90,24 @@ API documentation for libmatedict library.
 %description -n libmatedict-apidocs -l pl.UTF-8
 Dokumentacja API biblioteki libmatedict.
 
+%package -n mate-screenshot
+Summary:	Screenshot utility
+Summary(pl.UTF-8):	Narzędzie do robienia zrzutów ekranu
+Group:		X11/Applications
+Requires(post,postun):	glib2 >= 1:2.36.0
+Requires:	glib2 >= 1:2.36.0
+Conflicts:	mate-utils < 1.8.0-2.1
+
+%description -n mate-screenshot
+This utility allows to make a desktop screenshot.
+
+%description -n mate-screenshot -l pl.UTF-8
+To narzędzie pozwala na zrobienie zrzutu ekranu biurka.
+
 %prep
 %setup -q
 
 %build
-mate-doc-prepare --copy --force
 %{__gtkdocize}
 %{__intltoolize}
 %{__libtoolize}
@@ -99,12 +117,11 @@ mate-doc-prepare --copy --force
 %{__automake}
 %configure \
 	--enable-gtk-doc \
+	--disable-silent-rules \
 	--disable-static \
 	--with-html-dir=%{_gtkdocdir}
 
-# this package uses shave, not AM_SILENT_RULES, thus only V=1 works
-%{__make} -j1 \
-	V=1
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -113,60 +130,66 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libmatedict.la
 
-# mate < 1.5 did not exist in pld, avoid dependency on mate-conf
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/mate-*.convert
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{frp,jv,ku_IQ,pms}
 
-# mate-utils gettext domain, mate-{dictionary,disk-usage,analyzer,search-tool,system-log} mate,omf dirs
-%find_lang %{name} --with-mate --with-omf --all-name
+# mate-utils gettext domain, mate-{dictionary,disk-usage,analyzer,search-tool,system-log} mate dirs
+%find_lang %{name} --with-mate --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_desktop_database
-%update_icon_cache mate
+%update_icon_cache hicolor
 %glib_compile_schemas
 
 %postun
 %update_desktop_database
-%update_icon_cache mate
+%update_icon_cache hicolor
 %glib_compile_schemas
 
 %post	-n libmatedict -p /sbin/ldconfig
 %postun	-n libmatedict -p /sbin/ldconfig
 
+%post	-n mate-screenshot
+%update_desktop_database
+%glib_compile_schemas
+
+%postun	-n mate-screenshot
+%update_desktop_database
+%glib_compile_schemas
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/mate-dictionary
 %attr(755,root,root) %{_bindir}/mate-disk-usage-analyzer
-%attr(755,root,root) %{_bindir}/mate-screenshot
 %attr(755,root,root) %{_bindir}/mate-search-tool
 %attr(755,root,root) %{_bindir}/mate-system-log
-%attr(755,root,root) %{_bindir}/mate-panel-screenshot
 %attr(755,root,root) %{_libexecdir}/mate-dictionary-applet
+%{_datadir}/appdata/mate-dictionary.appdata.xml
+%{_datadir}/appdata/mate-disk-usage-analyzer.appdata.xml
+%{_datadir}/appdata/mate-search-tool.appdata.xml
 %{_datadir}/dbus-1/services/org.mate.panel.applet.DictionaryAppletFactory.service
 %{_datadir}/glib-2.0/schemas/org.mate.dictionary.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.mate.disk-usage-analyzer.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.mate.screenshot.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.mate.search-tool.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.mate.system-log.gschema.xml
 %{_datadir}/mate-dict
 %{_datadir}/mate-dictionary
 %{_datadir}/mate-disk-usage-analyzer
 %{_datadir}/mate-panel/applets/org.mate.DictionaryApplet.mate-panel-applet
-%{_datadir}/mate-screenshot
 %{_datadir}/mate-utils
 %{_desktopdir}/mate-dictionary.desktop
 %{_desktopdir}/mate-disk-usage-analyzer.desktop
-%{_desktopdir}/mate-screenshot.desktop
 %{_desktopdir}/mate-search-tool.desktop
 %{_desktopdir}/mate-system-log.desktop
-%{_iconsdir}/mate/*/apps/baobab.*
+%{_iconsdir}/hicolor/*/apps/mate-disk-usage-analyzer.*
+%{_iconsdir}/hicolor/*/apps/mate-system-log.png
+%{_iconsdir}/hicolor/scalable/apps/mate-system-log-symbolic.svg
 %{_pixmapsdir}/mate-search-tool
 %{_mandir}/man1/mate-dictionary.1*
 %{_mandir}/man1/mate-disk-usage-analyzer.1*
-%{_mandir}/man1/mate-screenshot.1*
 %{_mandir}/man1/mate-search-tool.1*
 %{_mandir}/man1/mate-system-log.1*
 
@@ -184,3 +207,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libmatedict-apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/mate-dict
+
+%files -n mate-screenshot
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/mate-panel-screenshot
+%attr(755,root,root) %{_bindir}/mate-screenshot
+%{_datadir}/appdata/mate-screenshot.appdata.xml
+%{_datadir}/glib-2.0/schemas/org.mate.screenshot.gschema.xml
+%{_datadir}/mate-screenshot
+%{_desktopdir}/mate-screenshot.desktop
+%{_mandir}/man1/mate-panel-screenshot.1*
+%{_mandir}/man1/mate-screenshot.1*