From a3daf6d6365dc2e725a2e6e94364e8ce02c1b5281580a82d1d824817b97535da Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 18 Jun 2019 23:20:43 +0000 Subject: [PATCH] Accepting request 687307 from home:jengelh:sct - Modernize old $RPM_* shell variables and tar options. - Avoid bash-specific pathname expansion syntax in %install. OBS-URL: https://build.opensuse.org/request/show/687307 OBS-URL: https://build.opensuse.org/package/show/multimedia:color_management/argyllcms?expand=0&rev=41 --- argyllcms.changes | 6 ++++++ argyllcms.spec | 17 ++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/argyllcms.changes b/argyllcms.changes index 5b023d0..d73b566 100644 --- a/argyllcms.changes +++ b/argyllcms.changes @@ -3,6 +3,12 @@ Wed Apr 24 09:16:27 UTC 2019 - Martin Liška - Disable LTO (boo#1133108). +------------------------------------------------------------------- +Thu Mar 21 11:30:20 UTC 2019 - Jan Engelhardt + +- Modernize old $RPM_* shell variables and tar options. +- Avoid bash-specific pathname expansion syntax in %install. + ------------------------------------------------------------------- Mon Dec 11 15:46:05 UTC 2017 - crrodriguez@opensuse.org diff --git a/argyllcms.spec b/argyllcms.spec index ee818fb..95ba444 100644 --- a/argyllcms.spec +++ b/argyllcms.spec @@ -85,10 +85,8 @@ displays. This package contains the Argyll color management system documentation. %prep -%setup -q -n %{tarname}_V%{version} +%setup -q -n %{tarname}_V%{version} -a3 %patch2 -p1 - -tar xf %{SOURCE3} cd ajam-2.5.2-1.3.3 %patch1 -p1 -b .include cd .. @@ -99,11 +97,11 @@ rm -fr usb/{*.inf,*.rtf,*.inf,*.cat,*.vcproj,*.sys,*.dsw,*.sln,*.dsp,*template*, %build %define _lto_cflags %{nil} cd ajam-2.5.2-1.3.3 -make CFLAGS="-std=gnu89 ${RPM_OPT_FLAGS}" +make CFLAGS="-std=gnu89 %{optflags}" ln -s $PWD/bin.unix/jam ../jam cd .. -echo "CCFLAGS += -std=gnu89 ${RPM_OPT_FLAGS} -fno-strict-aliasing ;" >> Jamtop +echo "CCFLAGS += -std=gnu89 %{optflags} -fno-strict-aliasing ;" >> Jamtop # Evil hack to get --as-needed working. The build system unfortunately lists all # the shared libraries by default on the command line _before_ the object to be built... echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop @@ -114,13 +112,10 @@ echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXd ./jam -q -fJambase install rm bin/License.txt - -mkdir -p $RPM_BUILD_ROOT/{%{_bindir},%{_datadir}/color/argyll/ref} - -install -m 0755 -D bin/* $RPM_BUILD_ROOT/%{_bindir} - +mkdir -p %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/color/argyll/ref +install -m 0755 -D bin/* %{buildroot}/%{_bindir} install -m 0644 -D ref/* %{buildroot}/%{_datadir}/color/argyll/ref -rm -f $RPM_BUILD_ROOT/%{_datadir}/color/argyll/License.txt +rm -f %{buildroot}/%{_datadir}/color/argyll/License.txt # ensure timestamp is shipped files is not changing for each rebuild (boo#916158) TIMESTAMP=$(LC_ALL=C date -r %{SOURCE4} +%c)