From e9b680abfd76ba7dba5b17bfdbae333e73e56019 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 05:23:50 +0000 Subject: auto-import changelog data from gnome-desktop-2.2.0.1-4.src.rpm Mon Feb 17 2003 Havoc Pennington 2.2.0.1-4 - fix mem corruption #84361 Fri Feb 14 2003 Havoc Pennington 2.2.0.1-3 - nuke Xft buildreq Wed Feb 05 2003 Havoc Pennington 2.2.0.1-2 - require startup-notification 0.5, just for paranoia Wed Feb 05 2003 Alexander Larsson - 2.2.0.1 Wed Jan 22 2003 Tim Powers - rebuilt Wed Jan 15 2003 Jonathan Blandford - require startup-notification Tue Jan 14 2003 Alexander Larsson 2.1.90-2 - Change the fallback kde theme name from hicolor to crystalsvg. Thu Jan 09 2003 Havoc Pennington 2.1.90-1 - 2.1.90 Sat Dec 14 2002 Havoc Pennington - 2.1.4 Tue Dec 03 2002 Havoc Pennington - add gconftool-2 prereq Mon Dec 02 2002 Havoc Pennington - remove bad post (we no longer include a schemas file) Mon Dec 02 2002 Havoc Pennington - 2.1.3 Wed Nov 13 2002 Havoc Pennington - 2.1.2 --- diff --git a/.cvsignore b/.cvsignore index e30cead..e6de560 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-desktop-2.0.6.tar.bz2 +gnome-desktop-2.2.0.1.tar.bz2 diff --git a/gnome-desktop-2.1.90-kdetheme.patch b/gnome-desktop-2.1.90-kdetheme.patch new file mode 100644 index 0000000..7584e98 --- /dev/null +++ b/gnome-desktop-2.1.90-kdetheme.patch @@ -0,0 +1,85 @@ +--- gnome-desktop-2.1.90/libgnome-desktop/gnome-desktop-item.c.crystalsvg 2002-12-10 00:01:24.000000000 +0100 ++++ gnome-desktop-2.1.90/libgnome-desktop/gnome-desktop-item.c 2003-01-14 17:05:56.000000000 +0100 +@@ -2316,10 +2316,10 @@ + } + + static char *kde_icondir = NULL; +-static GSList *hicolor_kde_48 = NULL; +-static GSList *hicolor_kde_32 = NULL; +-static GSList *hicolor_kde_22 = NULL; +-static GSList *hicolor_kde_16 = NULL; ++static GSList *crystalsvg_kde_48 = NULL; ++static GSList *crystalsvg_kde_32 = NULL; ++static GSList *crystalsvg_kde_22 = NULL; ++static GSList *crystalsvg_kde_16 = NULL; + /* XXX: maybe we don't care about locolor + static GSList *locolor_kde_48 = NULL; + static GSList *locolor_kde_32 = NULL; +@@ -2373,10 +2373,10 @@ + color ## _kde_ ## size = add_dirs (NULL, dirname); \ + g_free (dirname); + +- ADD_DIRS (hicolor, 48); +- ADD_DIRS (hicolor, 32); +- ADD_DIRS (hicolor, 22); +- ADD_DIRS (hicolor, 16); ++ ADD_DIRS (crystalsvg, 48); ++ ADD_DIRS (crystalsvg, 32); ++ ADD_DIRS (crystalsvg, 22); ++ ADD_DIRS (crystalsvg, 16); + + /* XXX: maybe we don't care about locolor + ADD_DIRS (locolor, 48); +@@ -2397,36 +2397,36 @@ + + if (size > 32) { + /* 48-inf */ +- list = g_slist_concat (g_slist_copy (hicolor_kde_48), +- g_slist_copy (hicolor_kde_32)); ++ list = g_slist_concat (g_slist_copy (crystalsvg_kde_48), ++ g_slist_copy (crystalsvg_kde_32)); + list = g_slist_concat (list, +- g_slist_copy (hicolor_kde_22)); ++ g_slist_copy (crystalsvg_kde_22)); + list = g_slist_concat (list, +- g_slist_copy (hicolor_kde_16)); ++ g_slist_copy (crystalsvg_kde_16)); + } else if (size > 22) { + /* 23-32 */ +- list = g_slist_concat (g_slist_copy (hicolor_kde_32), +- g_slist_copy (hicolor_kde_48)); ++ list = g_slist_concat (g_slist_copy (crystalsvg_kde_32), ++ g_slist_copy (crystalsvg_kde_48)); + list = g_slist_concat (list, +- g_slist_copy (hicolor_kde_22)); ++ g_slist_copy (crystalsvg_kde_22)); + list = g_slist_concat (list, +- g_slist_copy (hicolor_kde_16)); ++ g_slist_copy (crystalsvg_kde_16)); + } else if (size > 16) { + /* 17-22 */ +- list = g_slist_concat (g_slist_copy (hicolor_kde_22), +- g_slist_copy (hicolor_kde_32)); ++ list = g_slist_concat (g_slist_copy (crystalsvg_kde_22), ++ g_slist_copy (crystalsvg_kde_32)); + list = g_slist_concat (list, +- g_slist_copy (hicolor_kde_48)); ++ g_slist_copy (crystalsvg_kde_48)); + list = g_slist_concat (list, +- g_slist_copy (hicolor_kde_16)); ++ g_slist_copy (crystalsvg_kde_16)); + } else { + /* 1-16 */ +- list = g_slist_concat (g_slist_copy (hicolor_kde_16), +- g_slist_copy (hicolor_kde_22)); ++ list = g_slist_concat (g_slist_copy (crystalsvg_kde_16), ++ g_slist_copy (crystalsvg_kde_22)); + list = g_slist_concat (list, +- g_slist_copy (hicolor_kde_32)); ++ g_slist_copy (crystalsvg_kde_32)); + list = g_slist_concat (list, +- g_slist_copy (hicolor_kde_48)); ++ g_slist_copy (crystalsvg_kde_48)); + } + + list = g_slist_append (list, kde_icondir); diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 1440625..8f9b6f4 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -1,26 +1,30 @@ -%define glib2_version 2.0.3 -%define pango_version 1.0.99 -%define gtk2_version 2.0.5 -%define gconf2_version 1.2.0 -%define gnome_vfs2_version 2.0.0 -%define libgnomeui_version 2.0.0 -%define libgnome_version 2.0.0 - +%define glib2_version 2.2.0 +%define pango_version 1.2.0 +%define gtk2_version 2.2.0 +%define gconf2_version 1.2.1 +%define gnome_vfs2_version 2.2.0 +%define libgnomeui_version 2.2.0 +%define libgnome_version 2.2.0 +%define startup_notification_version 0.5 %define po_package gnome-desktop-2.0 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc. Name: gnome-desktop -Version: 2.0.6 +Version: 2.2.0.1 Release: 4 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2 -Source2: desktop_gnome_icon_theme.schemas License: GPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root +Patch1: gnome-desktop-2.1.90-kdetheme.patch +## http://bugzilla.gnome.org/show_bug.cgi?id=105834 +Patch2: gnome-desktop-2.2.0.1-startup-corruption.patch + Requires: redhat-artwork Requires: redhat-menus +Requires: startup-notification >= 0.5 Obsoletes: gnome-core gnome-core-devel Provides: gnome-core @@ -32,10 +36,10 @@ BuildRequires: GConf2-devel >= %{gconf2_version} BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: libgnome-devel >= %{libgnome_version} -BuildRequires: Xft -BuildRequires: fontconfig +BuildRequires: startup-notification-devel >= %{startup_notification_version} -Patch1: gnome-desktop-2.0.6-scaled.patch +PreReq: GConf2 +PreReq: /usr/bin/gconftool-2 %description @@ -55,6 +59,7 @@ Requires: GConf2-devel >= %{gconf2_version} Requires: gnome-vfs2-devel >= %{gnome_vfs2_version} Requires: libgnomeui-devel >= %{libgnomeui_version} Requires: libgnome-devel >= %{libgnome_version} +Requires: startup-notification-devel >= %{startup_notification_version} %description devel @@ -64,7 +69,8 @@ libgnomedesktop %prep %setup -q -%patch1 -p1 -b .scaled +%patch1 -p1 -b .kdetheme +%patch2 -p1 -b .startup-corruption %build @@ -84,18 +90,12 @@ echo "Today is $TODAYS_DATE" perl -pi -e "s@ *@$TODAYS_DATE@g" $RPM_BUILD_ROOT%{_datadir}/gnome-about/gnome-version.xml perl -pi -e 's@ *@Red Hat Linux@g' $RPM_BUILD_ROOT%{_datadir}/gnome-about/gnome-version.xml -./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas - %find_lang %{po_package} %clean rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_icon_theme.schemas > /dev/null +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -112,8 +112,6 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_i %{_bindir}/* -%{_sysconfdir}/gconf/schemas/* - %files devel %defattr(-,root,root) @@ -124,6 +122,45 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_i #%{_datadir}/gtk-doc %changelog +* Mon Feb 17 2003 Havoc Pennington 2.2.0.1-4 +- fix mem corruption #84361 + +* Fri Feb 14 2003 Havoc Pennington 2.2.0.1-3 +- nuke Xft buildreq + +* Wed Feb 5 2003 Havoc Pennington 2.2.0.1-2 +- require startup-notification 0.5, just for paranoia + +* Wed Feb 5 2003 Alexander Larsson +- 2.2.0.1 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Jan 15 2003 Jonathan Blandford +- require startup-notification + +* Tue Jan 14 2003 Alexander Larsson 2.1.90-2 +- Change the fallback kde theme name from hicolor to crystalsvg. + +* Thu Jan 9 2003 Havoc Pennington 2.1.90-1 +- 2.1.90 + +* Sat Dec 14 2002 Havoc Pennington +- 2.1.4 + +* Tue Dec 3 2002 Havoc Pennington +- add gconftool-2 prereq + +* Mon Dec 2 2002 Havoc Pennington +- remove bad post (we no longer include a schemas file) + +* Mon Dec 2 2002 Havoc Pennington +- 2.1.3 + +* Wed Nov 13 2002 Havoc Pennington +- 2.1.2 + * Wed Sep 4 2002 Havoc Pennington - support a magic flag in icon theme to avoid using prescaled icons diff --git a/sources b/sources index 7bb42fe..32d8690 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25451e6c36e7c5a96b94aa42b52e18ca gnome-desktop-2.0.6.tar.bz2 +5463b9a864447d670d1ea40de2022519 gnome-desktop-2.2.0.1.tar.bz2