diff --git a/.gitignore b/.gitignore index cec926d..36c5f32 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Bcp-1.3.8.tgz +/Bcp-1.4.3.tgz diff --git a/coin-or-Bcp-docdir.patch b/coin-or-Bcp-docdir.patch index d870e5e..0cd7dad 100644 --- a/coin-or-Bcp-docdir.patch +++ b/coin-or-Bcp-docdir.patch @@ -1,7 +1,7 @@ -diff -up Bcp-1.3.8/Makefile.in.orig Bcp-1.3.8/Makefile.in ---- Bcp-1.3.8/Makefile.in.orig 2014-03-28 12:25:14.214998800 -0300 -+++ Bcp-1.3.8/Makefile.in 2014-03-28 12:26:03.859000701 -0300 -@@ -346,7 +346,7 @@ EXAMPLES = BAC +diff -up Bcp-1.4.3/Makefile.in.orig Bcp-1.4.3/Makefile.in +--- Bcp-1.4.3/Makefile.in.orig 2016-08-02 12:14:28.642477495 -0400 ++++ Bcp-1.4.3/Makefile.in 2016-08-02 12:15:56.116480845 -0400 +@@ -359,7 +359,7 @@ EXAMPLES = BAC ######################################################################## pkgconfiglibdir = $(libdir)/pkgconfig pkgconfiglib_DATA = bcp.pc @@ -10,12 +10,12 @@ diff -up Bcp-1.3.8/Makefile.in.orig Bcp-1.3.8/Makefile.in ######################################################################## # Maintainer Stuff # -@@ -355,7 +355,7 @@ addlibsdir = $(DESTDIR)$(datadir)/coin/d +@@ -368,7 +368,7 @@ addlibsdir = $(DESTDIR)$(datadir)/coin/d # Files that are generated and should be cleaned with make distclean DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES) - DocFiles = README AUTHORS LICENSE + DocFiles = README AUTHORS LICENSE -DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) +DocInstallDir = $(datadir)/doc/coin-or-$(PACKAGE_NAME) + COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE + COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE all: all-recursive - - .SUFFIXES: diff --git a/coin-or-Bcp-pkgconfig.patch b/coin-or-Bcp-pkgconfig.patch deleted file mode 100644 index fc778c6..0000000 --- a/coin-or-Bcp-pkgconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Bcp-1.3.8/Makefile.in.orig Bcp-1.3.8/Makefile.in ---- Bcp-1.3.8/Makefile.in.orig 2014-03-28 12:24:14.281996505 -0300 -+++ Bcp-1.3.8/Makefile.in 2014-03-28 12:24:51.570997933 -0300 -@@ -944,7 +944,7 @@ distclean-local: - - 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 bcp > $(addlibsdir)/bcp_addlibs.txt - @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libBcp.lib @BCPLIB_LIBS_INSTALLED@" > $(addlibsdir)/bcp_addlibs.txt - @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libBcp.lib @BCPLIB_LIBS_INSTALLED@" > $(addlibsdir)/bcp_addlibs_cpp.txt diff --git a/coin-or-Bcp.spec b/coin-or-Bcp.spec index 7733049..5ae1601 100644 --- a/coin-or-Bcp.spec +++ b/coin-or-Bcp.spec @@ -3,8 +3,8 @@ Name: coin-or-%{module} Group: Applications/Engineering Summary: Branch-Cut-Price Framework -Version: 1.3.8 -Release: 8%{?dist} +Version: 1.4.3 +Release: 1%{?dist} License: CPL URL: http://projects.coin-or.org/%{module} Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz @@ -23,11 +23,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 BCP is a parallel framework for implementing branch, cut, and price algorithms @@ -49,7 +46,6 @@ developing applications that use %{name}. %prep %setup -q -n %{module}-%{version} %patch0 -p1 -%patch1 -p1 %build %configure @@ -58,8 +54,7 @@ make %{?_smp_mflags} all %install make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.la -mkdir -p %{buildroot}%{_docdir}/%{name} -install -p -m 644 AUTHORS LICENSE README %{buildroot}%{_docdir}/%{name} +rm %{buildroot}%{_docdir}/%{name}/LICENSE %check make test @@ -69,9 +64,9 @@ make test %postun -p /sbin/ldconfig %files +%license LICENSE %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/AUTHORS -%doc %{_docdir}/%{name}/LICENSE %doc %{_docdir}/%{name}/README %doc %{_docdir}/%{name}/bcp_addlibs.txt %{_libdir}/*.so.* @@ -82,6 +77,10 @@ make test %{_libdir}/pkgconfig/* %changelog +* Tue Aug 02 2016 pcpa - 1.4.3-1 +- Update to latest upstream release +- Remove no longer needed pkgconfig patch + * Wed Feb 03 2016 Fedora Release Engineering - 1.3.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index ed28aec..af468ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f35e71e608fd73a309972096c20e81c Bcp-1.3.8.tgz +d5a14e1b101baacab030b419205a94f8 Bcp-1.4.3.tgz