Accepting request 122093 from home:Zaitor:branches:GNOME:Factory
Forgot to run pre_checkin.sh.... Cleanup post rewiew OBS-URL: https://build.opensuse.org/request/show/122093 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=40
This commit is contained in:
parent
78a1f22f6a
commit
95e67e5621
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:45d6e7e73c9eab9f3f3c0eec8d008fd96c147333aeb4a77a2c2695657e48ae58
|
||||
size 551408
|
3
colord-0.1.21.tar.xz
Normal file
3
colord-0.1.21.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:360b896b0d2a35970a0cd42e448ea327d789f309ff95022190c4d33bb8b02c30
|
||||
size 553424
|
@ -1,35 +0,0 @@
|
||||
From 67f6b43497d55b99b30c412fa8d0e8f3782f1969 Mon Sep 17 00:00:00 2001
|
||||
From: Yanko Kaneti <yaneti@declera.com>
|
||||
Date: Thu, 10 May 2012 10:23:27 +0300
|
||||
Subject: [PATCH] Isolate gtk dependency to cd-convert
|
||||
|
||||
Signed-off-by: Richard Hughes <richard@hughsie.com>
|
||||
---
|
||||
client/Makefile.am | 5 ++++-
|
||||
1 files changed, 4 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/client/Makefile.am b/client/Makefile.am
|
||||
index 9458026..2e972d5 100644
|
||||
--- a/client/Makefile.am
|
||||
+++ b/client/Makefile.am
|
||||
@@ -13,7 +13,9 @@ INCLUDES = \
|
||||
-DLOCALEDIR=\""$(localedir)"\"
|
||||
|
||||
COLORD_LIBS = \
|
||||
- $(top_builddir)/libcolord/libcolord.la \
|
||||
+ $(top_builddir)/libcolord/libcolord.la
|
||||
+
|
||||
+COLORD_GTK_LIBS = \
|
||||
$(top_builddir)/libcolord-gtk/libcolord-gtk.la
|
||||
|
||||
noinst_LIBRARIES = libclientprivate.a
|
||||
@@ -74,6 +76,7 @@ colord_convert_SOURCES = \
|
||||
colord_convert_LDADD = \
|
||||
$(LCMS_LIBS) \
|
||||
$(COLORD_LIBS) \
|
||||
+ $(COLORD_GTK_LIBS) \
|
||||
$(GTK_LIBS) \
|
||||
$(GLIB_LIBS) \
|
||||
-lm
|
||||
--
|
||||
1.7.6
|
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 23 19:18:54 UTC 2012 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 0.1.21:
|
||||
+ Do not add sensors that are ignored or have no caps.
|
||||
+ Do not install any parts of colord-sane if --disable-sane is
|
||||
specified.
|
||||
+ Do not use 'WantedBy=graphical.target' in the shipped systemd
|
||||
file.
|
||||
+ Fix autotools when configuring without systemd.
|
||||
+ Fix InstallSystemWide() by not writing a private file.
|
||||
+ Fix srcdir != builddir with introspection enabled.
|
||||
+ Fix the description in the systemd service file.
|
||||
+ Isolate gtk dependency to cd-convert.
|
||||
+ Save the CCMX and ITx files to be compatible with argyllcms
|
||||
+ The ColorHug has a new VID and PID.
|
||||
- Drop colord-build-no-gtk.patch, fixed upstream.
|
||||
- Removed call to gnome-autogen.sh and drop gnome-common
|
||||
buildrequires, only needed for above dropped patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 14 09:53:20 UTC 2012 - vuntz@opensuse.org
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
# Do not edit this auto generated file! Edit colord.spec.
|
||||
Name: colord-gtk
|
||||
%define _name colord
|
||||
Version: 0.1.20
|
||||
Version: 0.1.21
|
||||
Release: 0
|
||||
Summary: System Daemon for Managing Color Devices
|
||||
License: GPL-2.0+
|
||||
@ -29,10 +29,7 @@ Group: System/Daemons
|
||||
Url: http://colord.hughsie.com/
|
||||
Source0: http://www.freedesktop.org/software/colord/releases/%{_name}-%{version}.tar.xz
|
||||
Source99: baselibs.conf
|
||||
Patch0: colord-build-no-gtk.patch
|
||||
BuildRequires: gobject-introspection-devel
|
||||
# needed for patch0
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: intltool
|
||||
BuildRequires: sane-backends-devel
|
||||
BuildRequires: vala
|
||||
@ -134,9 +131,6 @@ there are no users logged in.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
%patch0 -p1
|
||||
# needed for patch0
|
||||
NOCONFIGURE=1 gnome-autogen.sh
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 23 19:18:54 UTC 2012 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 0.1.21:
|
||||
+ Do not add sensors that are ignored or have no caps.
|
||||
+ Do not install any parts of colord-sane if --disable-sane is
|
||||
specified.
|
||||
+ Do not use 'WantedBy=graphical.target' in the shipped systemd
|
||||
file.
|
||||
+ Fix autotools when configuring without systemd.
|
||||
+ Fix InstallSystemWide() by not writing a private file.
|
||||
+ Fix srcdir != builddir with introspection enabled.
|
||||
+ Fix the description in the systemd service file.
|
||||
+ Isolate gtk dependency to cd-convert.
|
||||
+ Save the CCMX and ITx files to be compatible with argyllcms
|
||||
+ The ColorHug has a new VID and PID.
|
||||
- Drop colord-build-no-gtk.patch, fixed upstream.
|
||||
- Removed call to gnome-autogen.sh and drop gnome-common
|
||||
buildrequires, only needed for above dropped patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 14 09:53:20 UTC 2012 - vuntz@opensuse.org
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
Name: colord
|
||||
%define _name colord
|
||||
Version: 0.1.20
|
||||
Version: 0.1.21
|
||||
Release: 0
|
||||
Summary: System Daemon for Managing Color Devices
|
||||
License: GPL-2.0+
|
||||
@ -28,10 +28,7 @@ Group: System/Daemons
|
||||
Url: http://colord.hughsie.com/
|
||||
Source0: http://www.freedesktop.org/software/colord/releases/%{_name}-%{version}.tar.xz
|
||||
Source99: baselibs.conf
|
||||
Patch0: colord-build-no-gtk.patch
|
||||
BuildRequires: gobject-introspection-devel
|
||||
# needed for patch0
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: intltool
|
||||
BuildRequires: sane-backends-devel
|
||||
BuildRequires: vala
|
||||
@ -133,9 +130,6 @@ there are no users logged in.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
%patch0 -p1
|
||||
# needed for patch0
|
||||
NOCONFIGURE=1 gnome-autogen.sh
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
Loading…
Reference in New Issue
Block a user