From 0897f575c85b939a0aa3822a9df36633eaa269d2 Mon Sep 17 00:00:00 2001 From: pcpa Date: Apr 16 2013 16:07:39 +0000 Subject: Initial import (#894585). --- diff --git a/.gitignore b/.gitignore index e69de29..fca4069 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/CoinUtils-2.9.0.tgz diff --git a/coin-or-CoinUtils-docdir.patch b/coin-or-CoinUtils-docdir.patch new file mode 100644 index 0000000..ee6002a --- /dev/null +++ b/coin-or-CoinUtils-docdir.patch @@ -0,0 +1,21 @@ +diff -up CoinUtils-2.8.7/CoinUtils/Makefile.in.orig CoinUtils-2.8.7/CoinUtils/Makefile.in +--- CoinUtils-2.8.7/CoinUtils/Makefile.in.orig 2012-09-27 21:20:53.187931622 -0300 ++++ CoinUtils-2.8.7/CoinUtils/Makefile.in 2012-09-27 21:20:57.280932710 -0300 +@@ -336,7 +336,7 @@ EXTRA_DIST = $(am__append_2) + ######################################################################## + pkgconfiglibdir = $(libdir)/pkgconfig + pkgconfiglib_DATA = coinutils.pc +-addlibsdir = $(DESTDIR)$(datadir)/coin/doc/CoinUtils ++addlibsdir = $(DESTDIR)$(datadir)/doc/coin-or-$(PACKAGE_NAME)-$(PACKAGE_VERSION) + + ######################################################################## + # Maintainer Stuff # +@@ -346,7 +346,7 @@ CLEANFILES = + # Files that are generated and should be cleaned with make distclean + DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES) + DocFiles = README AUTHORS LICENSE +-DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) ++DocInstallDir = $(datadir)/doc/coin-or-$(PACKAGE_NAME)-$(PACKAGE_VERSION) + all: all-recursive + + .SUFFIXES: diff --git a/coin-or-CoinUtils-pkgconfig.patch b/coin-or-CoinUtils-pkgconfig.patch new file mode 100644 index 0000000..8623a4e --- /dev/null +++ b/coin-or-CoinUtils-pkgconfig.patch @@ -0,0 +1,12 @@ +diff -up CoinUtils-2.8.7/CoinUtils/Makefile.in.orig CoinUtils-2.8.7/CoinUtils/Makefile.in +--- CoinUtils-2.8.7/CoinUtils/Makefile.in.orig 2012-09-26 21:23:04.672445373 -0300 ++++ CoinUtils-2.8.7/CoinUtils/Makefile.in 2012-09-26 21:23:41.367453620 -0300 +@@ -832,7 +832,7 @@ uninstall-local: uninstall-doc + + install-data-hook: + @$(mkdir_p) "$(addlibsdir)" +-@COIN_HAS_PKGCONFIG_TRUE@ PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \ ++@COIN_HAS_PKGCONFIG_TRUE@ PKG_CONFIG_PATH=$(DESTDIR)$(pkgconfiglibdir) \ + @COIN_HAS_PKGCONFIG_TRUE@ $(PKG_CONFIG) --libs coinutils > $(addlibsdir)/coinutils_addlibs.txt + @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCoinUtils.lib @COINUTILSLIB_LIBS_INSTALLED@" > $(addlibsdir)/coinutils_addlibs.txt + @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@ echo -L@abs_lib_dir@ -lCoinUtils @COINUTILSLIB_LIBS_INSTALLED@ > $(addlibsdir)/coinutils_addlibs.txt diff --git a/coin-or-CoinUtils-underlink.patch b/coin-or-CoinUtils-underlink.patch new file mode 100644 index 0000000..c151f5e --- /dev/null +++ b/coin-or-CoinUtils-underlink.patch @@ -0,0 +1,12 @@ +diff -up CoinUtils-2.9.0/CoinUtils/src/Makefile.in.orig CoinUtils-2.9.0/CoinUtils/src/Makefile.in +--- CoinUtils-2.9.0/CoinUtils/src/Makefile.in.orig 2013-04-14 14:16:08.567430805 -0300 ++++ CoinUtils-2.9.0/CoinUtils/src/Makefile.in 2013-04-14 14:16:52.468432486 -0300 +@@ -64,7 +64,7 @@ am__strip_dir = `echo $$p | sed -e 's|^. + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)" + libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) +-libCoinUtils_la_LIBADD = ++libCoinUtils_la_LIBADD = -lbz2 -lz + am_libCoinUtils_la_OBJECTS = CoinAlloc.lo CoinBuild.lo \ + CoinDenseVector.lo CoinError.lo CoinFactorization1.lo \ + CoinFactorization2.lo CoinFactorization3.lo \ diff --git a/coin-or-CoinUtils.spec b/coin-or-CoinUtils.spec new file mode 100644 index 0000000..44f5c19 --- /dev/null +++ b/coin-or-CoinUtils.spec @@ -0,0 +1,114 @@ +%global module CoinUtils + +Name: coin-or-%{module} +Group: Applications/Engineering +Summary: Coin-or Utilities +Version: 2.9.0 +Release: 1%{?dist} +License: EPL +URL: http://projects.coin-or.org/%{module} +Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz +BuildRequires: bzip2-devel +BuildRequires: coin-or-Sample +BuildRequires: doxygen +BuildRequires: pkgconfig +BuildRequires: readline-devel +BuildRequires: zlib-devel + +# Properly handle DESTDIR +Patch0: %{name}-pkgconfig.patch + +# Install documentation in standard rpm directory +Patch1: %{name}-docdir.patch + +# Correct undefined non weak symbols +Patch2: %{name}-underlink.patch + +%description +CoinUtils (Coin-or Utilities) is an open-source collection of classes +and functions that are generally useful to more than one COIN-OR project. +These utilities include: + + * Vector classes + * Matrix classes + * MPS file reading + * Comparing floating point numbers with a tolerance + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: coin-or-Sample +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package doc +Summary: Documentation files for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +This package contains the documentation for %{name}. + +%prep +%setup -q -n %{module}-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build +%configure +make %{?_smpflags} all doxydoc + +%install +make install DESTDIR=%{buildroot} +rm %{buildroot}%{_libdir}/*.la +cp -a doxydoc/html %{buildroot}%{_docdir}/%{name}-%{version} + +%check +make tests + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%dir %{_docdir}/%{name}-%{version} +%doc %{_docdir}/%{name}-%{version}/AUTHORS +%doc %{_docdir}/%{name}-%{version}/coinutils_addlibs.txt +%doc %{_docdir}/%{name}-%{version}/LICENSE +%doc %{_docdir}/%{name}-%{version}/README +%{_libdir}/*.so.* + +%files devel +%{_includedir}/coin/* +%{_libdir}/*.so +%{_libdir}/pkgconfig/* + +%files doc +%doc %{_docdir}/%{name}-%{version}/html + +%changelog +* Sun Apr 14 2013 pcpa - 2.9.0-1 +- Update to latest upstream release. +- Switch to the new upstream tarballs without bundled dependencies. +- Split documentation in a new subpackage (#894585#3) +- Correct undefined non weak symbols (#894585#3) +- Removed unneeded atlas, blas, glpk and lapack build requires (#894585#3) + +* Mon Jan 14 2013 pcpa - 2.8.8-1 +- Add coin-or-Sample to build requires (#894610#c4). +- Update to latest upstream release. + +* Sat Jan 12 2013 pcpa - 2.8.7-3 +- Rename repackaged tarball. + +* Sun Nov 18 2012 pcpa - 2.8.7-2 +- Rename package to coin-or-CoinUtils +- Do not package Thirdy party data or data without clean license. + +* Wed Sep 26 2012 pcpa - 2.8.7-1 +- Initial coinor-CoinUtils spec. diff --git a/sources b/sources index e69de29..ec65056 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +78848e3f603c5dfda555ed00aa519045 CoinUtils-2.9.0.tgz