Hello community, here is the log from the commit of package gdm-branding-openSUSE checked in at Tue Oct 28 00:50:26 CET 2008. -------- --- GNOME/gdm-branding-openSUSE/gdm-branding-openSUSE.changes 2008-10-06 15:46:05.000000000 +0200 +++ /d/STABLE/gdm-branding-openSUSE/gdm-branding-openSUSE.changes 2008-10-28 00:03:24.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Oct 27 23:46:40 CET 2008 - vuntz@novell.com + +- Completely rework the package to work with the new GDM. + Fix bnc#436431. +- The only change we do compared to upstream is the logo on the + greeter. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gdm-branding-openSUSE-conf.patch GDM-SuSE-11.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.tm5210/_old 2008-10-28 00:49:57.000000000 +0100 +++ /var/tmp/diff_new_pack.tm5210/_new 2008-10-28 00:49:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gdm-branding-openSUSE (Version 11.0) +# spec file for package gdm-branding-openSUSE (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,23 +19,21 @@ Name: gdm-branding-openSUSE -Version: 11.0 -Release: 64 +Version: 11.1 +Release: 1 Group: System/GUI/GNOME License: BSD 3-Clause Summary: openSUSE branding of gdm -Source: GDM-SuSE-%{version}.tar.bz2 -Patch: gdm-branding-openSUSE-conf.patch -Provides: gdm-branding = 2.20 +Provides: gdm-branding = 2.24 Conflicts: otherproviders(gdm-branding) -Supplements: packageand(branding-openSUSE:gdm) +Supplements: packageand(gdm:branding-openSUSE) # Existed for openSUSE <= 10.3, SLE <= 10 Obsoletes: gnome2-SuSE BuildRoot: %{_tmppath}/%{name}-%{version}-build # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with gdm-branding-openSUSE, you cannot # reuse build root. You have to build in a clean build root every time! -BuildRequires: gdm-branding-upstream update-desktop-files +BuildRequires: gdm-branding-upstream # For directory ownership: BuildRequires: gdm BuildArch: noarch @@ -52,35 +50,27 @@ Jakub Steiner <jimmac@novell.com> %prep -%setup -q -T -a0 -c %{name}-%{version} -cp -a %{S:0} COPYING -cp -a %{_datadir}/gdm/factory-defaults.conf . -%patch +cp -a %{_sysconfdir}/gdm/custom.conf . %build %install -install -d $RPM_BUILD_ROOT%{_datadir}/gdm/themes -install -m0644 factory-defaults.conf $RPM_BUILD_ROOT%{_datadir}/gdm/ -install -m0644 factory-defaults.conf $RPM_BUILD_ROOT%{_datadir}/gdm/defaults.conf -cp -a GDM-SuSE $RPM_BUILD_ROOT%{_datadir}/gdm/themes/ -ln -sf %{_docdir}/%{name}/AUTHORS $RPM_BUILD_ROOT%{_datadir}/gdm/themes/GDM-SuSE/ -ln -sf %{_docdir}/%{name}/COPYING $RPM_BUILD_ROOT%{_datadir}/gdm/themes/GDM-SuSE/ -# We have to install docs here, otherwise brp-symlink will fail. -install -d $RPM_BUILD_ROOT%{_docdir}/%{name} -cp -a GDM-SuSE/AUTHORS GDM-SuSE/COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}/ -%suse_update_desktop_file $RPM_BUILD_ROOT%{_datadir}/gdm/themes/GDM-SuSE/GdmGreeterTheme.desktop +install -d $RPM_BUILD_ROOT%{_sysconfdir}/gdm +install -m0644 custom.conf $RPM_BUILD_ROOT%{_sysconfdir}/gdm/custom.conf %clean rm -rf $RPM_BUILD_ROOT %files %defattr (-, root, root) -%doc %{_docdir}/%{name} -%{_datadir}/gdm/*.conf -%{_datadir}/gdm/themes/GDM-SuSE +%config(noreplace) %{_sysconfdir}/gdm/custom.conf %changelog +* Tue Oct 28 2008 vuntz@novell.com +- Completely rework the package to work with the new GDM. + Fix bnc#436431. +- The only change we do compared to upstream is the logo on the + greeter. * Mon Oct 06 2008 sbrabec@suse.cz - Conflict with other branding providers (FATE#304881). * Thu May 29 2008 sbrabec@suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org