X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=inkscape.spec;h=703c0f5dabe06d96217fa64a84e411d626b25207;hb=bcfbc5d69597414097ac1808851acfe9e83d2137;hp=ee672dc0e0d5754f8ff2be5cfe19bdb45b1d2873;hpb=9c82b1951bb7c06e6913c0825003fa96ace256b0;p=packages%2Finkscape.git

diff --git a/inkscape.spec b/inkscape.spec
index ee672dc..703c0f5 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -13,19 +13,20 @@ Summary:	Scalable vector graphics editor
 Summary(pl.UTF-8):	Edytor skalowalnej grafiki wektorowej
 Name:		inkscape
 Version:	0.45.1
-Release:	1
+Release:	5
 License:	GPL v2, LGPL v2.1
 Group:		Applications/Graphics
 Source0:	http://dl.sourceforge.net/inkscape/%{name}-%{version}.tar.gz
 # Source0-md5:	1ac63dfd5d78a676599bf5cf6d22e493
 Patch0:		%{name}-ac.patch
+Patch1:		%{name}-desktop.patch
 URL:		http://www.inkscape.org/
 BuildRequires:	autoconf >= 2.59-3
 BuildRequires:	automake >= 1:1.9.4-2
 BuildRequires:	boost-any-devel
 BuildRequires:	boost-bind-devel
 BuildRequires:	freetype-devel >= 2.0
-BuildRequires:	gcc-c++ >= 3.0
+BuildRequires:	gcc-c++ >= 6:4.2.2-2
 BuildRequires:	gc-devel >= 6.4
 BuildRequires:	gettext-devel
 %{?with_gnomevfs:BuildRequires:	gnome-vfs2-devel >= 2.15.2}
@@ -52,7 +53,9 @@ Requires:	gc >= 6.4
 %{?with_gnomevfs:Requires:	gnome-vfs2 >= 2.15.2}
 Requires:	gtk+2 >= 2:2.9.4
 Requires:	perl-XML-XQL
-Buildroot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Inkscape is a program for viewing, making, and editing two-dimensional
@@ -65,6 +68,7 @@ dwuwymiarowej grafiki wektorowej.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 rm -f po/en_US@piglatin.po
 sed -i -e 's|en_US@piglatin||' configure.ac
 
@@ -94,6 +98,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name}
 
 %clean