X-Git-Url: http://git.pld-linux.org/?p=packages%2Finkscape.git;a=blobdiff_plain;f=inkscape.spec;h=858c699614a200131f2608121851280ac45c0b46;hp=bcbddd90fcb7e86a2d0011d1fbd8c2e37931fdb4;hb=676fa0bbdd3a86d537cfb85ca19b4fb32a3927dc;hpb=34cd23703c6b9a3ffcb8fc2b4126baeedfdf329d

diff --git a/inkscape.spec b/inkscape.spec
index bcbddd9..858c699 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -3,55 +3,78 @@
 #
 # Conditional build
 %bcond_without	xft		# Don't use xft scalable font database
-%bcond_without	gnomeprint	# Don't use gnome print font database and spooler frontend
 %bcond_without	gnomevfs	# Don't use gnome vfs for loading files
 %bcond_without	mmx		# Force building without MMX optimazation (Default: auto-detect)
 %bcond_with	inkboard	# Enable inkboard support
 %bcond_with	relocation	# Enable binary relocation support
 #
+
+# just set it nil when non-preview arrives
+%define beta %{nil}
+
 Summary:	Scalable vector graphics editor
 Summary(pl.UTF-8):	Edytor skalowalnej grafiki wektorowej
 Name:		inkscape
-Version:	0.46
-Release:	1
-License:	GPL v2, LGPL v2.1
-Group:		Applications/Graphics
-Source0:	http://dl.sourceforge.net/inkscape/%{name}-%{version}.tar.gz
-# Source0-md5:	3bae9034047379012127e52f9b138d32
-Patch1:		%{name}-desktop.patch
+Version:	0.48.4
+Release:	11
+License:	GPL v2+, LGPL v2.1+
+Group:		X11/Applications/Graphics
+Source0:	http://downloads.sourceforge.net/inkscape/%{name}-%{version}%{beta}.tar.bz2
+# Source0-md5:	47bd8546e42ba396624eef9eb66b9b6c
+# workaround for https://bugs.launchpad.net/inkscape/+bug/487038
+Patch0:		%{name}-ldl.patch
+Patch1:		%{name}-0.48.2-types.patch
+Patch2:		%{name}-build.patch
+Patch3:		%{name}-poppler-0.26.patch
 URL:		http://www.inkscape.org/
+BuildRequires:	ImageMagick-c++-devel
+BuildRequires:	aspell-devel
 BuildRequires:	autoconf >= 2.59-3
 BuildRequires:	automake >= 1:1.9.4-2
-BuildRequires:	boost-any-devel
-BuildRequires:	boost-bind-devel
+BuildRequires:	boost-devel >= 1.36
+BuildRequires:	cairo-devel >= 1.8.0
 BuildRequires:	freetype-devel >= 2.0
-BuildRequires:	gcc-c++ >= 6:4.2.2-2
 BuildRequires:	gc-devel >= 6.4
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
+BuildRequires:	glibmm-devel >= 2.16.0
 %{?with_gnomevfs:BuildRequires:	gnome-vfs2-devel >= 2.15.2}
-BuildRequires:	gtk+2-devel >= 2:2.9.4
-BuildRequires:	gtkmm-devel >= 2.4
+BuildRequires:	gsl-devel
+BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	gtkmm-devel >= 2.10.0
 BuildRequires:	gtkspell-devel >= 2.0.11
 BuildRequires:	intltool >= 0.35.0
-BuildRequires:	lcms-devel >= 1.15
-BuildRequires:	libart_lgpl-devel >= 2.3.10
-%{?with_gnomeprint:BuildRequires:	libgnomeprintui-devel >= 2.12.1}
+BuildRequires:	lcms2-devel >= 2
+BuildRequires:	libgomp-devel
 BuildRequires:	libpng-devel >= 1.2
 BuildRequires:	libsigc++-devel >= 2.0.17
+BuildRequires:	libstdc++-devel >= 6:4.2.2-2
 BuildRequires:	libtool
+BuildRequires:	libwpd-devel >= 0.9
+BuildRequires:	libwpg-devel >= 0.2
 BuildRequires:	libxml2-devel >= 1:2.6.26
 BuildRequires:	libxslt-devel >= 1.1.17
 %{?with_inkboard:BuildRequires:	loudmouth-devel >= 1.0.3}
 BuildRequires:	pkgconfig
+BuildRequires:	poppler-glib-devel >= 0.20.0
 BuildRequires:	popt-devel
 BuildRequires:	rpm-pythonprov
+BuildRequires:	sed >= 4.0
 %{?with_xft:BuildRequires:	xorg-lib-libXft-devel}
 BuildRequires:	zlib-devel
-Requires(post,postun):	shared-mime-info
+Requires(post,postun):	desktop-file-utils
+Requires:	cairo >= 1.8.0
 Requires:	gc >= 6.4
+Requires:	glibmm >= 2.16.0
 %{?with_gnomevfs:Requires:	gnome-vfs2 >= 2.15.2}
-Requires:	gtk+2 >= 2:2.9.4
+Requires:	gtk+2 >= 2:2.14.0
+Requires:	gtkmm >= 2.24.0
+Requires:	gtkspell >= 2.0.11
+Requires:	libsigc++ >= 2.0.17
+Requires:	libxml2 >= 1:2.6.26
+Requires:	libxslt >= 1.1.17
 Requires:	perl-XML-XQL
+Requires:	poppler-glib >= 0.20.0
+Suggests:	python-lxml
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -65,10 +88,17 @@ Inkscape jest programem do przeglądania, tworzenia i edycji
 dwuwymiarowej grafiki wektorowej.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{beta}
+%patch0 -p1
 %patch1 -p1
-rm -f po/en_US@piglatin.po
-sed -i -e 's|en_US@piglatin||' configure.ac
+%patch2 -p1
+%patch3 -p0
+
+%{__rm} po/en_US@piglatin.po
+%{__sed} -i -e 's|en_US@piglatin||' configure.ac
+
+mv po/te_IN.po po/te.po
+%{__sed} -i -e 's|te_IN|te|' configure.ac
 
 %build
 %{__libtoolize}
@@ -79,14 +109,12 @@ sed -i -e 's|en_US@piglatin||' configure.ac
 %{__automake}
 %{__autoconf}
 %configure \
+	--disable-silent-rules \
 	%{!?with_xft: --without-xft} \
-	%{!?with_gnomeprint:--without-gnome-print} \
-	%{?with_gnomeprint:--with-gnome-print} \
 	%{!?with_gnomevfs:--without-gnome-vfs} \
 	%{!?with_mmx:--disable-mmx} \
 	%{?with_relocation:--enable-binreloc} \
-	%{?with_inkboard:--enable-inkboard} \
-	--disable-static
+	%{?with_inkboard:--enable-inkboard}
 
 %{__make}
 
@@ -96,8 +124,6 @@ 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
@@ -105,34 +131,36 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-umask 022
-update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
+%update_desktop_database_post
 
 %postun
-umask 022
-update-mime-database %{_datadir}/mime >/dev/null 2>&1
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
+%update_desktop_database_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog HACKING.txt NEWS README TRANSLATORS
+%doc AUTHORS ChangeLog NEWS README TRANSLATORS doc/HACKING.txt
 %lang(ca) %doc README.ca.txt
 %lang(de) %doc README.de.txt
 %lang(es) %doc README.es.txt
 %lang(fr) %doc README.fr.txt
 %lang(it) %doc README.it.txt
-%lang(de) %doc HACKING.de.txt
-%lang(fr) %doc HACKING.fr.txt
-%lang(it) %doc HACKING.it.txt
-%attr(755,root,root) %{_bindir}/*
+%lang(pt_BR) %doc README.it.txt
+%lang(sk) %doc README.it.txt
+%lang(sr) %doc README.it.txt
+%lang(de) %doc doc/HACKING.de.txt
+%lang(fr) %doc doc/HACKING.fr.txt
+%lang(it) %doc doc/HACKING.it.txt
+%lang(pt_BR) %doc doc/HACKING.it.txt
+%attr(755,root,root) %{_bindir}/inkscape
+%attr(755,root,root) %{_bindir}/inkview
 %dir %{_datadir}/inkscape
 %{_datadir}/inkscape/[!e]*
 %{_datadir}/inkscape/examples
 %dir %{_datadir}/inkscape/extensions
-%{_datadir}/inkscape/extensions/*.cmd
+%{_datadir}/inkscape/extensions/Poly3DObjects/
+%{_datadir}/inkscape/extensions/alphabet_soup/
 %{_datadir}/inkscape/extensions/*.inx
-%{_datadir}/inkscape/extensions/*.txt
+%{_datadir}/inkscape/extensions/*.js
 %{_datadir}/inkscape/extensions/*.xml
 %{_datadir}/inkscape/extensions/*.xsl
 %{_datadir}/inkscape/extensions/*.xslt
@@ -145,7 +173,11 @@ update-mime-database %{_datadir}/mime >/dev/null 2>&1
 %attr(755,root,root) %{_datadir}/inkscape/extensions/Barcode/*.py
 %dir %{_datadir}/inkscape/extensions/xaml2svg
 %{_datadir}/inkscape/extensions/xaml2svg/*.xsl
-%{_mandir}/man1/*
-%lang(fr) %{_mandir}/fr/man1/*
-%{_pixmapsdir}/*.png
-%{_desktopdir}/*.desktop
+%{_mandir}/man1/*.1*
+%lang(el) %{_mandir}/el/man1/*.1*
+%lang(fr) %{_mandir}/fr/man1/*.1*
+%lang(ja) %{_mandir}/ja/man1/*.1*
+%lang(sk) %{_mandir}/sk/man1/*.1*
+%lang(zh_TW) %{_mandir}/zh_TW/man1/*.1*
+%{_iconsdir}/hicolor/*/apps/inkscape.png
+%{_desktopdir}/inkscape.desktop