From 16a3703408de503b12d93423e89cce7aaae4d579 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 29 Aug 2012 09:54:19 +0100 Subject: [PATCH] New upstream version. - Remove upstreamed patch - Add include guards to cd-sample-window.h --- .gitignore | 1 + ...OLORD_H_INSIDE__-as-this-causes-incl.patch | 83 ------------------- colord-gtk.spec | 15 ++-- sources | 2 +- 4 files changed, 10 insertions(+), 91 deletions(-) delete mode 100644 0001-Do-not-reuse-__COLORD_H_INSIDE__-as-this-causes-incl.patch diff --git a/.gitignore b/.gitignore index a1fc94e..0214519 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /colord-gtk-0.1.22.tar.xz +/colord-gtk-0.1.23.tar.xz diff --git a/0001-Do-not-reuse-__COLORD_H_INSIDE__-as-this-causes-incl.patch b/0001-Do-not-reuse-__COLORD_H_INSIDE__-as-this-causes-incl.patch deleted file mode 100644 index edb60b2..0000000 --- a/0001-Do-not-reuse-__COLORD_H_INSIDE__-as-this-causes-incl.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 71510fc785e440c068cc42dbd294dba5d74eeaff Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Wed, 27 Jun 2012 09:00:15 +0100 -Subject: [PATCH] Do not reuse __COLORD_H_INSIDE__ as this causes #include - insanity - ---- - libcolord-gtk/cd-version.h.in | 2 +- - libcolord-gtk/cd-window-sync.h | 2 +- - libcolord-gtk/cd-window.h | 2 +- - libcolord-gtk/colord-gtk.h | 9 +++------ - 4 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/libcolord-gtk/cd-version.h.in b/libcolord-gtk/cd-version.h.in -index 5ad7569..555556a 100644 ---- a/libcolord-gtk/cd-version.h.in -+++ b/libcolord-gtk/cd-version.h.in -@@ -29,7 +29,7 @@ - * See also: #CdClient, #CdDevice - */ - --#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION) -+#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION) - #error "Only can be included directly." - #endif - -diff --git a/libcolord-gtk/cd-window-sync.h b/libcolord-gtk/cd-window-sync.h -index 6afe83b..47b8254 100644 ---- a/libcolord-gtk/cd-window-sync.h -+++ b/libcolord-gtk/cd-window-sync.h -@@ -19,7 +19,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION) -+#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION) - #error "Only can be included directly." - #endif - -diff --git a/libcolord-gtk/cd-window.h b/libcolord-gtk/cd-window.h -index 3b993a8..dbdab3e 100644 ---- a/libcolord-gtk/cd-window.h -+++ b/libcolord-gtk/cd-window.h -@@ -19,7 +19,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION) -+#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION) - #error "Only can be included directly." - #endif - -diff --git a/libcolord-gtk/colord-gtk.h b/libcolord-gtk/colord-gtk.h -index 658ec60..4080667 100644 ---- a/libcolord-gtk/colord-gtk.h -+++ b/libcolord-gtk/colord-gtk.h -@@ -31,20 +31,17 @@ - #ifndef __COLORD_GTK_H__ - #define __COLORD_GTK_H__ - --#define __COLORD_H_INSIDE__ -+#define __COLORD_GTK_H_INSIDE__ - - #include -- - #include --//#include --//#include --//#include -+ - #include - #include - #include - #include - --#undef __COLORD_H_INSIDE__ -+#undef __COLORD_GTK_H_INSIDE__ - - #endif /* __COLORD_GTK_H__ */ - --- -1.7.10.2 - diff --git a/colord-gtk.spec b/colord-gtk.spec index d281e86..cec4e95 100644 --- a/colord-gtk.spec +++ b/colord-gtk.spec @@ -1,18 +1,15 @@ Summary: GTK support library for colord Name: colord-gtk -Version: 0.1.22 -Release: 3%{?dist} +Version: 0.1.23 +Release: 1%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/software/colord/ Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz -# Upstream already -Patch0: 0001-Do-not-reuse-__COLORD_H_INSIDE__-as-this-causes-incl.patch - BuildRequires: docbook-utils BuildRequires: gettext BuildRequires: glib2-devel -BuildRequires: colord-devel +BuildRequires: colord-devel >= 0.1.23 BuildRequires: intltool BuildRequires: lcms2-devel >= 2.2 BuildRequires: gobject-introspection-devel @@ -33,7 +30,6 @@ Files for development with %{name}. %prep %setup -q -%patch0 -p1 -b .includes %build %configure \ @@ -76,6 +72,11 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' %dir %{_datadir}/gtk-doc/html %changelog +* Wed Aug 29 2012 Richard Hughes 0.1.23-1 +- New upstream version. +- Remove upstreamed patch +- Add include guards to cd-sample-window.h + * Wed Jul 18 2012 Fedora Release Engineering - 0.1.22-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 52ea820..6488d0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1375d6273e6400110ce33f6f77039b7b colord-gtk-0.1.22.tar.xz +019fa6f9349ef39d1bd28c3dcf6fb191 colord-gtk-0.1.23.tar.xz