Accepting request 111147 from devel:libraries:c_c++

- Update to new upsteam version 2.3.0
  * list of changes in the release announcement
    see http://list.coin-or.org/pipermail/adol-c/2012-March/000804.html
  * licensing modified
    see http://list.coin-or.org/pipermail/adol-c/2012-March/000805.html
- Update License tag in accordance with above change
- Remove ColPack, it can be packaged in its own package with v1.0.6
- Add a BuildRequires for ColPack-devel

This sr is also a followup to sr#111146 that submits the separate
ColPack package. Please review that request before reviewing this one.
Thanks.

OBS-URL: https://build.opensuse.org/request/show/111147
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/adolc?expand=0&rev=13

ColPack-1.0.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8bddae2c02d8fc78773b2ccc31f94609953b5e83da2b9c98c025928798fb541e
-size 986735

adolc-2.2.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3c14b7e895559a391323b84ec6a2e2128b76bd53df2d6bef7bd63c6fc97a989
-size 1879354

adolc-2.3.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:334437cca51aff11c9980894e9d83be97fe4c7171edb5be4504bc55e134cdafa
+size 1885705

adolc.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Mar 22 17:23:36 UTC 2012 - kkhere.geo@gmail.com
+
+- Update to new upsteam version 2.3.0
+  * list of changes in the release announcement
+    see http://list.coin-or.org/pipermail/adol-c/2012-March/000804.html
+  * licensing modified
+    see http://list.coin-or.org/pipermail/adol-c/2012-March/000805.html
+- Update License tag in accordance with above change
+- Remove ColPack, it can be packaged in its own package with v1.0.6
+- Add a BuildRequires for ColPack-devel
+
 -------------------------------------------------------------------
 Fri Feb 17 06:44:42 UTC 2012 - kkhere.geo@gmail.com
 

adolc.spec

@@ -16,21 +16,20 @@
 #
 
 
-%define packver 2.2.1
+%define packver 2.3.0
+%define packname ADOL-C
 
 Name:           adolc
 %define lname	libadolc1
-Version:        2.2.1
+Version:        2.3.0
 Release:        0
 Summary:        Algorithmic Differentiation Library for C/C++
-License:        (GPL-2.0 or CPL-1.0) and LGPL-3.0
+License:        GPL-2.0+ or EPL-1.0
 Group:          Development/Libraries/C and C++
-# see bnc#739158 for a discussion on the licensing issue
 Url:            http://projects.coin-or.org/ADOL-C
 Source:         %{name}-%{packver}.tar.bz2
-Source1:        ColPack-1.0.4.tar.bz2
-Source2:        baselibs.conf
-Patch1:         correct-no-return-in-non-void.patch
+Source1:        baselibs.conf
+BuildRequires:  ColPack-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
@@ -104,23 +103,9 @@ accessed memory of the given function evaluation program.
 This package provides the user´s manual for adolc
 
 %prep
-%setup -q -n %{name}-%{packver} -b 1
-pushd ThirdParty
-mv %{_builddir}/ColPack/* ColPack/
-rm -rf %{_builddir}/ColPack
-pushd ColPack
-%patch1 -p1
-popd
-popd
+%setup -q -n %{packname}-%{packver}
 
 %build
-pushd ThirdParty/ColPack
-make %{_smp_mflags} EXTRA_FLAGS="$RPM_OPT_FLAGS" \
-  CXXFLAGS+="$RPM_OPT_FLAGS" \
-  CC_COMPILER="%__cxx" \
-  CC_LINKER="%__cxx" \
-  CXX="%__cxx"
-popd
 autoreconf -v --install --force
 %configure --prefix=/usr
 make %{_smp_mflags}

correct-no-return-in-non-void.patch

@@ -1,44 +0,0 @@
-diff --git a/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp b/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
-index 81e3c81..8a8f762 100755
---- a/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
-+++ b/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
-@@ -564,6 +564,7 @@ namespace ColPack
- 
- 		}
- 
-+		return ( _TRUE );
- 	}
- 
- 	//Public Function 2456
-diff --git a/BipartiteGraphPartialColoring/BipartiteGraphPartialOrdering.cpp b/BipartiteGraphPartialColoring/BipartiteGraphPartialOrdering.cpp
-index f6adb58..b90f5b6 100644
---- a/BipartiteGraphPartialColoring/BipartiteGraphPartialOrdering.cpp
-+++ b/BipartiteGraphPartialColoring/BipartiteGraphPartialOrdering.cpp
-@@ -537,6 +537,7 @@ namespace ColPack
- 			}
- 		}
- 		cout<<"OUT ROW_SMALLEST_LAST_OMP()"<<endl<<flush;
-+		return(_TRUE);
- 	}
- 
- 	//Public Function 2359
-@@ -926,6 +927,7 @@ namespace ColPack
- 			}
- 		}
- 		cout<<"OUT COLUMN_SMALLEST_LAST_OMP()"<<endl<<flush;
-+		return(_TRUE);
- 	}
- 
- 
-diff --git a/Utilities/extra.cpp b/Utilities/extra.cpp
-index 3228b08..078b6a5 100755
---- a/Utilities/extra.cpp
-+++ b/Utilities/extra.cpp
-@@ -262,6 +262,7 @@ int displayGraph(ColPack::GraphColoring &g) {
-   //command="xdot -f fdp ";
-   command = command + fileName;
-   system(command.c_str());
-+  return(_TRUE);
- }
- 
- int buildDotWithoutColor(ColPack::GraphColoring &g, vector<string> &ListOfColors, string fileName) {