From b03c3854be40126bbf12e16de33e7765e9a6ad3cd647e1ab79a08679e6c95540 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 4 Dec 2018 13:26:48 +0000 Subject: [PATCH] Accepting request 653811 from home:jengelh:branches:Base:System - Replace old $RPM_* shell vars; use macros where they are normally used in other packages. OBS-URL: https://build.opensuse.org/request/show/653811 OBS-URL: https://build.opensuse.org/package/show/Base:System/i2c-tools?expand=0&rev=52 --- i2c-tools.changes | 6 ++++++ i2c-tools.spec | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/i2c-tools.changes b/i2c-tools.changes index 3617867..b5e5f9f 100644 --- a/i2c-tools.changes +++ b/i2c-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 4 11:08:28 UTC 2018 - Jan Engelhardt + +- Replace old $RPM_* shell vars; use macros where they are + normally used in other packages. + ------------------------------------------------------------------- Mon Dec 3 16:30:06 CET 2018 - jdelvare@suse.com diff --git a/i2c-tools.spec b/i2c-tools.spec index 6cbb407..63fd098 100644 --- a/i2c-tools.spec +++ b/i2c-tools.spec @@ -45,7 +45,7 @@ libi2c offers a way for applications to interact with the devices connected to the I2C or SMBus buses of the system. %package -n libi2c0-devel -Summary: I2C/SMBus bus access library +Summary: Development files for the I2C/SMBus bus access library License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: glibc-devel @@ -60,12 +60,12 @@ connected to the I2C or SMBus buses of the system. %setup -q %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" BUILD_STATIC_LIB:=0 +make %{?_smp_mflags} CFLAGS="%{optflags}" CC="%{__cc}" BUILD_STATIC_LIB:=0 %install -make install DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr libdir=%{_libdir} BUILD_STATIC_LIB:=0 +%make_install PREFIX=/usr libdir=%{_libdir} BUILD_STATIC_LIB:=0 # cleanup -rm -f $RPM_BUILD_ROOT/usr/bin/decode-edid +rm -f "%{buildroot}/usr/bin/decode-edid" %post -n libi2c0 -p /sbin/ldconfig @@ -73,17 +73,17 @@ rm -f $RPM_BUILD_ROOT/usr/bin/decode-edid %files %defattr(-,root,root) -/usr/bin/* -/usr/sbin/* -%doc /usr/share/man/man1/*.1.gz -%doc /usr/share/man/man8/*.8.gz +%{_bindir}/* +%{_sbindir}/* +%{_mandir}/man1/*.1.gz +%{_mandir}/man8/*.8.gz %files -n libi2c0 %{_libdir}/libi2c.so.0* %files -n libi2c0-devel %{_libdir}/libi2c.so -%dir /usr/include/i2c -/usr/include/i2c/smbus.h +%dir %{_includedir}/i2c +%{_includedir}/i2c/smbus.h %changelog