diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index b1e5875..9f455f0 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1688480725 -commit: 57df3912699ce9fdc087aff2d9a8540bccfd6fba -url: https://src.opensuse.org/mcepl/swipl.git -revision: 57df3912699ce9fdc087aff2d9a8540bccfd6fba +mtime: 1678283554 +commit: 2dd40642db3c2648acf9a22098440ac2b1d96168 +url: https://src.opensuse.org/pool/swipl +revision: factory diff --git a/swipl.changes b/swipl.changes index c6c7aa4..703a56c 100644 --- a/swipl.changes +++ b/swipl.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 c7d22a1..26a406d 100644 --- a/swipl.spec +++ b/swipl.spec @@ -1,7 +1,7 @@ # # spec file for package swipl # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2022 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: ninja +BuildRequires: gperftools-devel 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(x11) BuildRequires: pkgconfig(xaw6) +BuildRequires: pkgconfig(x11) 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,9 +74,6 @@ 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 @@ -99,8 +96,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}/%{_prefix}/lib/%{name}* +%fdupes %{buildroot}/%{_libdir}/%{name} +%fdupes %{buildroot}/%{_libdir}/%{name}-%{version} %fdupes %{buildroot}/%{_docdir}/%{name}-%{version} %check