From 67a37d4f4a856462864f2d6aaf234f240c72774877f989bb471b1b0af52dd099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Tue, 24 Feb 2015 06:51:56 +0000 Subject: [PATCH 1/2] Accepting request 287329 from home:msmeissn:branches:multimedia:color_management - allow building with udev-mini by using pkgconfig(udev) - do not rpm -q udev OBS-URL: https://build.opensuse.org/request/show/287329 OBS-URL: https://build.opensuse.org/package/show/multimedia:color_management/argyllcms?expand=0&rev=28 --- argyllcms.changes | 10 ++++++++++ argyllcms.spec | 10 +++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/argyllcms.changes b/argyllcms.changes index e4fb661..2967c9d 100644 --- a/argyllcms.changes +++ b/argyllcms.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Feb 23 13:55:20 UTC 2015 - meissner@suse.com + +- allow building with udev-mini by using pkgconfig(udev) + +------------------------------------------------------------------- +Mon Feb 23 13:48:38 UTC 2015 - meissner@suse.com + +- do not rpm -q udev + ------------------------------------------------------------------- Wed Feb 4 10:23:32 UTC 2015 - fcrozat@suse.com diff --git a/argyllcms.spec b/argyllcms.spec index 7ce3689..75f445e 100644 --- a/argyllcms.spec +++ b/argyllcms.spec @@ -1,7 +1,7 @@ # # spec file for package argyllcms # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,7 @@ # -%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 -%define _udevrulesdir /usr/lib/udev/rules.d -%else -%define _udevrulesdir /lib/udev/rules.d -%endif +%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d %define archivename Argyll_V%{version}%{?alphaversion}_src.zip @@ -58,7 +54,7 @@ BuildRequires: xorg-x11-devel BuildRequires: bison BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: udev +BuildRequires: pkgconfig(udev) Requires: udev %if 0%{?suse_version} < 1120 BuildRequires: hal From aa7b50aed8db6c1536d9c3a1cd11a35e53ccf6d3960f71efa39b1a1a87719207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Wed, 25 Feb 2015 06:45:08 +0000 Subject: [PATCH 2/2] Accepting request 287548 from home:rguenther:branches:multimedia:color_management - Use -std=gnu89 for building to not run into broken __declspec uses with the GCC 5 default of -std=gnu99. OBS-URL: https://build.opensuse.org/request/show/287548 OBS-URL: https://build.opensuse.org/package/show/multimedia:color_management/argyllcms?expand=0&rev=29 --- argyllcms.changes | 6 ++++++ argyllcms.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/argyllcms.changes b/argyllcms.changes index 2967c9d..9cdc062 100644 --- a/argyllcms.changes +++ b/argyllcms.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 24 15:00:24 UTC 2015 - rguenther@suse.com + +- Use -std=gnu89 for building to not run into broken __declspec + uses with the GCC 5 default of -std=gnu99. + ------------------------------------------------------------------- Mon Feb 23 13:55:20 UTC 2015 - meissner@suse.com diff --git a/argyllcms.spec b/argyllcms.spec index 75f445e..ca0e42a 100644 --- a/argyllcms.spec +++ b/argyllcms.spec @@ -1,7 +1,7 @@ # # spec file for package argyllcms # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -118,11 +118,11 @@ rm -fr usb/{*.inf,*.rtf,*.inf,*.cat,*.vcproj,*.sys,*.dsw,*.sln,*.dsp,*template*, %build cd ajam-2.5.2-1.3.3 -make CFLAGS="${RPM_OPT_FLAGS}" +make CFLAGS="-std=gnu89 ${RPM_OPT_FLAGS}" ln -s $PWD/bin.unix/jam ../jam cd .. -echo "CCFLAGS += ${RPM_OPT_FLAGS} -fno-strict-aliasing ;" >> Jamtop +echo "CCFLAGS += -std=gnu89 ${RPM_OPT_FLAGS} -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