rpms
/
coin-or-Clp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to latest upstream release (#1190729).

This commit is contained in:
pcpa 2015-02-09 14:15:09 -02:00
parent a4196c7717
commit 03d77b2abc
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/Clp-1.15.7.tgz
/Clp-1.15.10.tgz
/Clp-1.16.1.tgz
/Clp-1.16.3.tgz

12
coin-or-Clp-pkgconfig.patch
View File

@ -1,12 +0,0 @@
diff -up Clp-1.15.7/Makefile.in.orig Clp-1.15.7/Makefile.in
--- Clp-1.15.7/Makefile.in.orig 2014-07-16 12:34:46.203191658 -0300
+++ Clp-1.15.7/Makefile.in 2014-07-16 12:34:57.902192106 -0300
@@ -908,7 +908,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 clp > $(addlibsdir)/clp_addlibs.txt
@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs.txt
@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@ echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt

11
coin-or-Clp.spec
View File

@ -3,7 +3,7 @@
Name: coin-or-%{module}
Group: Applications/Engineering
Summary: Coin-or linear programming
Version: 1.16.1
Version: 1.16.3
Release: 1%{?dist}
License: EPL
URL: http://projects.coin-or.org/%{module}
@ -21,11 +21,8 @@ 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
Patch0: %{name}-docdir.patch
%description
Clp (Coin-or linear programming) is an open-source linear programming
@ -54,7 +51,6 @@ This package contains the documentation for %{name}.
%prep
%setup -q -n %{module}-%{version}
%patch0 -p1
%patch1 -p1
%build
%configure
@ -93,6 +89,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test
%doc %{_docdir}/%{name}/html
%changelog
* Mon Feb 9 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.16.3-1
- Update to latest upstream release (#1190729).
* Sat Feb 07 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.16.1-1
- Update to latest upstream release (#1159475).

2
sources
View File

@ -1 +1 @@
6a3660d999dad47842477c94cd918381 Clp-1.16.1.tgz
bf3692955a052a65b79c62f1bba048cd Clp-1.16.3.tgz