commit ColorFull for openSUSE:Factory

24 Aug 2017

Hello community,

here is the log from the commit of package ColorFull for openSUSE:Factory checked in at 2017-08-24 18:44:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ColorFull (Old)
 and      /work/SRC/openSUSE:Factory/.ColorFull.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ColorFull"

Thu Aug 24 18:44:03 2017 rev:3 rq:514117 version:1.1

Changes:
--------

--- /work/SRC/openSUSE:Factory/ColorFull/ColorFull.changes	2017-01-09 10:58:00.756380936 +0100
+++ /work/SRC/openSUSE:Factory/.ColorFull.new/ColorFull.changes	2017-08-24 18:44:37.599082242 +0200
@@ -1,0 +2,22 @@
+Wed Aug  2 06:28:30 UTC 2017 - badshah400@gmail.com
+
+- Update to version 1.1:
+  * Added functions split_gluon, default_parton_numbers,
+    rename_partons in Col_functions. These functions are used for
+    g -> qqbar splitting.
+  * Removed Matchbox interface to Herwig, since ColorFull along
+    with the interface, is shipped with Herwig from version 7.0.
+  * Included various minor updates from Herwig version.
+- Changes from version 1.0:
+  * Fixed Monomial.h to build using --std=c++11 and --std=c++14.
+  * Fixed all warnings appearing with -Wextra for g++ and clang
+    using --std=c++11 and c++14. This required removing some
+    arguments in private functions.
+- Move shared libs to standard libdir from libdir/name; this
+  makes the package compliant with openSUSE shared lib packaging
+  policy, and no longer requires the installation of a conf file.
+- Drop patches incorporated or otherwise fixed upstream:
+  * ColorFull-monomial-conjugate-assignment.patch
+  * ColorFull-monomial-illegal-or-usage.patch
+
+-------------------------------------------------------------------

Old:
----
  ColorFull-0.99.tar.gz
  ColorFull-monomial-conjugate-assignment.patch
  ColorFull-monomial-illegal-or-usage.patch

New:
----
  ColorFull-1.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ColorFull.spec ++++++
--- /var/tmp/diff_new_pack.eovGPO/_old	2017-08-24 18:44:39.310841224 +0200
+++ /var/tmp/diff_new_pack.eovGPO/_new	2017-08-24 18:44:39.326838971 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ColorFull
 #
-# 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
@@ -18,7 +18,7 @@
 
 %define shlib lib%{name}0
 Name:           ColorFull
-Version:        0.99
+Version:        1.1
 Release:        0
 Summary:        C++ library for calculations in QCD (SU(Nc)) color space
 License:        GPL-2.0
@@ -26,10 +26,6 @@
 Url:            http://colorfull.hepforge.org/
 Source0:        http://colorfull.hepforge.org/%{name}-%{version}.tar.gz
 Source1:       %{name}-rpmlintrc
-# PATCH-FIX-UPSTREAM ColorFull-monomial-conjugate-assignment.patch badshah400@gmail.com -- Fix an incorrect assignment syntax
-Patch0:         ColorFull-monomial-conjugate-assignment.patch
-# PATCH-FIX-UPSTREAM ColorFull-monomial-illegal-or-usage.patch badshah400@gmail.com -- Fix the usage of "or" by using appropriate parenthesis around the operands
-Patch1:         ColorFull-monomial-illegal-or-usage.patch
 # PATCH-FIX-UPSTREAM ColorFull-install-pkgconfig-file.patch badshah400@gmail.com -- Add a pkgconfig file and modify the autotool files to install it to an appropriate location
 Patch2:         ColorFull-install-pkgconfig-file.patch
 BuildRequires:  gcc-c++
@@ -88,8 +84,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 %build
@@ -102,27 +96,25 @@
 
 find %{buildroot} -type f -name "*.la" -delete -print
 
-# DON'T INSTALL TEST/EXAMPLE BINARIES (ONE OF THEM CALLED "test"!!!), PKG THE CODES AS DOC INSTEAD
-rm %{buildroot}%{_bindir}/{test,ColorPlay}
+# DON'T INSTALL TEST/EXAMPLE BINARIES, PKG THE CODES AS DOC INSTEAD
+rm %{buildroot}%{_bindir}/{ColorFull_test,ColorPlay}
 
-# INSTALL CONFIG FILE TO LOCATE LIBS INSTALLED TO A NON-STD DIRECTORY
-echo "%{_libdir}/%{name}" > %{name}.conf
-install -Dm0644 %{name}.conf %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
+# MOVE LIBS INSTALLED TO STD LIBDIR
+mv %{buildroot}%{_libdir}/%{name}/* %{buildroot}%{_libdir}/
+rm -fr %{buildroot}%{_libdir}/%{name}/
 
 %post -n %{shlib} -p /sbin/ldconfig
 %postun -n %{shlib} -p /sbin/ldconfig
 
 %files -n %{shlib}
 %defattr(-,root,root)
-%config %{_sysconfdir}/ld.so.conf.d/%{name}.conf
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.so.*
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog README COPYING
 %doc Test/*.cc Examples/*.cc
-%{_libdir}/%{name}/*.so
+%{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
 

++++++ ColorFull-0.99.tar.gz -> ColorFull-1.1.tar.gz ++++++
++++ 68992 lines of diff (skipped)

++++++ ColorFull-install-pkgconfig-file.patch ++++++
--- /var/tmp/diff_new_pack.eovGPO/_old	2017-08-24 18:44:40.066734793 +0200
+++ /var/tmp/diff_new_pack.eovGPO/_new	2017-08-24 18:44:40.078733103 +0200
@@ -1,7 +1,7 @@
-Index: ColorFull-0.99/ColorFull.pc.in
+Index: ColorFull-1.1/ColorFull.pc.in
 ===================================================================
 --- /dev/null
-+++ ColorFull-0.99/ColorFull.pc.in
++++ ColorFull-1.1/ColorFull.pc.in
 @@ -0,0 +1,10 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -13,11 +13,11 @@
 +Version: @VERSION@
 +Libs: -L${libdir} -lColorFull
 +Cflags: -I${includedir}/ColorFull
-Index: ColorFull-0.99/Makefile.am
+Index: ColorFull-1.1/Makefile.am
 ===================================================================
---- ColorFull-0.99.orig/Makefile.am
-+++ ColorFull-0.99/Makefile.am
-@@ -4,9 +4,13 @@ Core \
+--- ColorFull-1.1.orig/Makefile.am
++++ ColorFull-1.1/Makefile.am
+@@ -4,5 +4,10 @@ Core \
  Test \
  Examples
  
@@ -26,24 +26,19 @@
 +
 +EXTRA_DIST = ColorFull.pc.in
 +
- if HAVE_MATCHBOX
- SUBDIRS += Matchbox
- endif
- 
  ACLOCAL_AMFLAGS = -I m4
--
-Index: ColorFull-0.99/configure.ac
+ 
+Index: ColorFull-1.1/configure.ac
 ===================================================================
---- ColorFull-0.99.orig/configure.ac
-+++ ColorFull-0.99/configure.ac
-@@ -26,12 +26,14 @@ AM_CPPFLAGS="-I\$(top_builddir)/include"
- AC_SUBST(AM_CPPFLAGS)
+--- ColorFull-1.1.orig/configure.ac
++++ ColorFull-1.1/configure.ac
+@@ -25,11 +25,13 @@ AC_PROG_LIBTOOL
  
- COLORFULL_CHECK_MATCHBOX
+ AM_CPPFLAGS="-I\$(top_builddir)/include"
+ AC_SUBST(AM_CPPFLAGS)
 +PKG_PROG_PKG_CONFIG([0.28])
  
  AC_CONFIG_FILES([Core/Makefile
- 		 Matchbox/Makefile
  		 Examples/Makefile
  		 Test/Makefile
  		 include/Makefile

    

root＠hilbert.suse.de

tags

participants (1)