diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..194ff9d --- /dev/null +++ b/_multibuild @@ -0,0 +1,4 @@ + + testsuite + + diff --git a/ppl-testsuite.changes b/ppl-testsuite.changes deleted file mode 100644 index a9e77e0..0000000 --- a/ppl-testsuite.changes +++ /dev/null @@ -1,195 +0,0 @@ -------------------------------------------------------------------- -Sat Oct 24 00:00:54 UTC 2020 - Jan Engelhardt - -- Disable lpsol and lcdd. -- Drop old bundled changelog file - -------------------------------------------------------------------- -Sun Sep 20 10:32:03 UTC 2020 - Jan Engelhardt - -- Remove useless keyring (outofdate key). - -------------------------------------------------------------------- -Mon Aug 26 04:39:44 UTC 2019 - Jan Engelhardt - -- Disable static builds, disable baselibs (unused). -- Enable glpk components. - -------------------------------------------------------------------- -Tue Oct 11 14:33:01 UTC 2016 - adam.majer@suse.de - -- Update to new upstream release 1.2 - * Improved the efficiency of the conversion procedure for - polyhedra by adding a quick adjacency check. - * In the Java language interface, throw an exception when trying - to build a disequality Constraint. - * Fixed a bug in the implementation of dense rows. - * Fixed a bug in the implementation of ::relation_with - * Portability improved. -- soname bumped - -------------------------------------------------------------------- -Sat Nov 14 10:07:48 UTC 2015 - jengelh@inai.de - -- Update to new upstream release 1.1 -* Remove the Sparse_Matrix class and add a Matrix class - instead. -* Dense_Row: remove the capacity argument from the two-argument - OK() method. -* Matrix: add some methods: row_capacity(), reserve_rows(), - remove_rows() and swap_columns(). -* Dense_Matrix: add non-const iterator and the remove_rows() and - reserve_rows() methods. -* Matrix: rename the row_capacity() method into capacity(). -* Remove the Dense_Matrix class, and use Matrix instead. -* Constraint_System: replace the const_iterator class with an - external Constraint_System_const_iterator class. -* Generator_System: replace the const_iterator class with an - external Generator_System_const_iterator class. -* Split the Linear_System::With_Bit_Matrix_iterator class out of - Linear_System and rename it to Linear_System_With_Bit_Matrix_iterator. -* Many more API changes. See the git log summary lines for details, - provided in /usr/share/doc/packages/GLS-0.12-1.1. -- Drop ppl-gmp-5.1.0.patch (merged upstream) - -------------------------------------------------------------------- -Mon Nov 2 10:46:25 UTC 2015 - rpm@fthiessen.de - -- Fixed dependencies of devel package. -- Cleaned spec file: Use so-name. - -------------------------------------------------------------------- -Sun Sep 27 13:14:53 UTC 2015 - mpluskal@suse.com - -- Update to 0.12.1 - * See NEWS file for complete list of changes - -------------------------------------------------------------------- -Tue Aug 4 21:45:13 UTC 2015 - mpluskal@suse.com - -- Update to 0.12 - * See NEWS file for complete list of changes -- Cleanup spec file with spec-clener -- Remove no longer needed dependency on gpg-offline -- Refresh ppl-gmp-5.1.0.patch -- Reduce duplicate files in documentation - -------------------------------------------------------------------- -Wed Sep 4 12:43:27 UTC 2013 - rguenther@suse.com - -- Disable -g when building the testsuite. - -------------------------------------------------------------------- -Mon Apr 15 13:09:40 UTC 2013 - idonmez@suse.com - -- Comment out GPG part, since it'll break bootstrap - -------------------------------------------------------------------- -Mon Apr 15 09:35:38 UTC 2013 - idonmez@suse.com - -- Add Source URL, see https://en.opensuse.org/SourceUrls -- Add GPG verification - -------------------------------------------------------------------- -Tue Mar 5 19:30:04 UTC 2013 - idonmez@suse.com - -- Add ppl-gmp-5.1.0.patch to fix build with new gmp - -------------------------------------------------------------------- -Tue Jan 24 12:20:24 UTC 2012 - jengelh@medozas.de - -- Remove redundant sections (see specfile guidelines) - -------------------------------------------------------------------- -Mon Jan 23 17:22:51 CET 2012 - meissner@suse.de - -- include /usr/share/aclocal directory as we no longer require autoconf - -------------------------------------------------------------------- -Wed Aug 31 13:44:35 UTC 2011 - rguenther@suse.com - -- Fix fixed baselibs.conf - -------------------------------------------------------------------- -Thu Mar 3 14:24:24 UTC 2011 - rguenther@novell.com - -- Update to version 0.11.2. [fate#311972] - * Minor bugfixes - -------------------------------------------------------------------- -Wed Sep 22 07:17:41 UTC 2010 - coolo@novell.com - -- fix baselibs.conf - -------------------------------------------------------------------- -Thu Aug 5 09:36:22 UTC 2010 - rguenther@novell.com - -- Update to version 0.11. - * Many new features, see NEWS file -- Library package name changes for SONAME bumps. - -------------------------------------------------------------------- -Sun Jun 27 16:15:03 UTC 2010 - jengelh@medozas.de - -- use %_smp_mflags - -------------------------------------------------------------------- -Fri Jun 18 16:08:42 UTC 2010 - prusnak@opensuse.org - -- add baselibs.conf - -------------------------------------------------------------------- -Wed Dec 16 10:46:43 CET 2009 - jengelh@medozas.de - -- package documentation as noarch - -------------------------------------------------------------------- -Thu Apr 16 14:12:13 CEST 2009 - rguenther@suse.de - -- Update to version 0.10.2. [fate#306970] - * fixes build with gmp 4.3.0 - -------------------------------------------------------------------- -Tue Apr 14 15:16:26 CEST 2009 - rguenther@suse.de - -- Update to bugfix release 0.10.1. -- Make the testsuite fatal everywhere. -- Disable memory1 test on s390x. - -------------------------------------------------------------------- -Mon Mar 16 14:31:13 CET 2009 - rguenther@suse.de - -- Wrap Recommends in suse_version check. - -------------------------------------------------------------------- -Tue Nov 4 17:46:01 CET 2008 - rguenther@suse.de - -- Update to final version 0.10. - * many new features and bugfixes (see NEWS file for details) - -------------------------------------------------------------------- -Thu Oct 30 23:28:02 CET 2008 - rguenther@suse.de - -- Update to version 0.10pre37. -- Rename libppl_c0 to libppl_c2 to follow new shared object name. - -------------------------------------------------------------------- -Fri Sep 5 10:39:34 CEST 2008 - rguenther@suse.de - -- Re-add static libs to ppl-devel-static. - -------------------------------------------------------------------- -Wed Sep 3 17:55:41 CEST 2008 - rguenther@suse.de - -- Remove all static libs. - -------------------------------------------------------------------- -Wed Sep 3 13:46:30 CEST 2008 - rguenther@suse.de - -- Update to version 0.10pre24. - -------------------------------------------------------------------- -Sun Aug 3 20:23:09 CEST 2008 - rguenther@suse.de - -- Package version 0.9. - diff --git a/ppl-testsuite.spec b/ppl-testsuite.spec deleted file mode 100644 index f816c00..0000000 --- a/ppl-testsuite.spec +++ /dev/null @@ -1,178 +0,0 @@ -# -# spec file for package ppl-testsuite -# -# Copyright (c) 2020 SUSE LLC -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -%define sover 14 -Name: ppl-testsuite -Version: 1.2 -Release: 0 -Summary: The Parma Polyhedra Library -License: GPL-3.0-or-later -Group: Development/Libraries/C and C++ -URL: https://www.bugseng.com/parma-polyhedra-library - -#Git-Web: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=summary -#Git-Clone: git://git.cs.unipr.it/ppl/ppl -Source: http://bugseng.com/products/ppl/download/ftp/releases/%version/ppl-%version.tar.xz -Source2: http://bugseng.com/products/ppl/download/ftp/releases/%version/ppl-%version.tar.xz.sign -BuildRequires: c++_compiler -BuildRequires: fdupes -BuildRequires: glpk-devel -BuildRequires: gmp-devel >= 4.1.3 -BuildRequires: m4 -BuildRequires: xz - -%description -The Parma Polyhedra Library (PPL) is a library for the manipulation of -(not necessarily closed) convex polyhedra and other numerical -abstractions. The applications of convex polyhedra include program -analysis, optimized compilation, integer and combinatorial optimization -and statistical data-editing. The Parma Polyhedra Library comes with -several user friendly interfaces, is fully dynamic (available virtual -memory is the only limitation to the dimension of anything), written in -accordance to all the applicable standards, exception-safe, rather -efficient, thoroughly documented, and free software. This package -provides all what is necessary to run applications using the PPL -through its C and C++ interfaces. - -%package devel -Summary: Development tools for the Parma Polyhedra Library C and C++ interfaces -Group: Development/Libraries/C and C++ -Requires: gmp-devel >= 4.1.3 -Requires: libppl%sover = %version -Requires: libppl_c4 = %version -Recommends: ppl-doc = %version - -%description devel -The header files, Autoconf macro, and ppl-config tool for developing -applications using the Parma Polyhedra Library through its C and C++ -interfaces. - -%package -n libppl%sover -Summary: C++ interface of the Parma Polyhedra Library -Group: System/Libraries - -%description -n libppl%sover -Shared library for the Parma Polyhedra Library. - -%package -n libppl_c4 -Summary: C interface of the Parma Polyhedra Library -Group: System/Libraries - -%description -n libppl_c4 -Shared library for the Parma Polyhedra Library C bindings. - -%package doc -Summary: Documentation for the Parma Polyhedra Library -Group: Documentation/HTML -BuildArch: noarch - -%description doc -This package contains all the documentations required by programmers -using the Parma Polyhedra Library (PPL). Install this package if you -want to program with the PPL. - -%prep -%autosetup -p1 -n ppl-%version - -%build -if [ ! -e configure ]; then autoreconf -fi; fi -%configure \ - --disable-static --disable-rpath --disable-watchdog \ - --disable-ppl_lpsol --disable-ppl_lcdd -#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -%make_build - -%if "%name" == "ppl-testsuite" -%check -# https://www.cs.unipr.it/mantis/view.php?id=1078 -# https://www.cs.unipr.it/mantis/view.php?id=2113 -# both behind a stupid login wall -%make_build check - -%install - -%else - -%install -%make_install INSTALL="install -p" -rm -f "%buildroot/%_libdir"/*.la -# We don't build the binary, so delete its manpage -rm -f %buildroot/%_mandir/man1/ppl_lpsol.1 -# We don't build pwl -rm -Rf %buildroot/%_datadir/doc/pwl -# The pdf is enough -rm -f %buildroot/%_datadir/doc/%name/ppl-user-*.ps.gz -rm -f %buildroot/%_datadir/doc/%name/ChangeLog -rm -f %buildroot/%_datadir/doc/%name/README.configure -rm -f %buildroot/%_datadir/doc/%name/TODO -rm -f %buildroot/%_datadir/doc/%name/gpl.* -rm -f %buildroot/%_datadir/doc/%name/fdl.ps.gz -rm -f %buildroot/%_datadir/doc/%name/fdl.pdf -rm -Rf %buildroot/%_datadir/doc/%name/ppl-user-prolog-interface-%{version}* -rm -Rf %buildroot/%_datadir/doc/%name/ppl-user-ocaml-interface-%{version}* -rm -Rf %buildroot/%_datadir/doc/%name/ppl-user-java-interface-%{version}* -# %%name == ppl -%endif -%fdupes -s %buildroot - -%post -n libppl%sover -p /sbin/ldconfig -%postun -n libppl%sover -p /sbin/ldconfig -%post -n libppl_c4 -p /sbin/ldconfig -%postun -n libppl_c4 -p /sbin/ldconfig - -%if "%name" == "ppl" -%files -%dir %_datadir/doc/%name -%doc %_datadir/doc/%name/BUGS -%doc %_datadir/doc/%name/COPYING -%doc %_datadir/doc/%name/CREDITS -%doc %_datadir/doc/%name/NEWS -%doc %_datadir/doc/%name/README -%_bindir/ppl_pips -%_mandir/man1/ppl_pips.1.gz - -%files -n libppl%sover -%_libdir/libppl.so.* - -%files -n libppl_c4 -%_libdir/libppl_c.so.* - -%files devel -%_includedir/ppl.hh -%_includedir/ppl_c.h -%_libdir/libppl.so -%_libdir/libppl_c.so -%_bindir/ppl-config -%_mandir/man1/ppl-config.1.gz -%_mandir/man3/libppl.3.gz -%_mandir/man3/libppl_c.3.gz -%dir %_datadir/aclocal -%_datadir/aclocal/ppl.m4 -%_datadir/aclocal/ppl_c.m4 - -%files doc -%doc %_datadir/doc/%name/README.doc -%doc %_datadir/doc/%name/fdl.txt -%doc %_datadir/doc/%name/ppl-user-%version-html/ -%doc %_datadir/doc/%name/ppl-user-c-interface-%version-html/ -%doc %_datadir/doc/%name/ppl-user-%version.pdf -%doc %_datadir/doc/%name/ppl-user-c-interface-%version.pdf -%endif - -%changelog diff --git a/ppl.changes b/ppl.changes index a9e77e0..67d8b87 100644 --- a/ppl.changes +++ b/ppl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 4 11:45:22 UTC 2023 - Dominique Leuenberger + +- Convert to real _multibuild package: the spec already handles + flavor differences. + ------------------------------------------------------------------- Sat Oct 24 00:00:54 UTC 2020 - Jan Engelhardt diff --git a/ppl.spec b/ppl.spec index 94d595f..bdb0707 100644 --- a/ppl.spec +++ b/ppl.spec @@ -1,7 +1,7 @@ # -# spec file for package ppl +# spec file # -# Copyright (c) 2020 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 @@ -16,8 +16,13 @@ # +%define flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "testsuite" +%define nsuffix -testsuite +%endif + %define sover 14 -Name: ppl +Name: ppl%{?nsuffix} Version: 1.2 Release: 0 Summary: The Parma Polyhedra Library diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index c550f0d..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -# This script is called automatically during autobuild checkin. -sed -e "s,^\(Name:.*ppl\),\1-testsuite," ppl.spec > ppl-testsuite.spec -cp -f ppl.changes ppl-testsuite.changes