Hello community, here is the log from the commit of package scmon for openSUSE:Factory checked in at 2012-03-23 12:10:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scmon (Old) and /work/SRC/openSUSE:Factory/.scmon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scmon", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/scmon/scmon.changes 2011-09-23 12:45:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scmon.new/scmon.changes 2012-03-23 12:10:38.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 21 21:45:34 UTC 2012 - [email protected] + +- Add scmon-glib231.patch: Fix build with glib 2.31. Only glib.h + can be #included. + +------------------------------------------------------------------- New: ---- scmon-glib231.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scmon.spec ++++++ --- /var/tmp/diff_new_pack.jI818C/_old 2012-03-23 12:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.jI818C/_new 2012-03-23 12:10:40.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package scmon (Version 0.3) +# spec file for package scmon # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,28 +16,37 @@ # - Name: scmon Summary: Makes waiting for smart card events easy -Version: 0.3 -Release: 90 License: GPL-2.0 Group: System/Daemons +Version: 0.3 +Release: 0 Url: http://code.google.com/p/loolixbodes/wiki/scmon Source0: http://scmon.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: scmon.diff Patch1: scmon-init.patch Patch2: scmon-retval-fix.patch +Patch3: scmon-glib231.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig %if 0%{?suse_version} <= 1010 -BuildRequires: dbus-1-devel mozilla-nspr-devel mozilla-nss-devel +BuildRequires: dbus-1-devel +BuildRequires: mozilla-nspr-devel +BuildRequires: mozilla-nss-devel %endif %if 0%{?suse_version} >= 1020 -BuildRequires: dbus-1-devel dbus-1-glib-devel mozilla-nspr-devel mozilla-nss-devel +BuildRequires: dbus-1-devel +BuildRequires: dbus-1-glib-devel +BuildRequires: mozilla-nspr-devel +BuildRequires: mozilla-nss-devel %endif %if 0%{?fedora_version} == 6 -BuildRequires: dbus-devel dbus-glib-devel fedora-release nspr-devel nss-devel +BuildRequires: dbus-devel +BuildRequires: dbus-glib-devel +BuildRequires: fedora-release +BuildRequires: nspr-devel +BuildRequires: nss-devel %endif %description @@ -59,6 +68,7 @@ %patch0 %patch1 %patch2 +%patch3 -p1 %build %configure ++++++ scmon-glib231.patch ++++++ Index: scmon-0.3/monitor/sclog.h =================================================================== --- scmon-0.3.orig/monitor/sclog.h +++ scmon-0.3/monitor/sclog.h @@ -28,8 +28,7 @@ #define SC_LOG_H #include <stdio.h> -#include <glib/gmessages.h> -#include <glib/gerror.h> +#include <glib.h> #define SC_LOG_ERROR (sc_log_error_quark ()) GQuark sc_log_error_quark (void); Index: scmon-0.3/monitor/scerror.c =================================================================== --- scmon-0.3.orig/monitor/scerror.c +++ scmon-0.3/monitor/scerror.c @@ -26,9 +26,7 @@ #include "scerror.h" -#include <glib/gmem.h> -#include <glib/gstrfuncs.h> -#include <glib/gutils.h> +#include <glib.h> #include <string.h> void Index: scmon-0.3/monitor/scerror.h =================================================================== --- scmon-0.3.orig/monitor/scerror.h +++ scmon-0.3/monitor/scerror.h @@ -26,7 +26,7 @@ #define SC_ERROR_H #include <stdarg.h> -#include <glib/gerror.h> +#include <glib.h> #include "sclog.h" Index: scmon-0.3/monitor/sclog.c =================================================================== --- scmon-0.3.orig/monitor/sclog.c +++ scmon-0.3/monitor/sclog.c @@ -31,8 +31,7 @@ #include "scerror.h" #include <glib/gi18n.h> -#include <glib/gmem.h> -#include <glib/gutils.h> +#include <glib.h> #include <sys/types.h> #include <sys/stat.h> Index: scmon-0.3/monitor/scmon.c =================================================================== --- scmon-0.3.orig/monitor/scmon.c +++ scmon-0.3/monitor/scmon.c @@ -31,7 +31,7 @@ #include "sclog.h" #include <glib/gi18n.h> -#include <glib/gthread.h> +#include <glib.h> #include <stdlib.h> #include <string.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
