From f71ce63ba3c76e1595774dc3ac4608bc6d87fe0f08548904021bce88ed06389e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 5 Jul 2023 13:31:11 +0000 Subject: [PATCH] [info=1604597a6d4c84fc69c42dd3f278b673e48e26ae] OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/swipl?expand=0&rev=5 --- _scmsync.obsinfo | 4 ++-- swipl.changes | 5 +++++ swipl.spec | 17 ++++++++++------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 9f455f0..e434326 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1678283554 -commit: 2dd40642db3c2648acf9a22098440ac2b1d96168 +mtime: 1688563859 +commit: 1604597a6d4c84fc69c42dd3f278b673e48e26ae url: https://src.opensuse.org/pool/swipl revision: factory diff --git a/swipl.changes b/swipl.changes index 703a56c..c6c7aa4 100644 --- a/swipl.changes +++ b/swipl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 4 14:24:55 UTC 2023 - Matej Cepl + +- Make rpmlint slightly less unhappy with us. + ------------------------------------------------------------------- Tue Mar 7 08:55:38 UTC 2023 - Matej Cepl diff --git a/swipl.spec b/swipl.spec index 26a406d..c7d22a1 100644 --- a/swipl.spec +++ b/swipl.spec @@ -1,7 +1,7 @@ # # spec file for package swipl # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,12 +27,12 @@ Source98: swipl-rpmlintrc # For SOURCE_DATE_EPOCH variable- reproducible builds Source99: %{name}.changes BuildRequires: cmake -BuildRequires: ninja BuildRequires: db-devel BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: gmp-devel +BuildRequires: gperftools-devel BuildRequires: java-devel >= 1.8.0 # For %%check BuildRequires: junit @@ -40,7 +40,7 @@ BuildRequires: libarchive-devel BuildRequires: libjpeg-devel BuildRequires: libunwind-devel BuildRequires: ncurses-devel -BuildRequires: gperftools-devel +BuildRequires: ninja BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: unixODBC-devel @@ -49,8 +49,8 @@ BuildRequires: pkgconfig(libedit) BuildRequires: pkgconfig(libssl) BuildRequires: pkgconfig(ossp-uuid) BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(xaw6) BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw6) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xinerama) @@ -64,7 +64,7 @@ Provides: swi_pl = %{version} Obsoletes: swi-prolog < %{version} Obsoletes: swi_pl < %{version} -# jpackage-utils \ +# jpackage-utils %description Edinburgh-style Prolog compiler including modules, autoload, libraries, @@ -74,6 +74,9 @@ Emacs interface, a very fast compiler,and an X11 interface using XPCE. %prep %autosetup -p1 +sed -i -e "s|#!%{_bindir}/env swipl|#!%{_bindir}/swipl|" \ + packages/protobufs/bootstrap/protoc-gen-swipl + %build export SOURCE_DATE_EPOCH="$(sed -n '/^----/n;s/ - .*$//;p;q' %{SOURCE99} | date -u -f - +%%s)" %define __builder ninja @@ -96,8 +99,8 @@ install -D -m 0644 %{buildroot}%{_datadir}/pkgconfig/swipl.pc \ rm -v %{buildroot}%{_datadir}/pkgconfig/swipl.pc rmdir -v %{buildroot}%{_datadir}/pkgconfig -%fdupes %{buildroot}/%{_libdir}/%{name} -%fdupes %{buildroot}/%{_libdir}/%{name}-%{version} +%fdupes %{buildroot}/%{_libdir}/%{name}* +%fdupes %{buildroot}/%{_prefix}/lib/%{name}* %fdupes %{buildroot}/%{_docdir}/%{name}-%{version} %check