Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crystalhd-libs for openSUSE:Factory checked in at 2021-09-30 23:43:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crystalhd-libs (Old)
and /work/SRC/openSUSE:Factory/.crystalhd-libs.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crystalhd-libs"
Thu Sep 30 23:43:58 2021 rev:15 rq:922405 version:3.6.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/crystalhd-libs/crystalhd-libs.changes 2018-04-16 12:47:33.340240931 +0200
+++ /work/SRC/openSUSE:Factory/.crystalhd-libs.new.2443/crystalhd-libs.changes 2021-09-30 23:45:16.272598246 +0200
@@ -1,0 +2,5 @@
+Tue Sep 28 12:41:13 UTC 2021 - Ludwig Nussel
+
+- Use %_firmwaredir (boo#1029961, crystalhd-firmwaredir.patch)
+
+-------------------------------------------------------------------
New:
----
crystalhd-firmwaredir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crystalhd-libs.spec ++++++
--- /var/tmp/diff_new_pack.LhITFl/_old 2021-09-30 23:45:16.736598778 +0200
+++ /var/tmp/diff_new_pack.LhITFl/_new 2021-09-30 23:45:16.740598782 +0200
@@ -1,7 +1,7 @@
#
# spec file for package crystalhd-libs
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,10 +12,13 @@
# 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/
#
+%if %{undefined _firmwaredir}
+%define _firmwaredir /lib/firmware
+%endif
Name: crystalhd-libs
Version: 3.6.5
Release: 0
@@ -28,6 +31,7 @@
Source2: LICENSE
Source3: baselibs.conf
Patch0: %{name}-define-first.patch
+Patch1: crystalhd-firmwaredir.patch
BuildRequires: gcc-c++
ExclusiveArch: %ix86 x86_64
@@ -62,8 +66,9 @@
Firmwares for the Broadcom Crystal HD video decoders.
%prep
-%setup -q -n crystalhd-libs
+%setup -n crystalhd-libs
%patch0
+%patch1
cp %{SOURCE1} .
cp %{SOURCE2} .
@@ -72,9 +77,7 @@
make %{?_smp_mflags}
%install
-%make_install LIBDIR=%{_libdir}
-mkdir -p %{buildroot}/lib/firmware
-cp *.bin %{buildroot}/lib/firmware/
+%make_install LIBDIR=%{_libdir} FIRMWAREDIR="%{_firmwaredir}"
%post -n libcrystalhd3 -p /sbin/ldconfig
%postun -n libcrystalhd3 -p /sbin/ldconfig
@@ -89,6 +92,6 @@
%{_libdir}/libcrystalhd.so
%files -n crystalhd-firmware
-/lib/firmware/*
+%{_firmwaredir}/*
%changelog
++++++ crystalhd-firmwaredir.patch ++++++
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -8,6 +8,7 @@ BCLIB_NAME=libcrystalhd.so
BCLIB_SL=$(BCLIB_NAME).$(BCLIB_MAJOR)
BCLIB=$(BCLIB_NAME).$(BCLIB_MAJOR).$(BCLIB_MINOR)
LIBDIR=/usr/lib
+FIRMWAREDIR=/lib/firmware
AT = @
ECHO = ${AT} echo
@@ -45,7 +46,7 @@ clean:
install:
mkdir -p $(DESTDIR)$(LIBDIR)
- mkdir -p $(DESTDIR)/lib/firmware
+ mkdir -p $(DESTDIR)$(FIRMWAREDIR)
mkdir -p $(DESTDIR)/usr/include/libcrystalhd
cp libcrystalhd_if.h $(DESTDIR)/usr/include/libcrystalhd/
chmod 0644 $(DESTDIR)/usr/include/libcrystalhd/libcrystalhd_if.h
@@ -55,10 +56,10 @@ install:
chmod 0644 $(DESTDIR)/usr/include/libcrystalhd/bc_dts_types.h
cp libcrystalhd_version.h $(DESTDIR)/usr/include/libcrystalhd/
chmod 0644 $(DESTDIR)/usr/include/libcrystalhd/libcrystalhd_version.h
- cp bcm70012fw.bin $(DESTDIR)/lib/firmware/
- chmod 0644 $(DESTDIR)/lib/firmware/bcm70012fw.bin
- cp bcm70015fw.bin $(DESTDIR)/lib/firmware/
- chmod 0644 $(DESTDIR)/lib/firmware/bcm70015fw.bin
+ cp bcm70012fw.bin $(DESTDIR)$(FIRMWAREDIR)
+ chmod 0644 $(DESTDIR)$(FIRMWAREDIR)/bcm70012fw.bin
+ cp bcm70015fw.bin $(DESTDIR)$(FIRMWAREDIR)/
+ chmod 0644 $(DESTDIR)$(FIRMWAREDIR)/bcm70015fw.bin
install -m 755 $(BCLIB) $(DESTDIR)$(LIBDIR)
(cd $(DESTDIR)$(LIBDIR); ln -sf $(BCLIB) $(BCLIB_NAME))
(cd $(DESTDIR)$(LIBDIR); ln -sf $(BCLIB) $(BCLIB_SL))