Mailinglist Archive: opensuse-commit (689 mails)
| < Previous | Next > |
commit gucharmap
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 21 Dec 2007 10:24:32 +0100
- Message-id: <20071221092432.8536F678336@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package gucharmap
checked in at Fri Dec 21 10:24:32 CET 2007.
--------
--- GNOME/gucharmap/gucharmap.changes 2007-09-19 02:03:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/gucharmap/gucharmap.changes 2007-12-20
23:38:52.112530000 +0100
@@ -1,0 +2,17 @@
+Thu Dec 20 23:38:42 CET 2007 - maw@xxxxxxx
+
+- Add gucharmap-glib-breakage.patch (#350152).
+
+-------------------------------------------------------------------
+Thu Dec 20 10:39:37 CST 2007 - maw@xxxxxxx
+
+- Update to version 2.21.4:
+ + The large version bump is gucharmap synchronizing its version
+ number with that of GNOME
+ + Bugs (bugzilla.gnome.org) fixed: #501915, #331103, #501710,
+ #469131
+ + Install gconf schemas
+- Remove bogus dependencies
+- Remove bogus stuff in %post and %postun.
+
+-------------------------------------------------------------------
Old:
----
gucharmap-1.10.1.tar.bz2
New:
----
gucharmap-2.21.4.tar.bz2
gucharmap-glib-breakage.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gucharmap.spec ++++++
--- /var/tmp/diff_new_pack.u23119/_old 2007-12-21 10:23:49.000000000 +0100
+++ /var/tmp/diff_new_pack.u23119/_new 2007-12-21 10:23:49.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package gucharmap (Version 1.10.1)
+# spec file for package gucharmap (Version 2.21.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,19 +11,21 @@
# norootforbuild
Name: gucharmap
-BuildRequires: docbook_4 fdupes gnome-doc-utils-devel intltool
libgnomeui-devel scrollkeeper update-desktop-files
-License: GPL v2 or later, LGPL v2 or later
+BuildRequires: docbook_4 fdupes gnome-common gnome-doc-utils-devel intltool
libgnomeui-devel scrollkeeper update-desktop-files
+License: GPL v2 or later; LGPL v2.1 or later
Group: System/GUI/GNOME
-Version: 1.10.1
+Version: 2.21.4
Release: 1
Summary: A Feature-Rich Unicode Character Map
-Source:
ftp://ftp.gnome.org/pub/gnome/sources/gucharmap/1.8/%{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
Patch: %name-desktop.patch
Patch1: gucharmap-no-root.patch
+# See https://bugzilla.novell.com/show_bug.cgi?id=350152
+Patch2: gucharmap-glib-breakage.patch
Url: http://gucharmap.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: filesystem
Requires: %{name}-lang = %{version}
+%gconf_schemas_prereq
%description
Gucharmap is a feature-rich Unicode character map and font viewer.
@@ -37,7 +39,7 @@
%package devel
Summary: Include Files and Libraries mandatory for Development.
Group: System/GUI/GNOME
-Requires: %{name} = %{version} glib2-devel gtk2-devel libgnome-devel
libgnomeui-devel
+Requires: %{name} = %{version} gconf2-devel glib2-devel gtk2-devel
libgnome-devel libgnomeui-devel
%description devel
This package contains all necessary include files and libraries needed
@@ -54,6 +56,7 @@
%setup -q
%patch
%patch1
+%patch2
%build
autoreconf -f -i
@@ -66,21 +69,23 @@
%install
%makeinstall
%find_lang %{name}
+%find_gconf_schemas
%fdupes $RPM_BUILD_ROOT
%suse_update_desktop_file %{name}
-%post
-touch var/adm/SuSEconfig/run-gtk
-/sbin/ldconfig
-
-%postun
-touch var/adm/SuSEconfig/run-gtk
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%pre -f %{name}.schemas_pre
+
+%preun -f %{name}.schemas_preun
+%posttrans -f %{name}.schemas_posttrans
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc COPYING COPYING.LIB ChangeLog README TODO
%{_bindir}/*
@@ -99,6 +104,17 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Thu Dec 20 2007 - maw@xxxxxxx
+- Add gucharmap-glib-breakage.patch (#350152).
+* Thu Dec 20 2007 - maw@xxxxxxx
+- Update to version 2.21.4:
+ + The large version bump is gucharmap synchronizing its version
+ number with that of GNOME
+ + Bugs (bugzilla.gnome.org) fixed: #501915, #331103, #501710,
+ [#469131]
+ + Install gconf schemas
+- Remove bogus dependencies
+- Remove bogus stuff in %%post and %%postun.
* Wed Sep 19 2007 - mauro@xxxxxxx
- Update to version 1.10.1
- Bugfixes for bgo: #311912, #357471, #396265, #434276, #433134
++++++ gucharmap-1.10.1.tar.bz2 -> gucharmap-2.21.4.tar.bz2 ++++++
++++ 27377 lines of diff (skipped)
++++++ gucharmap-glib-breakage.patch ++++++
=== modified file 'gucharmap/gucharmap-chartable-accessible.c'
--- gucharmap/gucharmap-chartable-accessible.c 2007-12-20 21:37:47 +0000
+++ gucharmap/gucharmap-chartable-accessible.c 2007-12-20 22:19:14 +0000
@@ -677,7 +677,7 @@
GType
gucharmap_chartable_accessible_get_type (void)
{
- static volatile gsize type__volatile = 0;
+ static volatile gpointer type__volatile = NULL;
if (g_once_init_enter (&type__volatile))
{
@@ -730,10 +730,10 @@
g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
&atk_component_info);
- g_once_init_leave (&type__volatile, type);
+ g_once_init_leave (&type__volatile, (gpointer) type);
}
- return type__volatile;
+ return *(GType *) type__volatile;
}
#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |