Merge branch 'master' into el6

libsvm.spec

@@ -1,15 +1,15 @@
-%define shver 2
+%global shver 2
-%{!?pyver: %define pyver %(python -c 'import sys; print(sys.version[0:3])')}
+%{!?pyver: %global pyver %(python -c 'import sys; print(sys.version[0:3])')}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define libdir_libsvm %{_libdir}/libsvm
+%global libdir_libsvm %{_libdir}/libsvm
-%define libsvm_python_dir %{python_sitearch}/libsvm
+%global libsvm_python_dir %{python_sitearch}/libsvm
 %global maven_group_id tw.edu.ntu.csie
 %global pom_file_version 3.17
 %global pom_file_name JPP.%{maven_group_id}-%{name}.pom
 
 Name:           libsvm
 Version:        3.20
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -31,30 +31,30 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  grep
 
 %if 0%{?rhel} != 0 && 0%{?rhel} <= 5
-%define moc_path %{_libdir}/qt4/bin/moc
+%global moc_path %{_libdir}/qt4/bin/moc
-%define with_vendor "fedora"
+%global with_vendor "fedora"
 %else
-%define moc_path %{_bindir}/moc-qt4
+%global moc_path %{_bindir}/moc-qt4
 %endif
 
 # RHEL6 does not have enable_add_maven_depmap
 %if 0%{?rhel} != 0 && 0%{?rhel} <= 6
-%define enable_add_maven_depmap FALSE
+%global enable_add_maven_depmap FALSE
 %else
-%define enable_add_maven_depmap TRUE
+%global enable_add_maven_depmap TRUE
 %endif
 
 
 %ifnarch ppc ppc64
-%define no_java FALSE
+%global no_java FALSE
 %if 0%{?rhel} <= 6
-%define java_dependency java
+%global java_dependency java
-%else 
+%else
-%define java_dependency java-headless
+%global java_dependency java-headless
 %endif
 %else
-%define no_java NO_JAVA
+%global no_java NO_JAVA
-%define enable_add_maven_depmap FALSE
+%global enable_add_maven_depmap FALSE
 Obsoletes: libsvm-java < 2.88-1
 %endif
 
@@ -247,7 +247,6 @@ rm -rf %{buildroot}
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYRIGHT FAQ.html ChangeLog guide.pdf
 %{_bindir}/svm-predict
 %{_bindir}/svm-scale
@@ -257,13 +256,11 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}.so.%{shver}
 
 %files devel
-%defattr(-,root,root,-)
 %doc README
 %{_includedir}/%{name}/
 %{_libdir}/%{name}.so
 
 %files python
-%defattr(-,root,root,-)
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 %{_bindir}/svm-*.py
@@ -275,7 +272,6 @@ rm -rf %{buildroot}
 %else
 %files java
 %endif
-%defattr(-,root,root,-)
 %doc java/README-Java java/test_applet.html
 %{_javadir}/%{name}.jar
 %{_javadir}/%{maven_group_id}/%{name}-%{version}.jar
@@ -286,14 +282,12 @@ rm -rf %{buildroot}
 %endif
 
 %files svm-toy-gtk
-%defattr(-,root,root,-)
 %doc svm-toy/gtk/README
 %{_bindir}/svm-toy-gtk
 %{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-gtk-48.png
 %{_datadir}/applications/*%{name}-svm-toy-gtk.desktop
 
 %files svm-toy-qt
-%defattr(-,root,root,-)
 %doc svm-toy/qt/README
 %{_bindir}/svm-toy-qt
 %{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-qt-48.png
@@ -301,6 +295,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 25 2015 Björn Esser <fedora@besser82.io> - 3.20-6
+- Replaced %%define with %%global
+- dropped %%defattr
+- clean trailing whitespaces
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.20-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.20-4
+- Rebuilt for GCC 5 C++11 ABI change
+
 * Tue Jan 20 2015 Ding-Yi Chen <dchen@redhat.com> - 3.20-3
 - Fix for RHEL6
 
@@ -328,7 +333,7 @@ rm -rf %{buildroot}
 * Tue Apr 22 2014 Ding-Yi Chen <dchen@redhat.com> - 3.18-1
 - Upstream update to 3.18
 - svm.cpp and svm-scale.c: check return values of fscanf
-- matlab interface: Makefile no longer handles octave 
+- matlab interface: Makefile no longer handles octave
   because make.m should be used
 
 * Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 3.17-4