Hello community,
here is the log from the commit of package ding
checked in at Tue Oct 28 17:55:00 CET 2008.
--------
--- ding/ding.changes 2008-04-18 12:21:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/ding/ding.changes 2008-10-28 15:30:22.268513000 +0100
@@ -1,0 +2,5 @@
+Tue Oct 28 15:30:13 CET 2008 - coolo(a)suse.de
+
+- remove quotes from GenericName
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ding.spec ++++++
--- /var/tmp/diff_new_pack.R25682/_old 2008-10-28 17:53:49.000000000 +0100
+++ /var/tmp/diff_new_pack.R25682/_new 2008-10-28 17:53:49.000000000 +0100
@@ -2,9 +2,16 @@
# spec file for package ding (Version 1.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -19,7 +26,7 @@
AutoReqProv: on
Summary: An X Window System Dictionary Tool
Version: 1.5
-Release: 86
+Release: 134
Url: http://www-user.tu-chemnitz.de/~fri/ding/
Source: ftp://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-%{version}.tar.bz2
Source1: ding.desktop
@@ -65,6 +72,8 @@
%_datadir/applications/%name.desktop
%changelog
+* Tue Oct 28 2008 coolo(a)suse.de
+- remove quotes from GenericName
* Fri Apr 18 2008 hvogel(a)suse.de
- Require american/german ispell packages for spellchecking
* Sat Apr 21 2007 bwalle(a)suse.de
@@ -90,7 +99,7 @@
* Thu Mar 18 2004 hvogel(a)suse.de
- add desktop file (Bug #36504)
- move ding to /usr
-* Tue Feb 17 2004 hvogel(a)suse.de
+* Mon Feb 16 2004 hvogel(a)suse.de
- update to version 1.3
- in fact ding is noarch
* Thu Nov 13 2003 hvogel(a)suse.de
++++++ ding.desktop ++++++
--- /var/tmp/diff_new_pack.R25682/_old 2008-10-28 17:53:49.000000000 +0100
+++ /var/tmp/diff_new_pack.R25682/_new 2008-10-28 17:53:49.000000000 +0100
@@ -2,4 +2,4 @@
Type=Application
Name=ding
Exec=ding
-GenericName="German<=>English Dictionary"
+GenericName=German<=>English Dictionary
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
Hello community,
here is the log from the commit of package apport
checked in at Tue Oct 28 17:53:38 CET 2008.
--------
--- apport/apport.changes 2008-10-27 16:07:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/apport/apport.changes 2008-10-28 10:07:16.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Oct 28 10:09:49 CET 2008 - jblunck(a)suse.de
+
+- Fix list of key ids and vendor strings used by openSUSE
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
apport-0.114-rev1171.tar.bz2
New:
----
apport-0.114-rev1172.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apport.spec ++++++
--- /var/tmp/diff_new_pack.c23837/_old 2008-10-28 17:52:40.000000000 +0100
+++ /var/tmp/diff_new_pack.c23837/_new 2008-10-28 17:52:40.000000000 +0100
@@ -18,11 +18,11 @@
# norootforbuild
-%define revno -rev1171
+%define revno -rev1172
Name: apport
Version: 0.114
-Release: 3
+Release: 4
License: GPL v2 or later
Url: https://launchpad.net/apport
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -233,6 +233,8 @@
/usr/share/apport/*.ui
%changelog
+* Tue Oct 28 2008 jblunck(a)suse.de
+- Fix list of key ids and vendor strings used by openSUSE
* Mon Oct 27 2008 jblunck(a)suse.de
- Fix developer mode
- Add some keys to the list of official keys
++++++ apport-0.114-rev1171.tar.bz2 -> apport-0.114-rev1172.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apport-0.114/backends/packaging_opensuse.py new/apport-0.114/backends/packaging_opensuse.py
--- old/apport-0.114/backends/packaging_opensuse.py 2008-10-27 16:09:39.000000000 +0100
+++ new/apport-0.114/backends/packaging_opensuse.py 2008-10-28 10:09:07.000000000 +0100
@@ -67,25 +67,25 @@
version = verstring[i + 1:]
release = None
return (epoch, version, release)
-
- # A list of ids of official keys used by the openSUSE
+ # This information should be delivered by the crash database server:
+ # A list of ids of official keys used by the openSUSE (suse-build-key)
official_keylist = (
'9C800ACA', # SuSE Package Signing Key <build(a)suse.de>
'307E3D54', # SuSE Package Signing Key <build(a)suse.de>
'A1912208', # Novell Provo Build <novell-provo-build(a)novell.com>
'7E2E3B05', # Novell Provo Build <novell-provo-build(a)novell.com>
'3D25D3D9', # SuSE Security Team <security(a)suse.de>
- '0dfb3188', # Open Enterprise Server <support(a)novell.com>
- '6b9d6523', # openSUSE Build Service <buildservice(a)opensuse.org>
- '1d061a62', # build(a)novell.com (Novell Linux Products) <support(a)novell.com>
+ '0DFB3188', # Open Enterprise Server <support(a)novell.com>
+ '1D061A62', # build(a)novell.com (Novell Linux Products) <support(a)novell.com>
+ '56B4177A', # openSUSE:Factory OBS Project (external build service)
)
- # A list of
+ # This information should be delivered by the crash database server:
+ # A list of official vendor strings used by openSUSE
official_vendorlist = (
'SUSE LINUX Products GmbH, Nuernberg, Germany',
'openSUSE Build Service',
- 'Novell Technical Services',
)
def is_distro_package(self, package):
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
Hello community,
here is the log from the commit of package gnome-packagekit
checked in at Tue Oct 28 07:41:01 CET 2008.
--------
--- GNOME/gnome-packagekit/gnome-packagekit.changes 2008-10-14 03:22:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-packagekit/gnome-packagekit.changes 2008-10-27 21:32:37.913310000 +0100
@@ -1,0 +2,9 @@
+Mon Oct 27 21:29:19 CET 2008 - sreeves(a)suse.de
+
+- Match PackageKit version - 0.3.9
+ Check if the GUI programs are being used on local and active consoles
+ Don't force large window sizes so we work on the eee and OLPC.
+ Don't crash gpk-application if a package contains no files
+ Don't show 'untitled window' when we review updates and then update them
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
bnc422176.patch
gnome-packagekit-0.3.7.tar.bz2
New:
----
gnome-packagekit-0.3.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-packagekit.spec ++++++
--- /var/tmp/diff_new_pack.U17318/_old 2008-10-28 07:36:07.000000000 +0100
+++ /var/tmp/diff_new_pack.U17318/_new 2008-10-28 07:36:07.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-packagekit (Version 0.3.7)
+# spec file for package gnome-packagekit (Version 0.3.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: gnome-packagekit
Url: http://packagekit.org/
-Version: 0.3.7
+Version: 0.3.9
Release: 1
License: GPL v2 or later
Source: %{name}-%{version}.tar.bz2
@@ -28,7 +28,6 @@
Patch1: gnome-packagekit_release.patch
#PATCH-FEATURE-OPENSUSE gnome-packagekit-fate303359.patch fate 303359
Patch2: gnome-packagekit-fate303359.patch
-Patch3: bnc422176.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: PackageKit-devel PolicyKit-gnome-devel cairo-devel dbus-1-devel desktop-file-utils gconf2-devel gettext-devel gnome-doc-utils-devel gtk-doc gtk2-devel intltool libglade2-devel libnotify-devel libsexy-devel libtool sqlite-devel update-desktop-files
Requires: gnome-icon-theme
@@ -55,7 +54,6 @@
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p0
-%patch3 -p1
#replace the old po files with lcn ones
rm po/*.po
rm po/LINGUAS
@@ -109,7 +107,13 @@
%files lang -f %{name}.lang
%changelog
-* Tue Oct 14 2008 sreeves(a)suse.de
+* Mon Oct 27 2008 sreeves(a)suse.de
+- Match PackageKit version - 0.3.9
+ Check if the GUI programs are being used on local and active consoles
+ Don't force large window sizes so we work on the eee and OLPC.
+ Don't crash gpk-application if a package contains no files
+ Don't show 'untitled window' when we review updates and then update them
+* Mon Oct 13 2008 sreeves(a)suse.de
- Match PackageKit version - 0.3.7
Fix the bug where GetUpdates is unconditionally run at startup.
Watch for GConf keys to change so we can reassess actions based on policy
@@ -140,7 +144,7 @@
- Match PackageKit version change to 0.3.1
* Mon Aug 18 2008 sreeves(a)suse.de
- Match PackageKit version change to 0.3.0
-* Fri Aug 01 2008 cthiel(a)suse.de
+* Thu Jul 31 2008 cthiel(a)suse.de
- really remove restart-gpk-update-icon.sh
* Tue Jul 29 2008 jpr(a)suse.de
- Remove %%post action and script, it is not needed for factory
@@ -156,7 +160,7 @@
* Wed Jun 18 2008 sreeves(a)suse.de
- Fix for BNC#401057 - better loop handling
swampid for this - 18244
-* Sat Jun 07 2008 sreeves(a)suse.de
+* Fri Jun 06 2008 sreeves(a)suse.de
- Fix for BNC#390658 - don't show dialog again if they decline to run.
* Fri Jun 06 2008 sreeves(a)suse.de
- Update translations
++++++ gnome-packagekit-0.3.7.tar.bz2 -> gnome-packagekit-0.3.9.tar.bz2 ++++++
++++ 149105 lines of diff (skipped)
++++++ gnome-packagekit-fate303359.patch ++++++
--- /var/tmp/diff_new_pack.U17318/_old 2008-10-28 07:36:11.000000000 +0100
+++ /var/tmp/diff_new_pack.U17318/_new 2008-10-28 07:36:11.000000000 +0100
@@ -5,10 +5,10 @@
#include <locale.h>
#include <libnotify/notify.h>
+#include <gconf/gconf-client.h>
+ #include <packagekit-glib/packagekit.h>
- #include <pk-dbus-monitor.h>
-
-@@ -104,6 +105,58 @@
+ #include "egg-debug.h"
+@@ -103,6 +104,58 @@
gtk_main_quit ();
}
@@ -67,12 +67,12 @@
/**
* main:
**/
-@@ -164,6 +217,8 @@
+@@ -165,6 +218,8 @@
+ if (!ret)
return 1;
- }
+ check_for_online_update_configured ();
+
/* add application specific icons to search path */
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- PK_DATA G_DIR_SEPARATOR_S "icons");
+ GPK_DATA G_DIR_SEPARATOR_S "icons");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
Hello community,
here is the log from the commit of package kexec-tools
checked in at Tue Oct 28 00:51:15 CET 2008.
--------
--- kexec-tools/kexec-tools.changes 2008-10-24 15:33:36.000000000 +0200
+++ /d/STABLE/kexec-tools/kexec-tools.changes 2008-10-27 10:26:03.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Oct 27 10:25:42 CET 2008 - bwalle(a)suse.de
+
+- Update patch that checks for reserved and assigned bit flags on
+ the memory regions (bnc#438086).
+
+-------------------------------------------------------------------
+Sun Oct 26 18:11:02 CET 2008 - bwalle(a)suse.de
+
+- Clear grubonce after using in kexec-bootloader (bnc#438194).
+- Add rpmlint supression file.
+- Correct debugging output: Number of section was one too small
+ (last index != size of array).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
kexec-tools-2.0.0-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kexec-tools.spec ++++++
--- /var/tmp/diff_new_pack.At8130/_old 2008-10-28 00:50:38.000000000 +0100
+++ /var/tmp/diff_new_pack.At8130/_new 2008-10-28 00:50:38.000000000 +0100
@@ -29,11 +29,12 @@
AutoReqProv: on
Summary: Tools for fast kernel loading
Version: 2.0.0
-Release: 42
+Release: 43
Source: %{name}-%{version}.tar.bz2
Source1: kexec-bootloader
Source2: kexec-bootloader.8.txt
Source3: kexec.init
+Source4: %{name}-%{version}-rpmlintrc
Patch0: %{name}-ia64-uncached-memory.diff
Patch1: %{name}-ia64-PA.diff
Patch2: %{name}-build-warnings.diff
@@ -148,10 +149,18 @@
%endif
%changelog
+* Mon Oct 27 2008 bwalle(a)suse.de
+- Update patch that checks for reserved and assigned bit flags on
+ the memory regions (bnc#438086).
+* Sun Oct 26 2008 bwalle(a)suse.de
+- Clear grubonce after using in kexec-bootloader (bnc#438194).
+- Add rpmlint supression file.
+- Correct debugging output: Number of section was one too small
+ (last index != size of array).
* Fri Oct 24 2008 bwalle(a)suse.de
- Check for reserved and assigned bit flags on the memory regions
(bnc#438086).
-* Sun Oct 19 2008 bwalle(a)suse.de
+* Sat Oct 18 2008 bwalle(a)suse.de
- Honor grubonce also when the 1st (== 0th) entry was chosen.
* Mon Oct 13 2008 bwalle(a)suse.de
- Fix runlevels (Default-Start, Default-Stop) in kexec.init.
@@ -320,7 +329,7 @@
package
* Wed Aug 29 2007 bwalle(a)suse.de
- add reset_devices kernel parameter as default
-* Sun Aug 26 2007 olh(a)suse.de
+* Sat Aug 25 2007 olh(a)suse.de
- do not require kdump-helpers on s390
* Fri Jul 27 2007 bwalle(a)suse.de
- update documentation for deleting all dumps (#302257)
++++++ kexec-bootloader ++++++
--- /var/tmp/diff_new_pack.At8130/_old 2008-10-28 00:50:38.000000000 +0100
+++ /var/tmp/diff_new_pack.At8130/_new 2008-10-28 00:50:38.000000000 +0100
@@ -53,11 +53,15 @@
#
# Returns the value stored with "grubonce". If no value has been stored
# or the /boot/grub/default file is not readable, then -1 is returned.
-sub get_grubonce() # {{{
+#
+# Also emulate the behaviour when using GRUB which resets the 'magic once' flag
+# when booting. Because we use kexec, we have to reset that 'magic once' flag
+# ourselves.
+sub get_grubonce_and_reset_magic() # {{{
{
# no /boot/grub/default file
if (! -f $GRUBDEFAULT) {
- print_debug("get_grubonce(): No $GRUBDEFAULT.");
+ print_debug("get_grubonce_and_reset_magic(): No $GRUBDEFAULT.");
return -1;
}
@@ -65,11 +69,12 @@
open(FH, $GRUBDEFAULT) or return -1;
my $value;
my $ret = sysread(FH, $value, 10);
- close FH;
+ close(FH);
# only if we have read 4 bytes it's valid
if ($ret != 10) {
- print_debug("get_grubonce(): Read returned $ret instead of 4.");
+ print_debug("get_grubonce_and_reset_magic(): ".
+ "Read returned $ret instead of 4.");
return -1;
}
@@ -78,12 +83,20 @@
my $once = int($value);
# 0x4000 is the "magic once flag"
- if ($once & 0x4000) {
- return $once & ~0x4000;
- } else {
- print_debug("get_grubonce(): No magic 0x40000.");
+ unless ($once & 0x4000) {
+ print_debug("get_grubonce_and_reset_magic(): No magic 0x40000.");
return -1;
}
+
+ my $defaultno = $once & ~0x4000;
+ my $buf = $defaultno . "\0" . "\n" x 9;
+
+ # now reset the grubonce flag
+ open(FH, ">$GRUBDEFAULT") or return $defaultno;
+ $ret = syswrite(FH, $buf, 10);
+ close(FH);
+
+ return $defaultno;
} # }}}
#
@@ -107,7 +120,7 @@
my $default = -1;
if ($loader =~ m/GRUB/i) {
- $default = get_grubonce();
+ $default = get_grubonce_and_reset_magic();
print_debug("GRUB Default: $default");
}
++++++ kexec-tools-2.0.0-rpmlintrc ++++++
#
# The name for the init script is correct. kexec-tools is no name
# for an init script.
addFilter(".*incoherent-init-script-name.*");
#
# $null is a valid dependency.
addFilter(".*init-script-undefined-dependency.*");
#
# It does not make any sense to stop the "service" kexec on removal.
# kexec is no service but an init script to run kexec when rebooting.
# Stopping it here would lead to a very unexpected behaviour on reboot. :)
addFilter(".*init-script-without-%stop_on_removal-preun.*");
# :mode=python:
++++++ kexec-tools-ppc-check-flags.diff ++++++
--- /var/tmp/diff_new_pack.At8130/_old 2008-10-28 00:50:38.000000000 +0100
+++ /var/tmp/diff_new_pack.At8130/_new 2008-10-28 00:50:38.000000000 +0100
@@ -22,33 +22,53 @@
Acked-by: Bernhard Walle <bwalle(a)suse.de>
---
- kexec/arch/ppc64/crashdump-ppc64.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
+ kexec/arch/ppc64/crashdump-ppc64.c | 12 ++++++++++--
+ kexec/arch/ppc64/crashdump-ppc64.h | 3 +++
+ 2 files changed, 13 insertions(+), 2 deletions(-)
--- a/kexec/arch/ppc64/crashdump-ppc64.c
+++ b/kexec/arch/ppc64/crashdump-ppc64.c
-@@ -124,7 +124,7 @@ static void exclude_crash_region(uint64_
- static int get_dyn_reconf_crash_memory_ranges()
+@@ -121,12 +121,13 @@ static void exclude_crash_region(uint64_
+ }
+ }
+
+-static int get_dyn_reconf_crash_memory_ranges()
++static int get_dyn_reconf_crash_memory_ranges(void)
{
uint64_t start, end;
-- char fname[128], buf[32];
-+ char fname[128], buf[32], flags;
+ char fname[128], buf[32];
FILE *file;
int i, n;
++ uint32_t flags;
-@@ -152,6 +152,13 @@ static int get_dyn_reconf_crash_memory_r
+ strcpy(fname, "/proc/device-tree/");
+ strcat(fname, "ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory");
+@@ -150,10 +151,17 @@ static int get_dyn_reconf_crash_memory_r
+ return -1;
+ }
- start = ((uint64_t *)buf)[0];
+- start = ((uint64_t *)buf)[0];
++ start = ((uint64_t *)buf)[DRCONF_ADDR];
end = start + lmb_size;
+ if (start == 0 && end >= (BACKUP_SRC_END + 1))
+ start = BACKUP_SRC_END + 1;
+
-+ flags = buf[23];
++ flags = (*((uint32_t *)&buf[DRCONF_FLAGS]));
+ /* skip this block if the reserved bit is set in flags (0x80)
-+ or if the memory region is not assigned to this partition (0x8) */
++ or if the block is not assigned to this partition (0x8) */
+ if ((flags & 0x80) || !(flags & 0x8))
+ continue;
+
- if (start == 0 && end >= (BACKUP_SRC_END + 1))
- start = BACKUP_SRC_END + 1;
exclude_crash_region(start, end);
-
-
+ }
+ fclose(file);
+--- a/kexec/arch/ppc64/crashdump-ppc64.h
++++ b/kexec/arch/ppc64/crashdump-ppc64.h
+@@ -31,4 +31,7 @@ extern unsigned int rtas_size;
+ uint64_t lmb_size;
+ unsigned int num_of_lmbs;
+
++#define DRCONF_ADDR 0
++#define DRCONF_FLAGS 20
++
+ #endif /* CRASHDUMP_PPC64_H */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
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(a)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(a)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(a)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(a)suse.cz
- Conflict with other branding providers (FATE#304881).
* Thu May 29 2008 sbrabec(a)suse.cz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
