diff --git a/inkscape-python2.patch b/inkscape-python2.patch new file mode 100644 index 0000000..43e158c --- /dev/null +++ b/inkscape-python2.patch @@ -0,0 +1,53 @@ +--- inkscape-0.92.3/share/filters/CMakeLists.txt ++++ inkscape-0.92.3/share/filters/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h +- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h ++ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py + ) +--- inkscape-0.92.3/share/palettes/CMakeLists.txt ++++ inkscape-0.92.3/share/palettes/CMakeLists.txt +@@ -2,7 +2,7 @@ set(I18N_FILES "inkscape.gpl" "svg.gpl" + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h +- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h ++ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} + ) +--- inkscape-0.92.3/share/patterns/CMakeLists.txt ++++ inkscape-0.92.3/share/patterns/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h +- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h ++ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py + ) +--- inkscape-0.92.3/share/symbols/CMakeLists.txt ++++ inkscape-0.92.3/share/symbols/CMakeLists.txt +@@ -2,7 +2,7 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURREN + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h +- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h ++ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} + ) +--- inkscape-0.92.3/share/templates/CMakeLists.txt ++++ inkscape-0.92.3/share/templates/CMakeLists.txt +@@ -2,7 +2,7 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURREN + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/templates.h +- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h ++ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} + ) diff --git a/inkscape.spec b/inkscape.spec index 2064a7f..c89b779 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,6 +1,6 @@ Name: inkscape Version: 0.92.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Vector-based drawing program using SVG License: GPLv2+ and CC-BY @@ -17,6 +17,9 @@ Source2: Fedora-Color-Palette.gpl #Patch0: 0001-adapt-to-poppler-0.58.patch Patch0: inkscape-0.92.3-1575842.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1604371 +Patch1: inkscape-python2.patch + BuildRequires: gcc-c++ BuildRequires: aspell-devel aspell-en BuildRequires: atk-devel @@ -29,7 +32,7 @@ BuildRequires: gc-devel >= 6.4 BuildRequires: gettext BuildRequires: gsl-devel BuildRequires: gtkmm24-devel -BuildRequires: gtkspell3-devel +BuildRequires: gtkspell-devel BuildRequires: ImageMagick-c++-devel BuildRequires: intltool BuildRequires: lcms2-devel @@ -49,8 +52,7 @@ BuildRequires: cmake BuildRequires: libwpd-devel BuildRequires: gnome-vfs2-devel BuildRequires: dbus-glib-devel -BuildRequires: gtk3-devel -BuildRequires: libgdl-devel +BuildRequires: gtk2-devel BuildRequires: libjpeg-devel BuildRequires: libsigc++20-devel @@ -108,6 +110,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format. %prep %setup -q %patch0 -p0 +%patch1 -p1 # https://bugs.launchpad.net/inkscape/+bug/314381 # A couple of files have executable bits set, @@ -214,6 +217,10 @@ install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/ %changelog +* Fri Jul 20 2018 Debarshi Ray - 0.92.3-4 +- Fix FTBFS due to Python2 +- Remove GTK3-based BuildRequires + * Fri Jul 13 2018 Fedora Release Engineering - 0.92.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild