From 5b3634c281fe7fa7a1a4b830237189e7b69f62748dba9594c81eeb0a4fadd24c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 28 Jan 2010 00:01:20 +0000 Subject: [PATCH] Accepting request 30612 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/libwnck via accept of submit request 30612 revision 3. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/30612 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libwnck?expand=0&rev=37 --- libwnck-2.28.0.tar.bz2 | 3 --- libwnck-2.29.6.tar.bz2 | 3 +++ libwnck-fix-bindings.patch | 51 -------------------------------------- libwnck.changes | 15 +++++++++++ libwnck.spec | 21 ++++++++-------- 5 files changed, 29 insertions(+), 64 deletions(-) delete mode 100644 libwnck-2.28.0.tar.bz2 create mode 100644 libwnck-2.29.6.tar.bz2 delete mode 100644 libwnck-fix-bindings.patch diff --git a/libwnck-2.28.0.tar.bz2 b/libwnck-2.28.0.tar.bz2 deleted file mode 100644 index 92b3b7b..0000000 --- a/libwnck-2.28.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d90be36d2fefa33a9287ed6dc41141213a06463f91d69d847da6b2e59c16b947 -size 712289 diff --git a/libwnck-2.29.6.tar.bz2 b/libwnck-2.29.6.tar.bz2 new file mode 100644 index 0000000..5d46f19 --- /dev/null +++ b/libwnck-2.29.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fdbc19188bf5cf237c2651c4d53976f4bec33e2a10f6b47157ff0f5e24680a5 +size 686407 diff --git a/libwnck-fix-bindings.patch b/libwnck-fix-bindings.patch deleted file mode 100644 index 4cee45a..0000000 --- a/libwnck-fix-bindings.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 51879e605ade65d1862f9a114e2a0a0c8defd5c0 -Author: Arun Raghavan -Date: Tue Oct 6 19:22:41 2009 +0200 - - [build] Fix generation of wnck-enum-types.c to not break bindings - - We use g_flag_register_static() for flag types (rather than always - using g_enum_register_static()). - - https://bugzilla.gnome.org/show_bug.cgi?id=590534 - -Index: libwnck-2.28.0/libwnck/Makefile.am -=================================================================== ---- libwnck-2.28.0.orig/libwnck/Makefile.am -+++ libwnck-2.28.0/libwnck/Makefile.am -@@ -129,13 +129,13 @@ wnck-enum-types.c: $(wnck_headers) wnck- - $(AM_V_GEN)glib-mkenums \ - --fhead "#include \n" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ -- --vhead "static const GEnumValue _@enum_name@_values[] = {" \ -+ --vhead "static const G@Type@Value _@enum_name@_values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n};\n\n" \ - --vtail "GType\n@enum_name@_get_type (void)\n{\n" \ - --vtail " static GType type = 0;\n\n" \ - --vtail " if (!type)\n" \ -- --vtail " type = g_enum_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \ -+ --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \ - --vtail " return type;\n}\n\n" \ - $(wnck_headers) > $@ - -Index: libwnck-2.28.0/libwnck/Makefile.in -=================================================================== ---- libwnck-2.28.0.orig/libwnck/Makefile.in -+++ libwnck-2.28.0/libwnck/Makefile.in -@@ -899,13 +899,13 @@ wnck-enum-types.c: $(wnck_headers) wnck- - $(AM_V_GEN)glib-mkenums \ - --fhead "#include \n" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ -- --vhead "static const GEnumValue _@enum_name@_values[] = {" \ -+ --vhead "static const G@Type@Value _@enum_name@_values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n};\n\n" \ - --vtail "GType\n@enum_name@_get_type (void)\n{\n" \ - --vtail " static GType type = 0;\n\n" \ - --vtail " if (!type)\n" \ -- --vtail " type = g_enum_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \ -+ --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \ - --vtail " return type;\n}\n\n" \ - $(wnck_headers) > $@ - diff --git a/libwnck.changes b/libwnck.changes index 5651da7..77ed6ab 100644 --- a/libwnck.changes +++ b/libwnck.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Jan 27 17:18:49 CET 2010 - vuntz@opensuse.org + +- Update to version 2.29.6: + + Fix generation of wnck-enum-types.c to not break bindings + + Modernize a bit the build system + + Updated translations. +- Drop libwnck-fix-bindings.patch: fixed upstream. +- Remove en@shaw translation on openSUSE 11.2 and earlier. + +------------------------------------------------------------------- +Tue Jan 5 16:52:36 CET 2010 - jengelh@medozas.de + +- Package baselibs.conf + ------------------------------------------------------------------- Tue Oct 6 19:28:48 CEST 2009 - vuntz@opensuse.org diff --git a/libwnck.spec b/libwnck.spec index 15efabf..bd425b2 100644 --- a/libwnck.spec +++ b/libwnck.spec @@ -1,7 +1,7 @@ # -# spec file for package libwnck (Version 2.28.0) +# spec file for package libwnck (Version 2.29.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,18 +28,17 @@ BuildRequires: licenses Obsoletes: libwnck-64bit %endif # -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: Development/Libraries/GNOME -Version: 2.28.0 -Release: 2 +Version: 2.29.6 +Release: 1 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: #%(sh %{_sourcedir}/%{name}_spec-update.sh %{_sourcedir} %{name} libwnck-1) %define libwnck-1_name 22 Summary: Window Navigator Construction Kit (Library Package) Source: %{name}-%{version}.tar.bz2 Source1: %{name}_spec-update.sh -# PATCH-FIX-UPSTREAM libwnck-fix-bindings.patch vuntz@opensuse.org -- Taken from upstream -Patch0: libwnck-fix-bindings.patch +Source99: baselibs.conf Requires: libwnck-1-22 = %{version} licenses Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,7 +48,7 @@ The Window Navigator Construction Kit is a library that can be used to write task lists, pagers, and similar GNOME programs. %package -n libwnck-1-22 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Window Navigator Construction Kit (Library Package) Group: Development/Libraries/GNOME # Require translation package (%{name}) not older than the library: @@ -65,7 +64,7 @@ The Window Navigator Construction Kit is a library that can be used to write task lists, pagers, and similar GNOME programs. %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME Requires: %{name} = %{version} glib2-devel gtk2-devel @@ -83,7 +82,6 @@ to develop applications that require these. %lang_package %prep %setup -q -%patch0 -p1 # rpmlint note: libwnck has a separate translation for both Bengali and Bengali India %build @@ -95,6 +93,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %install %makeinstall +%if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +%endif rm $RPM_BUILD_ROOT/%{_libdir}/*.*a %find_lang %{name} LIBNAME="$(echo $RPM_BUILD_ROOT%{_libdir}/%{name}-*.so.?? | sed 's/.*\///;s/\.so\./-/;s/\./_/')"