pool/argyllcms
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 760861 from home:StefanBruens:branches:multimedia:color_management

Browse Source 
- Use pkgconfig(libpng) BuildRequires, the build system looks for
  the unversioned libpng.so and falls back to its bundled version.
- Remove bundled zlib source, otherwise it is built even when the
  system zlib is found. This triggers a fatal rpm check failure on
  Leap 15.x due to compiler warnings.
- Also remove bundled png/tiff/axTLS sources.
- Remove pkgconfig(mxml) dependency, ArgyllCMS bundles a patched one.

OBS-URL: https://build.opensuse.org/request/show/760861
OBS-URL: https://build.opensuse.org/package/show/multimedia:color_management/argyllcms?expand=0&rev=44
This commit is contained in:
Stanislav Brabec 2020-01-06 02:29:38 +00:00 committed by Git OBS Bridge
parent a24c96609d
commit 9addb59370
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
argyllcms.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Jan 5 02:53:35 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Use pkgconfig(libpng) BuildRequires, the build system looks for
the unversioned libpng.so and falls back to its bundled version.
- Remove bundled zlib source, otherwise it is built even when the
system zlib is found. This triggers a fatal rpm check failure on
Leap 15.x due to compiler warnings.
- Also remove bundled png/tiff/axTLS sources.
- Remove pkgconfig(mxml) dependency, ArgyllCMS bundles a patched one.
-------------------------------------------------------------------
Wed Dec 4 17:06:10 UTC 2019 - Richard Brown <rbrown@suse.com>

14
argyllcms.spec
View File

@ -29,15 +29,13 @@ Source0: http://www.argyllcms.com/%{tarname}_V%{version}_src.zip
Source1: 19-color.fdi
Source2: color-device-file.policy
Source3: ajam-2.5.2-1.3.3.tgz
Source4: %{name}.changes
Patch1: ajam-include.patch
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: libtool
BuildRequires: unzip
BuildRequires: pkgconfig(libpng12)
BuildRequires: pkgconfig(mxml)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xdmcp)
BuildRequires: pkgconfig(xext)
@ -74,8 +72,8 @@ viewer.
%package doc
Summary: Argyll CMS documentation
# Does not really make sense without Argyll CMS itself
Group: System/X11/Utilities
# Does not really make sense without Argyll CMS itself
Requires: %{name} = %{version}
%description doc
@ -93,6 +91,7 @@ cd ..
# remove unused source code
rm -fr usb/{*.inf,*.rtf,*.inf,*.cat,*.vcproj,*.sys,*.dsw,*.sln,*.dsp,*template*,WinCo*,winsub*,*kext*,KDRIVER_LICENSE,README_MSVC.txt,msvc,*.cmd,bin,driver,binfiles.*}
rm -fr zlib tiff png ccast/axTLS/*.c
%build
%define _lto_cflags %{nil}
@ -117,8 +116,8 @@ install -m 0755 -D bin/* %{buildroot}/%{_bindir}
install -m 0644 -D ref/* %{buildroot}/%{_datadir}/color/argyll/ref
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)
# ensure timestamp in shipped files is not changing for each rebuild (boo#916158)
TIMESTAMP=$(LC_ALL=C date --date=@${SOURCE_DATE_EPOCH} +%c)
sed -i -e 's/^CREATED .*/CREATED "$TIMESTAMP"/g' %{buildroot}%{_datadir}/color/argyll/ref/RefMediumGamut.gam
@ -129,16 +128,13 @@ chmod a-x *.txt
chmod a-x doc/*
%files
%defattr(-,root,root,-)
%doc *.txt
%{_bindir}/*
%dir %{_datadir}/color
%{_datadir}/color/argyll
%{_udevrulesdir}/55-Argyll.rules
%files doc
%defattr(-,root,root,-)
%doc doc/*.html doc/*.jpg doc/*.txt
%changelog