Accepting request 32287 from GNOME:Factory

Copy from GNOME:Factory/libwnck based on submit request 32287 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/32287
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libwnck?expand=0&rev=37

libwnck-2.28.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d90be36d2fefa33a9287ed6dc41141213a06463f91d69d847da6b2e59c16b947
-size 712289

libwnck-2.29.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0fdbc19188bf5cf237c2651c4d53976f4bec33e2a10f6b47157ff0f5e24680a5
+size 686407

libwnck-fix-bindings.patch

@@ -1,51 +0,0 @@
-commit 51879e605ade65d1862f9a114e2a0a0c8defd5c0
-Author: Arun Raghavan <ford_prefect@gentoo.org>
-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 <libwnck/libwnck.h>\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 <libwnck/libwnck.h>\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) > $@
- 

libwnck.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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
 

libwnck.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package libwnck (Version 2.28.0)
+# spec file for package libwnck (Version 2.29.6)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -30,8 +30,8 @@ Obsoletes:      libwnck-64bit
 #
 License:        LGPLv2.1+
 Group:          Development/Libraries/GNOME
-Version:        2.28.0
+Version:        2.29.6
-Release:        3
+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
@@ -39,8 +39,6 @@ Summary:        Window Navigator Construction Kit (Library Package)
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}_spec-update.sh
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM libwnck-fix-bindings.patch vuntz@opensuse.org -- Taken from upstream
-Patch0:         libwnck-fix-bindings.patch
 Requires:       libwnck-1-22 = %{version} licenses
 Requires:       %{name}-lang = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -84,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
@@ -96,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/\./_/')"