X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=inkscape.spec;h=cdedfded16001f1563552cffae230565dc3c1e09;hb=dab787ec65b6a70d8fef990c31b41aae60385d2b;hp=c8b1a9d460ab92079d81a86c8a5ca72d52746970;hpb=48ae4e95fbbd4bbb74f82ef4060d7172aa69d1f5;p=packages%2Finkscape.git

diff --git a/inkscape.spec b/inkscape.spec
index c8b1a9d..cdedfde 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -8,13 +8,13 @@
 Summary:	Scalable vector graphics editor
 Summary(pl.UTF-8):	Edytor skalowalnej grafiki wektorowej
 Name:		inkscape
-Version:	1.0
-Release:	2
+Version:	1.1.2
+Release:	1
 License:	GPL v2+, LGPL v2.1+
 Group:		X11/Applications/Graphics
 # download: follow https://inkscape.org/release/
 Source0:	https://media.inkscape.org/dl/resources/file/%{name}-%{version}.tar.xz
-# Source0-md5:	e5f1ee6b32ac0a94bdd5d99190e7bb9e
+# Source0-md5:	a486807ffdf89a1d7ce9425dd60555ec
 URL:		https://inkscape.org/
 %{!?with_imagick:BuildRequires:	GraphicsMagick-c++-devel}
 %{?with_imagick:BuildRequires:	ImageMagick6-c++-devel < 7}
@@ -47,8 +47,8 @@ BuildRequires:	libgomp-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 1.2
 BuildRequires:	librevenge-devel
-BuildRequires:	libsoup-devel >= 2.42
 BuildRequires:	libsigc++-devel >= 2.0.17
+BuildRequires:	libsoup-devel >= 2.42
 BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libvisio-devel >= 0.1
 BuildRequires:	libwpd-devel >= 0.9
@@ -61,6 +61,7 @@ BuildRequires:	poppler-glib-devel >= 0.29.0
 BuildRequires:	popt-devel
 BuildRequires:	potrace-devel
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	zlib-devel
@@ -90,14 +91,27 @@ vector drawings.
 Inkscape jest programem do przeglądania, tworzenia i edycji
 dwuwymiarowej grafiki wektorowej.
 
+%package -n bash-completion-inkscape
+Summary:	Bash completion for inkscape arguments
+Summary(pl.UTF-8):	Bashowe dopełnianie argumentów programu inkscape
+Group:		Applications/Shells
+Requires:	%{name} = %{version}-%{release}
+Requires:	bash-completion >= 2.0
+BuildArch:	noarch
+
+%description -n bash-completion-inkscape
+Bash completion for inkscape arguments.
+
+%description -n bash-completion-inkscape -l pl.UTF-8
+Bashowe dopełnianie argumentów programu inkscape.
+
 %prep
-%setup -q -n %{name}-%{version}_2020-05-01_4035a4fb49
+%setup -q -n %{name}-%{version}_2022-02-04_0a00cf5339
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
       CMakeScripts/cmake_consistency_check.py \
       buildtools/msys2checkdeps.py \
       packaging/scripts/lp-mark-bugs-released \
-      packaging/wix/*.py \
       share/extensions/*.py \
       share/extensions/*/*.py \
       share/*/i18n.py
@@ -124,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# TODO: use external 2geom package
+%{__rm} -r $RPM_BUILD_ROOT{%{_includedir}/2geom-1.1.0,%{_libdir}/cmake/2Geom,%{_libdir}/lib2geom.a,%{_pkgconfigdir}/2geom.pc}
+
 # unify locale name, overwrite outdated bn
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{bn_BD,bn}/LC_MESSAGES/inkscape.mo
 # unify names
@@ -133,6 +150,8 @@ rm -rf $RPM_BUILD_ROOT
 # unsupported variants
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{kok@latin,mni@beng,sat@deva}
 
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/inkscape/extensions/{.pylintrc,LICENSE.txt,MANIFEST.in,README.md,TESTING.md,doxygen-main.dox,setup.cfg,setup.py,tox.ini}
+
 %find_lang %{name}
 
 %clean
@@ -163,6 +182,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/inkscape/extensions/xaml2svg
 %attr(755,root,root) %{_datadir}/inkscape/extensions/*.py
 %attr(755,root,root) %{_datadir}/inkscape/extensions/*.sh
+%{_datadir}/inkscape/extensions/dxf14_*.txt
 %{_datadir}/inkscape/extensions/*.inx
 %{_datadir}/inkscape/extensions/*.js
 %{_datadir}/inkscape/extensions/*.svg
@@ -170,10 +190,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/inkscape/extensions/*.xsl
 %{_datadir}/inkscape/extensions/*.xslt
 %{_datadir}/inkscape/extensions/fontfix.conf
-%{_datadir}/inkscape/extensions/setup.cfg
 %{_datadir}/inkscape/extensions/inkscape.extension.rng
 %{_datadir}/metainfo/org.inkscape.Inkscape.appdata.xml
 %{_iconsdir}/hicolor/*/apps/org.inkscape.Inkscape.png
+%{_iconsdir}/hicolor/scalable/apps/org.inkscape.Inkscape.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.inkscape.Inkscape-symbolic.svg
 %{_desktopdir}/org.inkscape.Inkscape.desktop
 %{_mandir}/man1/inkscape.1*
 %{_mandir}/man1/inkview.1*
@@ -181,9 +202,15 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_mandir}/fr/man1/inkscape.1*
 %lang(hr) %{_mandir}/hr/man1/inkscape.1*
 %lang(hu) %{_mandir}/hu/man1/inkscape.1*
+%lang(zh_TW) %{_mandir}/zh_TW/man1/inkscape.1*
 %lang(de) %{_mandir}/de/man1/inkview.1*
 %lang(es) %{_mandir}/es/man1/inkview.1*
 %lang(fr) %{_mandir}/fr/man1/inkview.1*
 %lang(hr) %{_mandir}/hr/man1/inkview.1*
 %lang(hu) %{_mandir}/hu/man1/inkview.1*
 %lang(pt_BR) %{_mandir}/pt_BR/man1/inkview.1*
+%lang(zh_TW) %{_mandir}/zh_TW/man1/inkview.1*
+
+%files -n bash-completion-inkscape
+%defattr(644,root,root,755)
+%{bash_compdir}/inkscape