- updated to 7.2.26 (last version using Qt5)

diff --git a/ipe-ipeletdir.patch b/ipe-ipeletdir.patch
index b36ef30caa6783fe2ef5ee71eef1c7093f6862f3..da0a339f66acf6096a848192a4f8ada46034f3f0 100644 (file)
--- a/ipe-ipeletdir.patch
+++ b/ipe-ipeletdir.patch
@@ -1,11 +1,11 @@
---- ipe-7.1.2/src/config.mak.orig      2012-02-15 14:45:19.047045221 +0100
-+++ ipe-7.1.2/src/config.mak   2012-02-15 14:46:08.249274100 +0100
-@@ -137,7 +137,7 @@ IPELIBDIR  = $(IPEPREFIX)/lib
- IPEHEADERDIR = $(IPEPREFIX)/include
+--- ipe-7.2.26/src/config.mak.orig     2023-09-13 06:30:38.655428675 +0200
++++ ipe-7.2.26/src/config.mak  2023-09-13 17:08:59.866441827 +0200
+@@ -99,7 +99,7 @@ IPELIBDIR  ?= $(IPEPREFIX)/lib
+ IPEHEADERDIR ?= $(IPEPREFIX)/include
  #
  # Where Ipelets will be installed:
--IPELETDIR = $(IPEPREFIX)/lib/ipe/$(IPEVERS)/ipelets
-+IPELETDIR = $(IPELIBDIR)/ipe/$(IPEVERS)/ipelets
+-IPELETDIR ?= $(IPEPREFIX)/lib/ipe/$(IPEVERS)/ipelets
++IPELETDIR ?= $(IPELIBDIR)/ipe/$(IPEVERS)/ipelets
  #
  # Where Lua code will be installed
  # (This is the part of the Ipe program written in the Lua language)

diff --git a/ipe.spec b/ipe.spec
index 607b9e1f8a245eb2d39a944235f98247a91bdee1..130f0f033ee648771ff55eb2d723255b8d167c30 100644 (file)
--- a/ipe.spec
+++ b/ipe.spec
@@ -1,23 +1,31 @@
+# TODO: QtSpell-qt5
 Summary:       Drawing editor for creating figures in PDF or PostScript formats
 Summary(pl.UTF-8):     Edytor do tworzenia rysunków w formacie PDF i PostScript
 Name:          ipe
-Version:       7.1.2
+Version:       7.2.26
 Release:       1
 License:       GPL v3
 Group:         X11/Applications/Graphics
-Source0:       https://downloads.sourceforge.net/ipe7/%{name}-%{version}-src.tar.gz
-# Source0-md5: 887f65359d60e184a446cbe77def5176
+#Source0Download: https://github.com/otfried/ipe/releases  # for 7.2.27+
+#Source0Download: https://github.com/otfried/old-ipe-releases/releases
+Source0:       https://github.com/otfried/old-ipe-releases/releases/download/v%{version}/%{name}-%{version}-src.tar.gz
+# Source0-md5: cac0aa5510bb2b47cd133e81a5e7c222
 Patch0:                %{name}-ipeletdir.patch
 URL:           https://ipe.otfried.org/
-BuildRequires: QtCore-devel >= 4
-BuildRequires: QtGui-devel >= 4
+BuildRequires: Qt5Core-devel >= 5
+BuildRequires: Qt5Gui-devel >= 5
+BuildRequires: Qt5Widgets-devel >= 5
 BuildRequires: cairo-devel
+BuildRequires: curl-devel
 BuildRequires: freetype-devel >= 2
+BuildRequires: gsl-devel
 BuildRequires: gtk+2-devel >= 1:2.0
+BuildRequires: libpng-devel
+BuildRequires: libspiro-devel
 BuildRequires: libstdc++-devel
-BuildRequires: lua51-devel >= 5.1
+BuildRequires: lua54-devel >= 5.4
 BuildRequires: pkgconfig
-BuildRequires: qt4-build >= 4
+BuildRequires: qt5-build >= 5
 BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel
 Requires:      %{name}-libs = %{version}-%{release}
@@ -64,17 +72,19 @@ Ten pakiet zawiera pliki nagłówkowe bibliotek Ipe.
 %setup -q
 %patch0 -p1
 
-%{__sed} -i -e 's/lua5.1/lua51/g' src/config.mak
 %{__sed} -i -e '1s,/usr/bin/env ipescript,%{_bindir}/ipescript,' scripts/*.lua
 
 %build
+CPPFLAGS="%{rpmcppflags}" \
+CXXFLAGS="%{rpmcxxflags}" \
+LDFLAGS="%{rpmldflags}" \
 %{__make} -C src \
        IPEPREFIX=%{_prefix} \
        IPELIBDIR=%{_libdir} \
        CXX="%{__cxx}" \
-       CXXFLAGS="%{rpmcxxflags} -fPIC" \
-       IPE_USE_ICONV="-DIPE_USE_ICONV" \
-       luatest=
+       IPE_NO_SPELLCHECK=1 \
+       LUA_PACKAGE=lua5.4 \
+       MOC=moc-qt5
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -82,8 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C src install \
        INSTALL_ROOT=$RPM_BUILD_ROOT \
        IPEPREFIX=%{_prefix} \
-       IPELIBDIR=%{_libdir} \
-       luatest=
+       IPELIBDIR=%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,16 +105,17 @@ rm -rf $RPM_BUILD_ROOT
 %doc news.txt readme.txt
 %attr(755,root,root) %{_bindir}/ipe
 %attr(755,root,root) %{_bindir}/ipe6upgrade
+%attr(755,root,root) %{_bindir}/ipecurl
 %attr(755,root,root) %{_bindir}/ipeextract
+%attr(755,root,root) %{_bindir}/ipepresenter
 %attr(755,root,root) %{_bindir}/iperender
+%attr(755,root,root) %{_bindir}/iperender-par
 %attr(755,root,root) %{_bindir}/ipescript
 %attr(755,root,root) %{_bindir}/ipetoipe
-%attr(755,root,root) %{_bindir}/ipeview
 %dir %{_libdir}/ipe
-%dir %{_libdir}/ipe/7.1.2
-%dir %{_libdir}/ipe/7.1.2/ipelets
-%attr(755,root,root) %{_libdir}/ipe/7.1.2/ipelets/image.so
-%{_libdir}/ipe/7.1.2/ipelets/*.lua
+%dir %{_libdir}/ipe/%{version}
+%dir %{_libdir}/ipe/%{version}/ipelets
+%{_libdir}/ipe/%{version}/ipelets/*.lua
 %{_datadir}/ipe
 %{_mandir}/man1/ipe.1*
 %{_mandir}/man1/ipe6upgrade.1*
@@ -116,11 +126,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libipe.so.7.1.2
-%attr(755,root,root) %{_libdir}/libipecairo.so.7.1.2
-%attr(755,root,root) %{_libdir}/libipecanvas.so.7.1.2
-%attr(755,root,root) %{_libdir}/libipelua.so.7.1.2
-%attr(755,root,root) %{_libdir}/libipeui.so.7.1.2
+%attr(755,root,root) %{_libdir}/libipe.so.%{version}
+%attr(755,root,root) %{_libdir}/libipecairo.so.%{version}
+%attr(755,root,root) %{_libdir}/libipecanvas.so.%{version}
+%attr(755,root,root) %{_libdir}/libipelua.so.%{version}
+%attr(755,root,root) %{_libdir}/libipeui.so.%{version}
 
 %files devel
 %defattr(644,root,root,755)