[packages/mate-calc] - updated to 1.6.0, pl, completed dependencies

[qboosh]

commit 6c7d9dee04878e6c0d6ed7a84bc47b686d9a50dd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Dec 23 17:20:35 2013 +0100

    - updated to 1.6.0, pl, completed dependencies

 mate-calc.spec | 54 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 15 deletions(-)
---
diff --git a/mate-calc.spec b/mate-calc.spec
index 32d2d97..8965fb2 100644
--- a/mate-calc.spec
+++ b/mate-calc.spec
@@ -1,37 +1,61 @@
+#
+# Conditional build:
+%bcond_with	gtk3	# use GTK+ 3.x instead of 2.x
+#
 Summary:	MATE Desktop calculator
+Summary(pl.UTF-8):	Kalkulator dla środowiska MATE Desktop
 Name:		mate-calc
-Version:	1.5.2
+Version:	1.6.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
-# Source0-md5:	7ad3813ecee2a67ad05702f5f176b05e
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
+# Source0-md5:	4672e85b045e5ace0a7e70fd0b8eb384
 URL:		http://mate-desktop.org/
+BuildRequires:	autoconf >= 2.53
+BuildRequires:	automake >= 1:1.7
 BuildRequires:	bison
 BuildRequires:	desktop-file-utils
 BuildRequires:	flex
 BuildRequires:	glib2-devel >= 1:2.30
-BuildRequires:	gtk+2-devel
-BuildRequires:	libxml2-devel
+%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.18.0}
+%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0.0}
+BuildRequires:	intltool >= 0.35.0
+BuildRequires:	libtool >= 1:1.4.3
+BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	mate-common
-BuildRequires:	mate-desktop-devel
-BuildRequires:	mate-doc-utils
-Requires:	glib2 >= 1:2.26.0
+BuildRequires:	pkgconfig
+Requires:	glib2 >= 1:2.30
+%{!?with_gtk3:Requires:	gtk+2 >= 2:2.18.0}
+%{?with_gtk3:Requires:	gtk+3 >= 3.0.0}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 mate-calc is a powerful graphical calculator with financial, logical
 and scientific modes. It uses a multiple precision package to do its
-arithmetic to give a high degree of accuracy.
+arithmetic to give a high degree of accuracy. mate-calc is a fork of
+gnome-calc.
+
+%description -l pl.UTF-8
+mate-calc to graficzny kalkulator o bogatych możliwościach, z trybami
+finansowym, logicznym i naukowym. Wykorzystuje pakiet wielokrotnej
+precyzji w celu zapewnienia arytmentyki o dużym stopniu dokładności.
+mate-calc jest odgałęzieniem programu gnome-calc.
 
 %prep
 %setup -q
 
 %build
-NOCONFIGURE=1 ./autogen.sh
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
+	--disable-schemas-compile \
 	--disable-silent-rules \
-	--disable-schemas-compile
+	%{?with_gtk3:--with-gtk=3.0}
 %{__make}
 
 %install
@@ -44,7 +68,7 @@ desktop-file-install \
 	--add-category="X-Mate" \
 	--delete-original \
 	--dir=$RPM_BUILD_ROOT%{_desktopdir} \
-$RPM_BUILD_ROOT%{_desktopdir}/*.desktop
+	$RPM_BUILD_ROOT%{_desktopdir}/*.desktop
 
 %find_lang %{name}
 
@@ -59,12 +83,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING README
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/mate-calc
 %attr(755,root,root) %{_bindir}/mate-calc-cmd
 %attr(755,root,root) %{_bindir}/mate-calculator
-%{_mandir}/man1/mate-calc-cmd.1*
 %{_mandir}/man1/mate-calc.1*
-%{_desktopdir}/mate-calc.desktop
+%{_mandir}/man1/mate-calc-cmd.1*
 %{_datadir}/glib-2.0/schemas/org.mate.calc.gschema.xml
 %{_datadir}/mate-calc
+%{_desktopdir}/mate-calc.desktop
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-calc.git/commitdiff/6c7d9dee04878e6c0d6ed7a84bc47b686d9a50dd