Accepting request 106918 from GNOME:Apps

Update to 0.48.3.1 (forwarded request 106840 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/106918
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=57

inkscape-0.48.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:223a42ba6e3644bb2956c485ca0c210edc14e90fa882cdc57c1bb9f35b8f6783
-size 19583331

inkscape-0.48.3.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:073bf585b6a708747485f2de1f5a1b77c3f45a79e6ee128bf946bae99476db88
+size 19688778

inkscape.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Fri Feb 24 14:08:44 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 0.48.3.1:
+  + Bug fixes.
+- Changes from version 0.48.3:
+  + Regression fixes:
+    - Pre-0.46 grids are now correctly imported (lp#221040)
+  + Important bugfixes:
+    - Clipped and masked objects are selected correctly (lp#365458)
+    - The units feet and picas are now correctly handled for grids
+      (lp#885500)
+    - The grid origin is moved when resizing the page (e.g. when
+      clicking clicking "Fit page to selection") (lp#240689)
+    - The emphasized grid lines of the axonometric grid now move
+      properly according to the origin of the grid.
+  + Other bugs fixed: lp#167419, lp#168417, lp#168942, lp#184341,
+    lp#239430, lp#298528, lp#340123, lp#341866, lp#386237,
+    lp#403421, lp#407394, lp#408566, lp#479644, lp#487144,
+    lp#494722, lp#496793, lp#602005, lp#612882, lp#623660,
+    lp#663667, lp#668895, lp#681262, lp#693010, lp#721424,
+    lp#721448, lp#725063, lp#786667, lp#788560, lp#789122,
+    lp#791709, lp#805095, lp#810503, lp#812413, lp#812497,
+    lp#819209, lp#821435, lp#824221, lp#829947, lp#834721,
+    lp#837603, lp#837799, lp#845354, lp#858369, lp#869019,
+    lp#884368, lp#885324, lp#887539, lp#888793, lp#889172,
+    lp#898538, lp#900854, lp#902054, lp#907157, lp#909783,
+    lp#909958, lp#910463, lp#910467, lp#910479, lp#911079,
+    lp#911123, lp#915329, lp#917544, lp#919728, lp#923241,
+    lp#933831.
+  + Updated translations.
+- Change liblcms-devel BuildRequires to liblcms2-devel, to build
+  against lcms2.
+- Drop inkscape-glib-2.31.patch: fixed upstream.
+- Add some automatic detection of localized man pages in %install,
+  so that we don't have to list all new translations manually.
+
 -------------------------------------------------------------------
 Mon Feb 13 10:47:52 UTC 2012 - coolo@suse.com
 

inkscape.spec

@@ -17,13 +17,13 @@
 
 
 Name:           inkscape
-Version:        0.48.2
+Version:        0.48.3.1
 Release:        0
 Summary:        Vector Illustration Program
 License:        GPL-2.0 ; LGPL-2.1
 Group:          Productivity/Graphics/Vector Editors
 Url:            http://www.inkscape.org/
-Source:         %{name}-%{version}.tar.bz2
+Source:         http://downloads.sourceforge.net/project/inkscape/inkscape/0.48.3.1/%{name}-%{version}.tar.bz2
 # openSUSE palette file
 Source1:        openSUSE.gpl
 Source2:        inkscape-split-extensions-extra.sh
@@ -31,8 +31,6 @@ Source2:        inkscape-split-extensions-extra.sh
 Patch0:         inkscape-remove-datetime.patch
 # PATCH-FIX-OPENSUSE inkscape-packages.patch sbrabec@suse.cz -- Suggest packages instead of compilation from source.
 Patch1:         inkscape-packages.patch
-# PATCH-FIX-UPSTREAM inkscape-glib-2.31.patch lp#898538 dimstar@opensuse.org -- Fix build with glib 2.31
-Patch2:         inkscape-glib-2.31.patch
 BuildRequires:  boost-devel
 BuildRequires:  docbook-toys
 BuildRequires:  fdupes
@@ -43,7 +41,7 @@ BuildRequires:  gsl-devel
 BuildRequires:  gtkmm24-devel
 BuildRequires:  intltool
 BuildRequires:  libMagick++-devel
-BuildRequires:  liblcms-devel
+BuildRequires:  liblcms2-devel
 BuildRequires:  libpoppler-glib-devel
 BuildRequires:  libwpg-devel
 BuildRequires:  libxslt-devel
@@ -152,7 +150,6 @@ Inkscape is a vector illustration program for the GNOME desktop.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -179,6 +176,15 @@ bash %{S:2} %{buildroot}%{_datadir}/inkscape/extensions "%%{_datadir}/inkscape/e
 ## fix line endings
 sed -i 's/\r$//' %{buildroot}%{_datadir}/inkscape/extensions/param_curves.py
 sed -i 's/\r$//' %{buildroot}%{_datadir}/inkscape/extensions/render_alphabetsoup.py
+# Localized man pages
+for man in %{buildroot}%{_mandir}/*/man1/*; do
+    LOCALE=`echo $man | sed "s:.*%{_mandir}/\([^/]*\)/man1/.*:\1:g"`
+    echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE" >> %{name}.man-lang.tmp
+    echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE/man1" >> %{name}.man-lang.tmp
+    echo "%%lang($LOCALE) %%doc /${man##%{buildroot}}*" >> %{name}.man-lang.tmp
+done
+sort -u %{name}.man-lang.tmp > %{name}.man-lang
+rm %{name}.man-lang.tmp
 %fdupes %{buildroot}
 
 %clean
@@ -198,7 +204,9 @@ rm -rf %{buildroot}
 %icon_theme_cache_postun
 %endif
 
-%files -f inkscape.lst
+# We can't really move the localized manpages to the lang package, since they'd
+# create a conflict between the lang subpackage and bundles
+%files -f inkscape.lst -f %{name}.man-lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README* TRANSLATORS
 %{_bindir}/*
@@ -226,9 +234,6 @@ rm -rf %{buildroot}
 %{_datadir}/inkscape/extensions/simplepath.rb
 #END FIXME
 %doc %{_mandir}/man?/*.*
-# We can't really move the localized manpages to the lang package, since they'd
-# create a conflict between the lang subpackage and bundles
-%lang(fr) %{_mandir}/fr/man?/*.*
 # exclude extensions that go in other packages:
 %exclude %{_datadir}/inkscape/extensions/Barcode
 %exclude %{_datadir}/inkscape/extensions/cdr*
@@ -237,6 +242,8 @@ rm -rf %{buildroot}
 %exclude %{_datadir}/inkscape/extensions/fig*
 %exclude %{_datadir}/inkscape/extensions/*gimp*
 %exclude %{_datadir}/inkscape/extensions/sk*
+# this one is in extras, thanks to inkscape-split-extensions-extra.sh
+%exclude %{_datadir}/inkscape/extensions/ps2pdf-ext.py
 
 %files extensions-extra -f inkscape-extensions-extra.lst
 %defattr(-,root,root)