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
This commit is contained in:
Stanislav Brabec 2019-06-18 23:20:43 +00:00 committed by Git OBS Bridge
parent 671f85256c
commit a3daf6d636
2 changed files with 12 additions and 11 deletions

View File

@ -3,6 +3,12 @@ Wed Apr 24 09:16:27 UTC 2019 - Martin Liška <mliska@suse.cz>
- Disable LTO (boo#1133108).
-------------------------------------------------------------------
Thu Mar 21 11:30:20 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- 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

View File

@ -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)