Accepting request 539034 from home:avindra

- Update to 1.0.10. For changes, see:
  6fed3fdf83...v1.0.10
- Use new homepage and Github repo
- Remove colpack-return-in-non-void.patch, fixed in commit:
  5ebede191a2f005f9630b3f5989db248f6626d2f
- Remove gcc6-fix-errors.patch, merged:
  https://github.com/CSCsw/ColPack/pull/11
- Clean with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/539034
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/ColPack?expand=0&rev=10

ColPack-1.0.9.tar.gz

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

ColPack.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Nov  4 21:57:54 UTC 2017 - aavindraa@gmail.com
+
+- Update to 1.0.10. For changes, see:
+  https://github.com/CSCsw/ColPack/compare/6fed3fdf83c36a19364c358e75575cb51f6200db...v1.0.10
+- Use new homepage and Github repo
+- Remove colpack-return-in-non-void.patch, fixed in commit:
+  5ebede191a2f005f9630b3f5989db248f6626d2f
+- Remove gcc6-fix-errors.patch, merged:
+  https://github.com/CSCsw/ColPack/pull/11
+- Clean with spec-cleaner
+
 -------------------------------------------------------------------
 Wed May 25 09:51:32 UTC 2016 - martin.liska@suse.com
 

ColPack.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ColPack
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,38 +16,34 @@
 #
 
 
-Name:           ColPack
 %define lname	libColPack0
-Version:        1.0.9
+Name:           ColPack
+Version:        1.0.10
 Release:        0
 Summary:        Graph Coloring Library for C/C++
 License:        LGPL-3.0
 Group:          Development/Libraries/C and C++
-Url:            http://www.cscapes.org/coloringpage/
+Url:            http://cscapes.cs.purdue.edu/coloringpage/
-Source:         http://www.cscapes.org/download/ColPack/%{name}-%{version}.tar.gz
+Source:         https://github.com/CSCsw/ColPack/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source2:        baselibs.conf
-Patch1:         colpack-return-in-non-void.patch
-# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6.
-Patch2:         gcc6-fix-errors.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-%description  
+%description
 This package provides algorithms for efficient solution of partitioning
 problems occuring in the analysis of sparsity patterns in derivative
 computations formulated as Graph Coloring problems.
 
 For details see http://www.cscapes.org/coloringpage/software.htm
 
-%package -n %lname
+%package -n %{lname}
 Summary:        Graph Coloring Library for C/C++
 Group:          System/Libraries
 
-%description -n %lname
+%description -n %{lname}
 This package provides algorithms for efficient solution of partitioning
 problems occuring in the analysis of sparsity patterns in derivative
 computations formulated as Graph Coloring problems.
@@ -57,7 +53,7 @@ For details see http://www.cscapes.org/coloringpage/software.htm
 %package devel
 Summary:        Graph Coloring Library for C/C++ -- development files
 Group:          Development/Libraries/C and C++
-Requires:       %lname = %{version}
+Requires:       %{lname} = %{version}
 
 %description devel
 This package provides algorithms for efficient solution of partitioning
@@ -69,31 +65,27 @@ For details see http://www.cscapes.org/coloringpage/software.htm
 This package provides the development environment for ColPack
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
 autoreconf -v --install --force
-%configure --prefix=/usr
+%configure --prefix=%{_prefix}
-make %{_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+%make_install
-find "%buildroot" -type f -name "*.la" -delete;
+find %{buildroot} -type f -name "*.la" -delete -print
-find "%buildroot" -type f -name "*.a" -delete;
+find %{buildroot} -type f -name "*.a" -delete;
-rm -rf %buildroot%{_builddir}/%{name}-%{version}/progs
+rm -rf %{buildroot}%{_builddir}/%{name}-%{version}/progs
+rm -rf %{buildroot}%{_prefix}/examples/Basic
 
-%post -n %lname -p /sbin/ldconfig
+%post -n %{lname} -p /sbin/ldconfig
+%postun -n %{lname} -p /sbin/ldconfig
 
-%postun -n %lname -p /sbin/ldconfig
+%files -n %{lname}
-
-%files -n %lname
-%defattr(-,root,root)
 %{_libdir}/libColPack.so.*
 
 %files devel
-%defattr(-,root,root)
 %dir %{_includedir}/ColPack
 %{_includedir}/ColPack/*.h
 %{_libdir}/libColPack.so

colpack-return-in-non-void.patch

@@ -1,92 +0,0 @@
-diff --git a/GraphColoring/GraphColoring.cpp b/GraphColoring/GraphColoring.cpp
-index 02f4c82..0125c72 100755
---- a/GraphColoring/GraphColoring.cpp
-+++ b/GraphColoring/GraphColoring.cpp
-@@ -675,6 +675,7 @@ namespace ColPack
- 			cout<<endl;
- 						
- 		}
-+		return(_TRUE);
- 	}
- 	
- 	int GraphColoring::PrintPotentialHub(map< int, int> *PotentialHub_Private, int i_thread_num, pair<int, int> pii_ColorCombination) {
-@@ -696,6 +697,7 @@ namespace ColPack
- 			cout<<endl;
- 						
- 		}
-+		return(_TRUE);
- 	}
- 	
- 		
-@@ -1129,6 +1131,7 @@ namespace ColPack
- 			pii_pair.second = mii_iter->second; // if pii_pair.second < -1, then mii_iter->first is a leaf and its hub can be calculated as [-(pii_pair.second+2)]
- 			Vertex2ColorCombination_Private[i_thread_num][ mii_iter->first ].push_back(pii_pair);
- 		}
-+		return(_TRUE);
- 	}
- 
- 	
-@@ -1325,6 +1328,7 @@ namespace ColPack
- 				if( i_ElementCount >= i_MaxElementsOfCombination) break;
- 			}
- 		}
-+		return(_TRUE);
- 	}
- 	
- 	int GraphColoring::PrintAllColorCombination(map< pair<int, int>, Colors2Edge_Value , lt_pii>* Colors2Edge_Private, int i_MaxNumThreads, int i_MaxNumOfCombination, int i_MaxElementsOfCombination) {
-@@ -1566,6 +1570,7 @@ namespace ColPack
- 		for(;mib_itr != D1Colors[i_thread_num].end(); mib_itr++) {
- 			cout<<flush<<"\t color "<<mib_itr->first<<"; count "<<mib_itr->second<<endl;
- 		}								
-+		return(_TRUE);
- 	}
- 	
- 	int GraphColoring::PrintForbiddenColors(map<int, bool>* mip_ForbiddenColors,int i_thread_num) {
-@@ -1575,6 +1580,7 @@ namespace ColPack
- 			cout<< itr->first<<", ";
- 		}
- 		cout<<endl;
-+		return(_TRUE);
- 	}
- 	
- 	int GraphColoring::PrintSubGraph(map< int, map<int,bool> > *graph) {
-@@ -1588,6 +1594,7 @@ namespace ColPack
- 			}
- 			cout<<endl;
- 		}
-+		return(_TRUE);
- 
- 	}
- 	
-@@ -1861,6 +1868,7 @@ namespace ColPack
- 			}
- 			cout<<endl;
- 		}
-+		return(_TRUE);
- 	}
- 	
- 	int GraphColoring::BuildForbiddenColors(int i_MaxNumThreads, int i_thread_num, int i_CurrentVertex, map<int, bool>* mip_ForbiddenColors, map<int, int>* D1Colors, vector<  map <int, int > > *Vertex2ColorCombination) {
-@@ -1937,6 +1945,7 @@ namespace ColPack
- 				}
- 				
- 			}
-+			return(_TRUE);
- 	}
- 	
- 	int GraphColoring::StarColoring_serial2() {
-@@ -2275,6 +2284,7 @@ namespace ColPack
- 				}
- 			}
- 		}
-+		return(_TRUE);
- 	}
- 	
- 	int GraphColoring::PrintVertex2ColorCombination_raw (vector<  map <int, int > > *Vertex2ColorCombination) {
-@@ -2286,6 +2296,7 @@ namespace ColPack
- 				cout<<"\t Vertex2ColorCombination["<< i <<"][] "<<mii_iter->second<<" c "<<mii_iter->first<<endl;
- 			}
- 		}
-+		return(_TRUE);
- 	}
- 	
- 

gcc6-fix-errors.patch

@@ -1,47 +0,0 @@
---- ColPack-1.0.9/Utilities/extra.cpp	2012-02-04 04:00:14.000000000 +0100
-+++ ColPack-1.0.9/Utilities/extra.cpp	2016-05-25 11:47:41.593922991 +0200
-@@ -49,7 +49,7 @@
- 
-     ofstream out_Matrix (s_MatrixName.c_str());
-     if(!out_Matrix) {
--	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
- 	    exit(1);
-     }
-     
-@@ -84,7 +84,7 @@
-     string s_MatrixName = "pattern"+s_postfix+s_BaseName;
-     ofstream out_Matrix (s_MatrixName.c_str());
-     if(!out_Matrix) {
--	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
- 	    exit(1);
-     }
- 
-@@ -111,7 +111,7 @@
-     string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
-     ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
-     if(!out_CompressedMatrix) {
--	    cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
- 	    exit(1);
-     }
-     
-@@ -140,7 +140,7 @@
-     string s_MatrixName = "pattern_value"+s_postfix+s_BaseName;
-     ofstream out_Matrix (s_MatrixName.c_str());
-     if(!out_Matrix) {
--	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
- 	    exit(1);
-     }
- 
-@@ -167,7 +167,7 @@
-     string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
-     ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
-     if(!out_CompressedMatrix) {
--	    cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
- 	    exit(1);
-     }
-