Hello community, here is the log from the commit of package cmrt for openSUSE:Factory checked in at 2020-06-23 21:04:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmrt (Old) and /work/SRC/openSUSE:Factory/.cmrt.new.2956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmrt" Tue Jun 23 21:04:41 2020 rev:2 rq:816544 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/cmrt/cmrt.changes 2017-09-23 21:33:49.929650242 +0200 +++ /work/SRC/openSUSE:Factory/.cmrt.new.2956/cmrt.changes 2020-06-23 21:05:06.921943194 +0200 @@ -1,0 +2,11 @@ +Tue Jun 23 07:35:00 UTC 2020 - Jan Engelhardt <jeng...@inai.de> + +- Update Group lines. + +------------------------------------------------------------------- +Mon Jun 22 17:43:31 UTC 2020 - Stefan Dirsch <sndir...@suse.com> + +- n_UsrEtc.patch + * switch to /usr/etc location for cmrt.conf (boo#1173035) + +------------------------------------------------------------------- New: ---- n_UsrEtc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmrt.spec ++++++ --- /var/tmp/diff_new_pack.SBeNw8/_old 2020-06-23 21:05:08.209947356 +0200 +++ /var/tmp/diff_new_pack.SBeNw8/_new 2020-06-23 21:05:08.213947369 +0200 @@ -1,7 +1,7 @@ # # spec file for package cmrt # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2017 Bjørn Lie, Bryne, Norway. # # All modifications and additions to the file contributed by third parties @@ -13,18 +13,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define sover 1 +%if 0%{?suse_version} < 1550 + %define _distconfdir /usr/etc +%endif + Name: cmrt Version: 1.0.6 Release: 0 Summary: C for Media Runtime License: MIT -Url: https://github.com/01org/cmrt +Group: Development/Libraries/C and C++ +URL: https://github.com/01org/cmrt Source0: https://github.com/01org/cmrt/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: n_UsrEtc.patch BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig @@ -52,45 +59,39 @@ %package devel Summary: Development files for the C for Media Runtime -Group: Development/System/Libraries +Group: Development/Libraries/C and C++ Requires: libcmrt%{sover} = %{version} - %description devel Media GPU kernel manager for Intel G45 & HD Graphics family, development files. %prep -%autosetup - +%autosetup -p1 %build autoreconf -fiv %configure make - %install %make_install find %{buildroot} -type f -name "*.la" -delete -print - %post -n libcmrt1 -p /sbin/ldconfig %postun -n libcmrt1 -p /sbin/ldconfig - %files -n libcmrt%{sover} %doc COPYING NEWS README -%config(noreplace) %{_sysconfdir}/%{name}.conf +%dir %{_distconfdir} +%{_distconfdir}/%{name}.conf %{_libdir}/lib%{name}.so.* - %files devel %{_includedir}/cm_rt.h %{_includedir}/cm_rt_linux.h %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/libcmrt.pc - %changelog ++++++ n_UsrEtc.patch ++++++ diff -u -r cmrt-1.0.6.orig/src/Makefile.am cmrt-1.0.6/src/Makefile.am --- cmrt-1.0.6.orig/src/Makefile.am 2016-09-08 01:51:38.000000000 +0200 +++ cmrt-1.0.6/src/Makefile.am 2020-06-22 19:25:53.324412000 +0200 @@ -110,7 +110,7 @@ libcmrt_la_LTLIBRARIES = libcmrt.la libcmrt_ladir = $(libdir) cmrtincludedir = $(includedir) -cmrtconfdir = $(sysconfdir) +cmrtconfdir = /usr/etc libcmrt_la_CFLAGS = $(cmrt_cflags) libcmrt_la_CXXFLAGS = -fpermissive $(cmrt_cflags) libcmrt_la_LDFLAGS = $(cmrt_ldflags) diff -u -r cmrt-1.0.6.orig/src/readconf.cpp cmrt-1.0.6/src/readconf.cpp --- cmrt-1.0.6.orig/src/readconf.cpp 2016-09-08 01:51:38.000000000 +0200 +++ cmrt-1.0.6/src/readconf.cpp 2020-06-22 18:02:56.253756000 +0200 @@ -57,6 +57,8 @@ const char* filename = SYSCONFDIR"/cmrt.conf"; std::ifstream file(filename); + if (!file) + std::ifstream file("/usr/etc/cmrt.conf"); char line[1024]; while (file.getline(line, 1024)) {
