From 2fb3f5ad24ae9835e0c54c0d4a6aa6eda3dc92d767c8daaf7dfc7a58ce2c9fc4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 26 Aug 2019 04:48:11 +0000 Subject: [PATCH] - Disable static builds, disable baselibs (unused). - Enable glpk components. OBS-URL: https://build.opensuse.org/package/show/science/ppl?expand=0&rev=2 --- baselibs.conf | 6 ------ ppl-testsuite.spec | 54 +++++++++++++++------------------------------- ppl.changes | 6 ++++++ ppl.spec | 54 +++++++++++++++------------------------------- 4 files changed, 40 insertions(+), 80 deletions(-) delete mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index 85203cf..0000000 --- a/baselibs.conf +++ /dev/null @@ -1,6 +0,0 @@ -libppl14 -libppl_c4 -ppl-devel - requires -ppl- - requires "libppl14- = " - requires "libppl_c4- = " diff --git a/ppl-testsuite.spec b/ppl-testsuite.spec index 773b217..456923b 100644 --- a/ppl-testsuite.spec +++ b/ppl-testsuite.spec @@ -23,21 +23,20 @@ Release: 0 Summary: The Parma Polyhedra Library License: GPL-3.0+ Group: Development/Libraries/C and C++ -Url: http://bugseng.com/products/ppl/ +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 -Source1: http://bugseng.com/products/ppl/download/ftp/releases/%version/ppl-%version.tar.xz.sign -Source2: baselibs.conf +Source2: http://bugseng.com/products/ppl/download/ftp/releases/%version/ppl-%version.tar.xz.sign Source3: ppl.keyring Source4: GLS-0.12-1.1 BuildRequires: c++_compiler BuildRequires: fdupes +BuildRequires: glpk-devel BuildRequires: gmp-devel >= 4.1.3 BuildRequires: m4 BuildRequires: xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Parma Polyhedra Library (PPL) is a library for the manipulation of @@ -65,24 +64,15 @@ The header files, Autoconf macro, and ppl-config tool for developing applications using the Parma Polyhedra Library through its C and C++ interfaces. -%package devel-static -Summary: Static libraries for the Parma Polyhedra Library C and C++ interfaces -Group: Development/Libraries/C and C++ -Requires: ppl-devel = %{version}-%{release} -Recommends: ppl-doc = %{version}-%{release} - -%description devel-static -Static libraries for the Parma Polyhedra Library C and C++ interfaces. - %package -n libppl%{so_name} -Summary: Shared library for the Parma Polyhedra Library +Summary: C++ interface of the Parma Polyhedra Library Group: System/Libraries %description -n libppl%{so_name} Shared library for the Parma Polyhedra Library. %package -n libppl_c4 -Summary: Shared library for the Parma Polyhedra Library C bindings +Summary: C interface of the Parma Polyhedra Library Group: System/Libraries %description -n libppl_c4 @@ -99,28 +89,31 @@ using the Parma Polyhedra Library (PPL). Install this package if you want to program with the PPL. %prep -%setup -q -n ppl-%{version} +%autosetup -p1 %build %if "%{name}" == "ppl-testsuite" export CXXFLAGS="%{optflags} -g0" %endif %configure \ - --enable-shared \ - --with-pic \ - --disable-rpath \ + --disable-static \ + --disable-rpath \ --disable-watchdog #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 %{?_smp_mflags} + %if "%{name}" == "ppl-testsuite" %check make %{?_smp_mflags} check %install + %else + %install -make DESTDIR=%{buildroot} INSTALL="install -p" 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 @@ -141,16 +134,13 @@ cp -a %_sourcedir/GLS-* "%buildroot/%_datadir/doc/%name/" %endif %fdupes -s %{buildroot} -%post -n libppl%{so_name} -p /sbin/ldconfig - +%post -n libppl%{so_name} -p /sbin/ldconfig %postun -n libppl%{so_name} -p /sbin/ldconfig - -%post -n libppl_c4 -p /sbin/ldconfig - +%post -n libppl_c4 -p /sbin/ldconfig %postun -n libppl_c4 -p /sbin/ldconfig + %if "%{name}" == "ppl" %files -%defattr(-,root,root,-) %dir %{_datadir}/doc/%{name} %doc %{_datadir}/doc/%{name}/BUGS %doc %{_datadir}/doc/%{name}/COPYING @@ -158,20 +148,18 @@ cp -a %_sourcedir/GLS-* "%buildroot/%_datadir/doc/%name/" %doc %{_datadir}/doc/%{name}/NEWS %doc %{_datadir}/doc/%{name}/README %{_bindir}/ppl_lcdd +%_bindir/ppl_lpsol %{_bindir}/ppl_pips %{_mandir}/man1/ppl_lcdd.1.gz %{_mandir}/man1/ppl_pips.1.gz %files -n libppl%{so_name} -%defattr(-,root,root,-) %{_libdir}/libppl.so.* %files -n libppl_c4 -%defattr(-,root,root,-) %{_libdir}/libppl_c.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/ppl.hh %{_includedir}/ppl_c.h %{_libdir}/libppl.so @@ -184,15 +172,7 @@ cp -a %_sourcedir/GLS-* "%buildroot/%_datadir/doc/%name/" %{_datadir}/aclocal/ppl.m4 %{_datadir}/aclocal/ppl_c.m4 -%files devel-static -%defattr(-,root,root,-) -%{_libdir}/libppl.a -%{_libdir}/libppl.la -%{_libdir}/libppl_c.a -%{_libdir}/libppl_c.la - %files doc -%defattr(-,root,root,-) %doc %{_datadir}/doc/%{name}/GLS-* %doc %{_datadir}/doc/%{name}/README.doc %doc %{_datadir}/doc/%{name}/fdl.txt diff --git a/ppl.changes b/ppl.changes index 3271121..55923c6 100644 --- a/ppl.changes +++ b/ppl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/ppl.spec b/ppl.spec index 3a698f6..6fc115a 100644 --- a/ppl.spec +++ b/ppl.spec @@ -23,21 +23,20 @@ Release: 0 Summary: The Parma Polyhedra Library License: GPL-3.0+ Group: Development/Libraries/C and C++ -Url: http://bugseng.com/products/ppl/ +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 -Source1: http://bugseng.com/products/ppl/download/ftp/releases/%version/ppl-%version.tar.xz.sign -Source2: baselibs.conf +Source2: http://bugseng.com/products/ppl/download/ftp/releases/%version/ppl-%version.tar.xz.sign Source3: ppl.keyring Source4: GLS-0.12-1.1 BuildRequires: c++_compiler BuildRequires: fdupes +BuildRequires: glpk-devel BuildRequires: gmp-devel >= 4.1.3 BuildRequires: m4 BuildRequires: xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Parma Polyhedra Library (PPL) is a library for the manipulation of @@ -65,24 +64,15 @@ The header files, Autoconf macro, and ppl-config tool for developing applications using the Parma Polyhedra Library through its C and C++ interfaces. -%package devel-static -Summary: Static libraries for the Parma Polyhedra Library C and C++ interfaces -Group: Development/Libraries/C and C++ -Requires: ppl-devel = %{version}-%{release} -Recommends: ppl-doc = %{version}-%{release} - -%description devel-static -Static libraries for the Parma Polyhedra Library C and C++ interfaces. - %package -n libppl%{so_name} -Summary: Shared library for the Parma Polyhedra Library +Summary: C++ interface of the Parma Polyhedra Library Group: System/Libraries %description -n libppl%{so_name} Shared library for the Parma Polyhedra Library. %package -n libppl_c4 -Summary: Shared library for the Parma Polyhedra Library C bindings +Summary: C interface of the Parma Polyhedra Library Group: System/Libraries %description -n libppl_c4 @@ -99,28 +89,31 @@ using the Parma Polyhedra Library (PPL). Install this package if you want to program with the PPL. %prep -%setup -q -n ppl-%{version} +%autosetup -p1 %build %if "%{name}" == "ppl-testsuite" export CXXFLAGS="%{optflags} -g0" %endif %configure \ - --enable-shared \ - --with-pic \ - --disable-rpath \ + --disable-static \ + --disable-rpath \ --disable-watchdog #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 %{?_smp_mflags} + %if "%{name}" == "ppl-testsuite" %check make %{?_smp_mflags} check %install + %else + %install -make DESTDIR=%{buildroot} INSTALL="install -p" 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 @@ -141,16 +134,13 @@ cp -a %_sourcedir/GLS-* "%buildroot/%_datadir/doc/%name/" %endif %fdupes -s %{buildroot} -%post -n libppl%{so_name} -p /sbin/ldconfig - +%post -n libppl%{so_name} -p /sbin/ldconfig %postun -n libppl%{so_name} -p /sbin/ldconfig - -%post -n libppl_c4 -p /sbin/ldconfig - +%post -n libppl_c4 -p /sbin/ldconfig %postun -n libppl_c4 -p /sbin/ldconfig + %if "%{name}" == "ppl" %files -%defattr(-,root,root,-) %dir %{_datadir}/doc/%{name} %doc %{_datadir}/doc/%{name}/BUGS %doc %{_datadir}/doc/%{name}/COPYING @@ -158,20 +148,18 @@ cp -a %_sourcedir/GLS-* "%buildroot/%_datadir/doc/%name/" %doc %{_datadir}/doc/%{name}/NEWS %doc %{_datadir}/doc/%{name}/README %{_bindir}/ppl_lcdd +%_bindir/ppl_lpsol %{_bindir}/ppl_pips %{_mandir}/man1/ppl_lcdd.1.gz %{_mandir}/man1/ppl_pips.1.gz %files -n libppl%{so_name} -%defattr(-,root,root,-) %{_libdir}/libppl.so.* %files -n libppl_c4 -%defattr(-,root,root,-) %{_libdir}/libppl_c.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/ppl.hh %{_includedir}/ppl_c.h %{_libdir}/libppl.so @@ -184,15 +172,7 @@ cp -a %_sourcedir/GLS-* "%buildroot/%_datadir/doc/%name/" %{_datadir}/aclocal/ppl.m4 %{_datadir}/aclocal/ppl_c.m4 -%files devel-static -%defattr(-,root,root,-) -%{_libdir}/libppl.a -%{_libdir}/libppl.la -%{_libdir}/libppl_c.a -%{_libdir}/libppl_c.la - %files doc -%defattr(-,root,root,-) %doc %{_datadir}/doc/%{name}/GLS-* %doc %{_datadir}/doc/%{name}/README.doc %doc %{_datadir}/doc/%{name}/fdl.txt