From eb6f953d2ec5d4b1823643a70394a88defeeb732 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 26 Nov 2012 21:35:01 -0500 Subject: [PATCH] 0.4 --- gnome-initial-setup.spec | 33 ++++++++++++++++++++++----------- sources | 2 +- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 6a2c63b..cab8b61 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -1,11 +1,11 @@ Name: gnome-initial-setup -Version: 0.3 -Release: 3%{?dist} +Version: 0.4 +Release: 1%{?dist} Summary: Bootstrapping your OS License: GPLv2+ URL: https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup -Source0: http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/0.4/%{name}-%{version}.tar.xz %global nm_version 0.9 %global glib_required_version 2.29.4 @@ -18,6 +18,7 @@ BuildRequires: libpwquality-devel BuildRequires: pkgconfig(NetworkManager) >= %{nm_version} BuildRequires: pkgconfig(libnm-glib) >= %{nm_version} BuildRequires: pkgconfig(libnm-util) >= %{nm_version} +BuildRequires: pkgconfig(libnm-gtk) BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gstreamer-0.10) @@ -33,10 +34,13 @@ BuildRequires: pkgconfig(gio-2.0) >= %{glib_required_version} BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib_required_version} BuildRequires: pkgconfig(gdm) BuildRequires: pkgconfig(iso-codes) +BuildRequires: krb5-devel # gnome-initial-setup is being run by gdm Requires: gdm +Requires(pre): shadow-utils + Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -56,16 +60,22 @@ you through configuring it. It is integrated with gdm. make %{?_smp_mflags} %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} find %{buildroot} -name '*.la' -exec rm -f {} ';' # Desktop file does not (and probably will not) ever validate, as it uses # an absolute path /tmp/-style trigger to determine whether to autostart. # desktop-file-validate %%{buildroot}/%%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop -desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop -desktop-file-validate %{buildroot}/%{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop -desktop-file-validate %{buildroot}/%{_datadir}/gdm/greeter/applications/setup-shell.desktop +desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop +desktop-file-validate %{buildroot}%{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop +desktop-file-validate %{buildroot}%{_datadir}/gdm/greeter/applications/setup-shell.desktop + +mkdir -p %{buildroot}%{_localstatedir}/lib/gnome-initial-setup + +# Fixed upstream +mkdir -p %{buildroot}%{_datadir}/polkit-1/rules.d +mv %{buildroot}%{_datadir}/gnome-initial-setup/20-gnome-initial-setup.rules \ + %{buildroot}%{_datadir}/polkit-1/rules.d %find_lang %{name} @@ -89,20 +99,21 @@ userdel %{name} &>/dev/null || : %doc COPYING README %{_libexecdir}/gnome-initial-setup %{_libexecdir}/gnome-initial-setup-copy-worker +%{_libexecdir}/gnome-initial-setup-player %{_libexecdir}/gnome-welcome-tour %{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop %{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop -%dir %{_datadir}/gnome-initial-setup -%{_datadir}/gnome-initial-setup/20-gnome-initial-setup.rules - %{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop %{_datadir}/gdm/greeter/applications/setup-shell.desktop %{_datadir}/gnome-session/sessions/gnome-initial-setup.session -%{_datadir}/polkit-1/actions/org.gnome.initial-setup.policy +%{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules /usr/lib/systemd/system/gnome-initial-setup.service %changelog +* Thu Nov 22 2012 Matthias Clasen - 0.4-1 +- 0.4 + * Fri Oct 26 2012 Jasper St. Pierre - 0.3-3 - Add krb5 diff --git a/sources b/sources index e04d3d6..29b042b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f776a2b7907ca8c53ae630544d1a401 gnome-initial-setup-0.3.tar.xz +9baac331b14d1a3270248d937b51246b gnome-initial-setup-0.4.tar.xz