Accepting request 80870 from home:vuntz:branches:GNOME:Factory
Update to 0.6.14 OBS-URL: https://build.opensuse.org/request/show/80870 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=12
This commit is contained in:
Vincent Untz
Git OBS Bridge
parent
6a86e808c7
commit
8b65dc3fee
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c385ae9c0af9fae16348408563845cf7a0d5d4bfb6279ba02fbb9d915f71a943
|
||||
size 285196
|
||||
3
accountsservice-0.6.14.tar.xz
Normal file
3
accountsservice-0.6.14.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fcf26f5198521392f11078a9177e430e0ca09bd6bc481b106fc0cbbc586bfd64
|
||||
size 286220
|
||||
@ -1,4 +1,4 @@
|
||||
commit 17b2f0915c0ee6e3bb1e3800691bd8d8843aad49
|
||||
commit c3360e3878722b0fefdda02a320f6fb76a41b7da
|
||||
Author: Vincent Untz <vuntz@gnome.org>
|
||||
Date: Wed Jul 20 16:48:41 2011 +0200
|
||||
|
||||
@ -18,7 +18,7 @@ index 90fce6c..d65a6c8 100644
|
||||
daemon.h \
|
||||
daemon.c \
|
||||
diff --git a/src/daemon.c b/src/daemon.c
|
||||
index ec319a9..3291de8 100644
|
||||
index 79915a7..389d9fc 100644
|
||||
--- a/src/daemon.c
|
||||
+++ b/src/daemon.c
|
||||
@@ -46,6 +46,7 @@
|
||||
@ -29,7 +29,7 @@ index ec319a9..3291de8 100644
|
||||
|
||||
#define PATH_PASSWD "/etc/passwd"
|
||||
#define PATH_SHADOW "/etc/shadow"
|
||||
@@ -455,7 +456,7 @@ reload_autologin_timeout (Daemon *daemon)
|
||||
@@ -457,7 +458,7 @@ reload_autologin_timeout (Daemon *daemon)
|
||||
daemon->priv->autologin_id = 0;
|
||||
|
||||
if (!load_autologin (daemon, &name, &enabled, &error)) {
|
||||
@ -38,7 +38,7 @@ index ec319a9..3291de8 100644
|
||||
g_error_free (error);
|
||||
g_free (name);
|
||||
|
||||
@@ -1200,6 +1201,43 @@ daemon_local_check_auth (Daemon *daemon,
|
||||
@@ -1257,6 +1258,43 @@ daemon_local_check_auth (Daemon *daemon,
|
||||
g_object_unref (subject);
|
||||
}
|
||||
|
||||
@ -82,24 +82,24 @@ index ec319a9..3291de8 100644
|
||||
gboolean
|
||||
load_autologin (Daemon *daemon,
|
||||
gchar **name,
|
||||
@@ -1211,6 +1249,8 @@ load_autologin (Daemon *daemon,
|
||||
@@ -1267,6 +1305,8 @@ load_autologin (Daemon *daemon,
|
||||
GError *local_error;
|
||||
gchar *string;
|
||||
|
||||
+ return load_autologin_suse (daemon, name, enabled, error);
|
||||
+
|
||||
filename = "/etc/gdm/custom.conf";
|
||||
|
||||
keyfile = g_key_file_new ();
|
||||
@@ -1261,6 +1301,8 @@ save_autologin (Daemon *daemon,
|
||||
if (!g_key_file_load_from_file (keyfile,
|
||||
PATH_GDM_CUSTOM,
|
||||
@@ -1314,6 +1354,8 @@ save_autologin (Daemon *daemon,
|
||||
gchar *data;
|
||||
gboolean result;
|
||||
|
||||
+ return save_autologin_suse (daemon, name, enabled, error);
|
||||
+
|
||||
filename = "/etc/gdm/custom.conf";
|
||||
|
||||
keyfile = g_key_file_new ();
|
||||
if (!g_key_file_load_from_file (keyfile,
|
||||
PATH_GDM_CUSTOM,
|
||||
diff --git a/src/gdm-sysconfig.c b/src/gdm-sysconfig.c
|
||||
new file mode 100644
|
||||
index 0000000..56c86cd
|
||||
@ -639,33 +639,3 @@ index 0000000..b00aa4e
|
||||
+G_END_DECLS
|
||||
+
|
||||
+#endif /* __GDM_SYSCONFIG_H */
|
||||
Index: accountsservice-0.6.13/src/Makefile.in
|
||||
===================================================================
|
||||
--- accountsservice-0.6.13.orig/src/Makefile.in
|
||||
+++ accountsservice-0.6.13/src/Makefile.in
|
||||
@@ -48,7 +48,7 @@ CONFIG_CLEAN_VPATH_FILES =
|
||||
am__installdirs = "$(DESTDIR)$(libexecdir)"
|
||||
PROGRAMS = $(libexec_PROGRAMS)
|
||||
am__objects_1 =
|
||||
-am_accounts_daemon_OBJECTS = $(am__objects_1) daemon.$(OBJEXT) \
|
||||
+am_accounts_daemon_OBJECTS = $(am__objects_1) gdm-sysconfig.$(OBJEXT) daemon.$(OBJEXT) \
|
||||
user.$(OBJEXT) util.$(OBJEXT) main.$(OBJEXT)
|
||||
accounts_daemon_OBJECTS = $(am_accounts_daemon_OBJECTS)
|
||||
am__DEPENDENCIES_1 =
|
||||
@@ -312,6 +312,8 @@ BUILT_SOURCES = \
|
||||
accounts_daemon_SOURCES = \
|
||||
$(enums_h_sources) \
|
||||
$(BUILT_SOURCES) \
|
||||
+ gdm-sysconfig.c \
|
||||
+ gdm-sysconfig.h \
|
||||
types.h \
|
||||
daemon.h \
|
||||
daemon.c \
|
||||
@@ -416,6 +418,7 @@ mostlyclean-compile:
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-sysconfig.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daemon.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Po@am__quote@
|
||||
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 5 06:30:54 UTC 2011 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 0.6.14:
|
||||
+ Ignore extraneous SetAutomaticLogin(false) calls for a user
|
||||
+ Monitor /etc/gdm/custom.conf for changes in autologin config
|
||||
+ Fix fast user switching
|
||||
+ Fix docs to build
|
||||
+ Updated translations.
|
||||
- Rebase accountsservice-sysconfig.patch, and add gnome-common
|
||||
BuildRequires and call to gnome-autogen.sh since it's easier to
|
||||
rebase the patch without Makefile.in.
|
||||
- Add gobject-introspection-devel BuildRequires to build
|
||||
introspection data.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 20 16:51:05 CEST 2011 - vuntz@opensuse.org
|
||||
|
||||
|
||||
@ -18,8 +18,8 @@
|
||||
|
||||
|
||||
Name: accountsservice
|
||||
Version: 0.6.13
|
||||
Release: 2
|
||||
Version: 0.6.14
|
||||
Release: 1
|
||||
License: GPLv3+
|
||||
Summary: D-Bus Service to Manipulate User Account Information
|
||||
Url: http://www.fedoraproject.org/wiki/Features/UserAccountDialog
|
||||
@ -28,6 +28,9 @@ Source: http://www.freedesktop.org/software/accountsservice/%{name}-%{ve
|
||||
# WARNING: do not remove/significantly change patch0 without updating the relevant patch in gdm too
|
||||
# PATCH-FIX-OPENSUSE accountsservice-sysconfig.patch bnc#688071 vuntz@opensuse.org -- Read/write autologin configuration from sysconfig, like gdm (see gdm-sysconfig-settings.patch)
|
||||
Patch0: accountsservice-sysconfig.patch
|
||||
# needed for patch0
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: intltool
|
||||
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
|
||||
BuildRequires: xz
|
||||
@ -74,7 +77,10 @@ querying and manipulating user account information.
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure --disable-static
|
||||
# needed for patch0
|
||||
NOCONFIGURE=1 gnome-autogen.sh
|
||||
%configure \
|
||||
--disable-static
|
||||
make %{?jobs:-j%jobs}
|
||||
|
||||
%install
|
||||
@ -107,12 +113,14 @@ rm -rf %{buildroot}
|
||||
%files -n libaccountsservice0
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/*.so.0*
|
||||
%{_libdir}/girepository-1.0/AccountsService-1.0.typelib
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/accountsservice.pc
|
||||
%{_includedir}/accountsservice-1.0/
|
||||
%{_datadir}/gir-1.0/AccountsService-1.0.gir
|
||||
|
||||
%files lang -f accounts-service.lang
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user