From 467a9c41899cf61b6b0994739a13194e4cc5cab4b425b462976332a5e924f66b Mon Sep 17 00:00:00 2001
From: Kshitij Kulshreshtha <kkhere.geo@gmail.com>
Date: Thu, 6 Oct 2011 11:00:01 +0000
Subject: [PATCH 1/2] - update Colpack to new version 1.0.4   * some memory
 allocation bugfixes

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/adolc?expand=0&rev=23
---
 ColPack-1.0.3.tar.bz2 | 3 ---
 ColPack-1.0.4.tar.bz2 | 3 +++
 adolc.changes         | 6 ++++++
 adolc.spec            | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)
 delete mode 100644 ColPack-1.0.3.tar.bz2
 create mode 100644 ColPack-1.0.4.tar.bz2

diff --git a/ColPack-1.0.3.tar.bz2 b/ColPack-1.0.3.tar.bz2
deleted file mode 100644
index 64e2685..0000000
--- a/ColPack-1.0.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2911c42ba889afee54fe83eadd7ed534fd3e3c99ef6327fdcd83ea8a6a245f15
-size 1003059
diff --git a/ColPack-1.0.4.tar.bz2 b/ColPack-1.0.4.tar.bz2
new file mode 100644
index 0000000..015d2ae
--- /dev/null
+++ b/ColPack-1.0.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8bddae2c02d8fc78773b2ccc31f94609953b5e83da2b9c98c025928798fb541e
+size 986735
diff --git a/adolc.changes b/adolc.changes
index 7f27306..ec47319 100644
--- a/adolc.changes
+++ b/adolc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct  6 10:59:00 UTC 2011 - kkhere.geo@gmail.com
+
+- update Colpack to new version 1.0.4
+  * some memory allocation bugfixes
+
 -------------------------------------------------------------------
 Wed Oct  5 12:04:37 UTC 2011 - uli@suse.com
 
diff --git a/adolc.spec b/adolc.spec
index 7ed4c81..e59aedb 100644
--- a/adolc.spec
+++ b/adolc.spec
@@ -27,7 +27,7 @@ Summary:        Algorithmic Differentiation Library for C/C++
 Url:            http://projects.coin-or.org/ADOL-C
 Group:          Development/Languages/C and C++
 Source:         %{name}-%{packver}.tar.bz2
-Source1:        ColPack-1.0.3.tar.bz2
+Source1:        ColPack-1.0.4.tar.bz2
 Source2:        baselibs.conf
 BuildRequires:  autoconf automake libtool
 BuildRequires:  gcc-c++ libstdc++-devel

From 169d659a3e0c8e7515a17ecf241e8f4d2ca18bf54b643affe71a9d76fffdf60f Mon Sep 17 00:00:00 2001
From: Kshitij Kulshreshtha <kkhere.geo@gmail.com>
Date: Thu, 6 Oct 2011 11:35:29 +0000
Subject: [PATCH 2/2] fixes for rpmlint

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/adolc?expand=0&rev=24
---
 adolc.spec                          |  6 +++-
 correct-no-return-in-non-void.patch | 44 +++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 correct-no-return-in-non-void.patch

diff --git a/adolc.spec b/adolc.spec
index e59aedb..9c6fab3 100644
--- a/adolc.spec
+++ b/adolc.spec
@@ -29,6 +29,7 @@ Group:          Development/Languages/C and C++
 Source:         %{name}-%{packver}.tar.bz2
 Source1:        ColPack-1.0.4.tar.bz2
 Source2:        baselibs.conf
+Patch1:         correct-no-return-in-non-void.patch
 BuildRequires:  autoconf automake libtool
 BuildRequires:  gcc-c++ libstdc++-devel
 # BuildRequires:  texlive texlive-latex
@@ -106,6 +107,9 @@ This package provides the user´s manual for adolc
 pushd ThirdParty
 mv %{_builddir}/ColPack/* ColPack/
 rm -rf %{_builddir}/ColPack
+pushd ColPack
+%patch1 -p1
+popd
 popd
 
 %build
@@ -127,7 +131,7 @@ make %{_smp_mflags}
 %install
 %makeinstall
 install -d %{buildroot}%{_datadir}/doc/packages/%{name}
-install -m 644 README AUTHORS BUGS LICENSE INSTALL TODO %{buildroot}%{_datadir}/doc/packages/%{name}
+install -m 644 README AUTHORS BUGS LICENSE TODO %{buildroot}%{_datadir}/doc/packages/%{name}
 install -m 644 ADOL-C/doc/adolc-manual.pdf %{buildroot}%{_datadir}/doc/packages/%{name}
 install -m 644 ADOL-C/doc/short_ref.pdf %{buildroot}%{_datadir}/doc/packages/%{name}
 find "%buildroot" -type f -name "*.la" -delete;
diff --git a/correct-no-return-in-non-void.patch b/correct-no-return-in-non-void.patch
new file mode 100644
index 0000000..dc285f3
--- /dev/null
+++ b/correct-no-return-in-non-void.patch
@@ -0,0 +1,44 @@
+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) {