commit c791ba70b19d058e79e328d2cfd4709bc48d0f71
Author: Jan Palus <[email protected]>
Date: Wed Jan 22 00:58:02 2025 +0100
up to 1.4.6
python-cmake.patch | 27 ---------------------------
vislcg3.spec | 6 ++----
2 files changed, 2 insertions(+), 31 deletions(-)
---
diff --git a/vislcg3.spec b/vislcg3.spec
index 11d4e11..0ac1e28 100644
--- a/vislcg3.spec
+++ b/vislcg3.spec
@@ -6,15 +6,14 @@
Summary: VISL CG-3 constraint grammar system
Summary(pl.UTF-8): VISL CG-3 - system ograniczonej gramatyki
Name: vislcg3
-Version: 1.4.5
+Version: 1.4.6
Release: 1
License: GPL v3+
Group: Applications/Text
#Source0Download: https://github.com/TinoDidriksen/cg3/releases
Source0:
https://github.com/TinoDidriksen/cg3/archive/v%{version}/cg3-%{version}.tar.gz
-# Source0-md5: cbb7cbe0776596f59c5672a3a30219d9
+# Source0-md5: 74b0014cf9b70550b687d2ad235d3d54
Patch0: %{name}-static.patch
-Patch1: python-cmake.patch
URL: http://beta.visl.sdu.dk/cg3.html
BuildRequires: cmake >= 3.0
BuildRequires: boost-devel >= 1.63.0-4
@@ -88,7 +87,6 @@ Tryb CG-3 dla Emacsa.
%prep
%setup -q -n cg3-%{version}
%patch -P0 -p1
-%patch -P1 -p1
# not executable
%{__sed} -i -e '1s,.*/usr/bin/env perl,,' scripts/CG3_External.pm
diff --git a/python-cmake.patch b/python-cmake.patch
deleted file mode 100644
index 08426cb..0000000
--- a/python-cmake.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c22f5572c0946b0d21f4d489308ea0ce9f305ea0 Mon Sep 17 00:00:00 2001
-From: Tino Didriksen <[email protected]>
-Date: Fri, 4 Aug 2023 10:35:23 +0000
-Subject: [PATCH] Use FindPython instead of FindPythonInterp for CMake >=
- 3.12.0 (fixes https://bugs.debian.org/1042249); Release 1.4.6
-
----
- python/CMakeLists.txt | 7 ++++++-
- src/version.hpp | 2 +-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
-index 5107e078..122bb798 100644
---- a/python/CMakeLists.txt
-+++ b/python/CMakeLists.txt
-@@ -1,5 +1,10 @@
- find_package(SWIG 3.0 REQUIRED)
--find_package(PythonInterp 3.5 REQUIRED)
-+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.12.0")
-+ find_package(Python 3.5 REQUIRED)
-+ set(PYTHON_EXECUTABLE ${Python_EXECUTABLE})
-+else()
-+ find_package(PythonInterp 3.5 REQUIRED)
-+endif()
-
- set(PYTHON_FILE "constraint_grammar.py")
- set(CPP_WRAP_FILE "constraint_grammar_wrap.cpp")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vislcg3.git/commitdiff/c791ba70b19d058e79e328d2cfd4709bc48d0f71
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
