Accepting request 583616 from GNOME:Next

Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/583616
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=356

glib-2.54.3.tar.xz

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

glib-2.55.2.tar.xz

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

glib2-gdbus-codegen-version.patch

@@ -1,34 +1,31 @@
---- a/gio/gdbus-2.0/codegen/codegen.py
+Index: glib-2.55.2/gio/gdbus-2.0/codegen/codegen.py
-+++ b/gio/gdbus-2.0/codegen/codegen.py
+===================================================================
-@@ -56,12 +56,12 @@ class CodeGenerator:
+--- glib-2.55.2.orig/gio/gdbus-2.0/codegen/codegen.py
++++ glib-2.55.2/gio/gdbus-2.0/codegen/codegen.py
+@@ -29,7 +29,7 @@ from . import dbustypes
+ from .utils import print_error
  
-     def generate_intro(self):
+ LICENSE_STR = '''/*
-         self.c.write('/*\n'
+- * Generated by gdbus-codegen {!s}. DO NOT EDIT.
--                     ' * Generated by gdbus-codegen %s. DO NOT EDIT.\n'
++ * Generated by gdbus-codegen. DO NOT EDIT.
-+                     ' * Generated by gdbus-codegen. DO NOT EDIT.\n'
+  *
-                      ' *\n'
+  * The license of this code is the same as for the D-Bus interface description
-                      ' * The license of this code is the same as for the source it was derived from.\n'
+  * it was derived from.
-                      ' */\n'
+@@ -65,7 +65,7 @@ class HeaderCodeGenerator:
-                      '\n'
+     # ----------------------------------------------------------------------------------------------------
--                     %(config.VERSION))
-+                     )
-         self.c.write('#ifdef HAVE_CONFIG_H\n'
-                      '#  include "config.h"\n'
-                      '#endif\n'
-@@ -220,14 +220,14 @@ class CodeGenerator:
-                      '\n')
  
-         self.h.write('/*\n'
+     def generate_header_preamble(self):
--                     ' * Generated by gdbus-codegen %s. DO NOT EDIT.\n'
+-        self.outfile.write(LICENSE_STR.format(config.VERSION))
-+                     ' * Generated by gdbus-codegen. DO NOT EDIT.\n'
++        self.outfile.write(LICENSE_STR)
-                      ' *\n'
+         self.outfile.write('\n')
-                      ' * The license of this code is the same as for the source it was derived from.\n'
+ 
-                      ' */\n'
+         if self.use_pragma:
-                      '\n'
+@@ -623,7 +623,7 @@ class CodeGenerator:
-                      '#ifndef __%s__\n'
+     # ----------------------------------------------------------------------------------------------------
-                      '#define __%s__\n'
+ 
--                     '\n'%(config.VERSION, self.header_guard, self.header_guard))
+     def generate_body_preamble(self):
-+                     '\n'%(self.header_guard, self.header_guard))
+-        self.outfile.write(LICENSE_STR.format(config.VERSION))
-         self.h.write('#include <gio/gio.h>\n'
++        self.outfile.write(LICENSE_STR)
-                      '\n'
+         self.outfile.write('\n')
-                      'G_BEGIN_DECLS\n'
+         self.outfile.write('#ifdef HAVE_CONFIG_H\n'
+                            '#  include "config.h"\n'

glib2-gmain-partial-revert.patch

@@ -1,106 +0,0 @@
-From 94b38beff1347ec4a733199f7a7abdacaa958678 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <withnall@endlessm.com>
-Date: Wed, 17 Jan 2018 11:38:50 +0000
-Subject: gmain: Partial revert of recent wakeup changes to gmain.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts the following commits (but keeps the other recent changes
-to gmain.c):
- • e4ee3079c Do not wake up main loop if change is from same thread
- • 208702404 main: Create a helper function for "owner wakeup" optimization
- • 0c0469b56 gmain: Signal wakeups if context has never been acquired as well
- • 9ba95e25b gmain: only signal GWakeup right before or during a blocking poll
-
-Some combination of them is causing problems with LibreOffice and/or
-WebKit, and the safest thing to do at the moment is revert them all
-until we work out what’s going on. The previous revert (4976e8109) was
-not sufficient (it fixed WebKit, but re-broken LibreOffice).
-
-By reverting, we gain some spurious wakeups, but avoid dropping
-necessary wakeups, which is presumably what’s causing problems in the
-other modules.
-
-Signed-off-by: Philip Withnall <withnall@endlessm.com>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=761102
----
- glib/gmain.c | 33 +++++----------------------------
- 1 file changed, 5 insertions(+), 28 deletions(-)
-
-diff --git a/glib/gmain.c b/glib/gmain.c
-index 8ca54de..67102cd 100644
---- a/glib/gmain.c
-+++ b/glib/gmain.c
-@@ -1118,29 +1118,6 @@ source_remove_from_context (GSource      *source,
-     }
- }
- 
--/* See https://bugzilla.gnome.org/show_bug.cgi?id=761102 for
-- * the introduction of this.
-- *
-- * The main optimization is to avoid waking up the main
-- * context if a change is made by the current owner.
-- */
--static void
--conditional_wakeup (GMainContext *context)
--{
--  /* We want to signal wakeups in two cases:
--   *  1 When the context is owned by another thread
--   *  2 When the context owner is NULL (two subcases)
--   *   2a Possible if the context has never been acquired
--   *   2b Or if the context has no current owner
--   *
--   * At least case 2a) is necessary to ensure backwards compatibility with
--   * qemu's use of GMainContext.
--   * https://bugzilla.gnome.org/show_bug.cgi?id=761102#c14
--   */
--  if (context->owner != G_THREAD_SELF)
--    g_wakeup_signal (context->wakeup);
--}
--
- static guint
- g_source_attach_unlocked (GSource      *source,
-                           GMainContext *context,
-@@ -1187,8 +1164,8 @@ g_source_attach_unlocked (GSource      *source,
-   /* If another thread has acquired the context, wake it up since it
-    * might be in poll() right now.
-    */
--  if (do_wakeup)
--    conditional_wakeup (context);
-+  if (do_wakeup && context->owner && context->owner != G_THREAD_SELF)
-+    g_wakeup_signal (context->wakeup);
- 
-   return source->source_id;
- }
-@@ -1878,7 +1855,7 @@ g_source_set_ready_time (GSource *source,
-     {
-       /* Quite likely that we need to change the timeout on the poll */
-       if (!SOURCE_BLOCKED (source))
--        conditional_wakeup (context);
-+        g_wakeup_signal (context->wakeup);
-       UNLOCK_CONTEXT (context);
-     }
- }
-@@ -4318,7 +4295,7 @@ g_main_context_add_poll_unlocked (GMainContext *context,
-   context->poll_changed = TRUE;
- 
-   /* Now wake up the main loop if it is waiting in the poll() */
--  conditional_wakeup (context);
-+  g_wakeup_signal (context->wakeup);
- }
- 
- /**
-@@ -4378,7 +4355,7 @@ g_main_context_remove_poll_unlocked (GMainContext *context,
-   context->poll_changed = TRUE;
- 
-   /* Now wake up the main loop if it is waiting in the poll() */
--  conditional_wakeup (context);
-+  g_wakeup_signal (context->wakeup);
- }
- 
- /**
--- 
-cgit v0.12
-

glib2-rpmlintrc

@@ -1,2 +1,10 @@
-addFilter(".*shlib-fixed-dependency.*glib2")
+# Adding gio-branding for the following filter
+addFilter(".*shlib-fixed-dependency.*[glib2|gio\-branding].*")
+# Filter for non-conffile-in-etc warning for the following files
+# under /etc/profile.d/ and /etc/rpm/ directories, respectively:
+# zzz-glib2.csh and zzz-glib2.sh, and macros.glib2
+addFilter("glib2.*non-conffile-in-etc.*[zzz\-glib2.*|macros\.glib2]")
+# Filter for env-script-intepreter for the following files under
+# /usr/bin directory: gdbus-codegen, glib-genmarshal and glib-mkenums
+addFilter(".*env-script-interpreter.*/usr/bin/[gdbus\-codegen|glib\-.*].*")
 

glib2.changes

@@ -1,3 +1,98 @@
+-------------------------------------------------------------------
+Wed Feb 28 16:26:40 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+-------------------------------------------------------------------
+Wed Feb  7 09:50:06 UTC 2018 - dimstar@opensuse.org
+
+- Update to version 2.55.2:
+  + GFile now has API to get the path without copying.
+  + A network monitor implementation for Windows has been added.
+  + Bugs fixed: bgo#520116, bgo#584284, bgo#605700, bgo#658713,
+    bgo#685442, bgo#723003, bgo#749583, bgo#757284, bgo#760324,
+    bgo#761102, bgo#767976, bgo#770335, bgo#772989, bgo#790698,
+    bgo#791015, bgo#791622, bgo#792050, bgo#792217, bgo#792338,
+    bgo#792351, bgo#792364, bgo#792370, bgo#792410, bgo#792432,
+    bgo#792455, bgo#792499, bgo#792516, bgo#792777, bgo#792780,
+    bgo#792856, bgo#792862, bgo#792903, bgo#793006, bgo#793026,
+    bgo#793074.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Feb  5 02:55:01 UTC 2018 - dimstar@opensuse.org
+
+- Update to version 2.55.1:
+  + Build:
+    - The --enable-rebuilds configure option has been removed.
+    - The --with-charsetalias-dir configure option has been added.
+  + GList and GSList now have autoptr support.
+  + The gsettings list-schemas command has gained a --print-paths
+    option.
+  + Bugs fixed: bgo#346816, bgo#508976, bgo#562334, bgo#662802,
+    bgo#684282, bgo#692034, bgo#694723, bgo#697715, bgo#701156,
+    bgo#720380, bgo#724383, bgo#724412, bgo#724794, bgo#732003,
+    bgo#734479, bgo#737677, bgo#741167, bgo#748534, bgo#749527,
+    bgo#749652, bgo#754634, bgo#756011, bgo#761102, bgo#773980,
+    bgo#776147, bgo#776195, bgo#777075, bgo#779413, bgo#780309,
+    bgo#780893, bgo#782057, bgo#784995, bgo#786796, bgo#788806,
+    bgo#788936, bgo#790416, bgo#790588, bgo#790697, bgo#790785,
+    bgo#790829, bgo#790830, bgo#790837, bgo#790839, bgo#790877,
+    bgo#790894, bgo#790896, bgo#790914, bgo#790934, bgo#790948,
+    bgo#791036, bgo#791128, bgo#791221, bgo#791235, bgo#791267,
+    bgo#791296, bgo#791318, bgo#791325, bgo#791334, bgo#791337,
+    bgo#791342, bgo#791460, bgo#791532, bgo#791622, bgo#791720,
+    bgo#791744, bgo#791745, bgo#791906, bgo#792064, bgo#792098,
+    bgo#792099, bgo#792129, bgo#792322, bgo#792324.
+  + Updated translations.
+- Rebase glib2-gdbus-codegen-version.patch.
+- Drop glib2-gtester-report-py3.patch: fixed upstream.
+- Drop glib2-gmain-partial-revert.patch: fixed upstream.
+
+-------------------------------------------------------------------
+Mon Feb  5 02:55:00 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 2.55.0:
+  + New API:
+    - g_clear_handle_id, to simplify removing sources from the
+      default mainloop.
+    - g_file_load_bytes, to make it more convenient to load files
+      into GBytes.
+  + Bugs fixed: bgo#330458, bgo#483341, bgo#569375, bgo#573251,
+    bgo#629347, bgo#630983, bgo#632953, bgo#636210, bgo#656502,
+    bgo#661442, bgo#668035, bgo#670139, bgo#677233, bgo#679347,
+    bgo#679467, bgo#689323, bgo#691436, bgo#695681, bgo#705331,
+    bgo#706667, bgo#711809, bgo#722256, bgo#723655, bgo#723743,
+    bgo#725014, bgo#727346, bgo#730296, bgo#731625, bgo#731705,
+    bgo#737278, bgo#738176, bgo#740223, bgo#740791, bgo#740826,
+    bgo#742548, bgo#742997, bgo#745723, bgo#749371, bgo#751738,
+    bgo#752239, bgo#752240, bgo#753459, bgo#753521, bgo#754026,
+    bgo#756009, bgo#756103, bgo#756128, bgo#756430, bgo#756470,
+    bgo#756588, bgo#760022, bgo#760109, bgo#760716, bgo#765063,
+    bgo#765552, bgo#767215, bgo#767239, bgo#769674, bgo#769846,
+    bgo#770459, bgo#773355, bgo#774083, bgo#776562, bgo#777308,
+    bgo#777310, bgo#777956, bgo#779182, bgo#779501, bgo#780202,
+    bgo#780296, bgo#781598, bgo#781867, bgo#783210, bgo#783270,
+    bgo#783825, bgo#786737, bgo#786785, bgo#787271, bgo#787485,
+    bgo#787551, bgo#787581, bgo#787671, bgo#787731, bgo#788138,
+    bgo#788270, bgo#788368, bgo#788384, bgo#788385, bgo#788401,
+    bgo#788467, bgo#788488, bgo#788489, bgo#788561, bgo#788594,
+    bgo#788705, bgo#788766, bgo#788772, bgo#788863, bgo#788880,
+    bgo#788927, bgo#788936, bgo#788948, bgo#788975, 7889bgo#78,
+    bgo#788989, bgo#788990, bgo#789087, bgo#789170, bgo#789245,
+    bgo#789444, bgo#789637, bgo#789681, bgo#789723, bgo#789755,
+    bgo#789820, bgo#790015, bgo#790030, bgo#790093, bgo#790126,
+    bgo#790147, bgo#790157, bgo#790272, bgo#790275, bgo#790310.
+  + Updated translations.
+- Switch libmount-devel by its pkgconfig counterpart as configure
+  only looks for this module.
+- Add libgio-2_0-0 for the rpmlintrc shlib-fixed-dependency warning
+  filter. And add 2 extra filters:
+  + non-conffile-in-etc warning for zzz-gilb2.csh, zzz-glib2.sh and
+    macros.glib2 files.
+  + env-script-interpreter warning for gdbus-codegen,
+    glib-genmarshal nad glib-mkenums files.
+
 -------------------------------------------------------------------
 Wed Jan 31 21:34:18 UTC 2018 - bjorn.lie@gmail.com
 
@@ -1472,12 +1567,6 @@ Wed Jan  8 13:53:33 UTC 2014 - adrian@suse.de
 -------------------------------------------------------------------
 Sun Nov 17 20:02:45 UTC 2013 - dimstar@opensuse.org
 
-- Add glib2-dbus-socket-path.patch: Have gio look for the system
-  dbus socket in /run instead of /var/run (bnc#845287).
-
--------------------------------------------------------------------
-Sun Nov 17 20:02:45 UTC 2013 - dimstar@opensuse.org
-
 - Add glib2-dbus-socket-path.patch: Have gio look for the system
   dbus socket in /run instead of /var/run (bnc#845287).
 

glib2.spec

@@ -19,14 +19,14 @@
 %define with_systemtap 0
 %define _name glib
 Name:           glib2
-Version:        2.54.3
+Version:        2.55.2
 Release:        0
 # FIXME: find out if tapsets should really be in devel package or in main package
 Summary:        General-Purpose Utility Library
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
-Url:            http://www.gtk.org/
+URL:            http://www.gtk.org/
-Source:         http://download.gnome.org/sources/glib/2.54/%{_name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/glib/2.55/%{_name}-%{version}.tar.xz
 Source1:        glib2.sh
 Source2:        glib2.csh
 # Not upstream file. Only proposes upstream packages:
@@ -53,14 +53,11 @@ Patch14:        glib2-dbus-socket-path.patch
 Patch16:        glib2-gdbus-codegen-version.patch
 # PATCH-FIX-UPSTREAM glib2-gsettings-overrides-per-session.patch bgo#746592 bsc#1070090 xwang@suse.com -- gsettings default value can be overridden depending on session
 Patch18:        glib2-gsettings-overrides-per-session.patch
-# PATCH-FIX-UPSTREAM glib2-gmain-partial-revert.patch bgo#761102 bjorn.lie@gmail.com -- gmain: Partial revert of recent wakeup changes to gmain.c
-Patch19:        glib2-gmain-partial-revert.patch
 BuildRequires:  automake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gamin-devel
 BuildRequires:  gcc-c++
-BuildRequires:  libmount-devel
 BuildRequires:  libselinux-devel
 # glib/Makefile.am calls config.status, and thus triggers a bootstrap
 BuildRequires:  libtool
@@ -71,9 +68,11 @@ BuildRequires:  python3-xml
 BuildRequires:  xsltproc
 # Needed for gresource
 BuildRequires:  pkgconfig(libelf) >= 0.8.12
-BuildRequires:  pkgconfig(libffi)
+BuildRequires:  pkgconfig(libffi) >= 3.0.0
 BuildRequires:  pkgconfig(libpcre) >= 8.13
+BuildRequires:  pkgconfig(mount) >= 2.28
 BuildRequires:  pkgconfig(zlib)
+# FIXME: use proper Requires(pre/post/preun/...)
 PreReq:         /bin/sed
 # For temporary %%posttrans script only.
 PreReq:         coreutils
@@ -107,7 +106,7 @@ Summary:        Upstream definitions of default settings and applications
 Group:          System/Libraries
 Requires:       libgio-2_0-0 = %{version}
 Supplements:    packageand(libgio-2_0-0:branding-upstream)
-Conflicts:      otherproviders(gio-branding)
+Conflicts:      gio-branding
 Provides:       %{name}-branding-upstream = %{version}
 Obsoletes:      %{name}-branding-upstream < %{version}
 Provides:       gio-branding = %{version}
@@ -143,10 +142,6 @@ Requires:       pkgconfig
 Requires:       python3-xml
 Provides:       glib2-doc = 2.19.6
 Obsoletes:      glib2-doc < 2.19.6
-# bug437293
-%ifarch ppc64
-Obsoletes:      glib2-devel-64bit
-%endif
 #
 
 %description devel
@@ -174,10 +169,6 @@ Group:          System/Libraries
 Recommends:     %{name}-lang
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
-# bug437293
-%ifarch ppc64
-Obsoletes:      glib2-64bit
-%endif
 #
 
 %description -n libglib-2_0-0
@@ -270,12 +261,14 @@ translation-update-upstream
 %patch14 -p1
 %patch16 -p1
 %patch18 -p1
-%patch19 -p1
 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} .
 cp -a %{SOURCE4} gnome_defaults.conf
 if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
     cp -a %{SOURCE7} m4macros/
 fi
+# replace /usr/bin/env shebangs
+# /usr/bin/env @PYTHON@ -> @PYTHON@ (will be replaced by correct py interpreter by configure
+grep "%{_bindir}/env @PYTHON@" . -rl | xargs sed -i "s|%{_bindir}/env @PYTHON@|@PYTHON@|g"
 
 %build
 # glib/Makefile.am always calls config.status, which requires aclocal
@@ -291,8 +284,7 @@ autoreconf -fi
     --enable-systemtap \
 %endif
     --with-pcre=system
-
+%make_build
-make %{?_smp_mflags} V=1
 
 %check
 # make check does not work on x86_64. See http://bugzilla.gnome.org/show_bug.cgi?id=554969
@@ -322,7 +314,7 @@ touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache
 # gsettings magic
 touch %{buildroot}%{_datadir}/glib-2.0/schemas/gschemas.compiled
 # remove files we don't care about
-find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
 rm %{buildroot}%{_libdir}/gio/modules/libgiofam.a
 # Install rpm macros
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
@@ -353,11 +345,8 @@ fi
 %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 %post -n libglib-2_0-0 -p /sbin/ldconfig
-
 %post -n libgobject-2_0-0 -p /sbin/ldconfig
-
 %post -n libgthread-2_0-0 -p /sbin/ldconfig
-
 %post -n libgio-2_0-0
 /sbin/ldconfig
 for ENV in gnome xfce lxde ; do
@@ -370,7 +359,6 @@ fi
 done
 
 %post -n libgmodule-2_0-0 -p /sbin/ldconfig
-
 %post -n libgio-fam
 %if 0
 ###############################################################################
@@ -384,15 +372,10 @@ done
 %endif
 
 %postun -n libglib-2_0-0 -p /sbin/ldconfig
-
 %postun -n libgobject-2_0-0 -p /sbin/ldconfig
-
 %postun -n libgthread-2_0-0 -p /sbin/ldconfig
-
 %postun -n libgio-2_0-0 -p /sbin/ldconfig
-
 %postun -n libgmodule-2_0-0 -p /sbin/ldconfig
-
 %postun -n libgio-fam
 %if 0
 ###############################################################################
@@ -406,7 +389,6 @@ done
 %endif
 
 %files tools
-%defattr(-,root,root)
 %{_bindir}/gapplication
 %{_bindir}/gdbus
 %{_bindir}/gio
@@ -436,29 +418,24 @@ done
 %{_sysconfdir}/profile.d/zzz-glib2.*
 
 %files -n gio-branding-upstream
-%defattr(-,root,root)
 %doc README.Gsettings-overrides
 %config (noreplace) %{_sysconfdir}/gnome_defaults.conf
 
 %files -n libglib-2_0-0
-%defattr(-, root, root)
+%license COPYING
-%doc AUTHORS COPYING README NEWS
+%doc AUTHORS README NEWS
 %{_libdir}/libglib*.so.*
 
 %files -n libgmodule-2_0-0
-%defattr(-, root, root)
 %{_libdir}/libgmodule*.so.*
 
 %files -n libgobject-2_0-0
-%defattr(-, root, root)
 %{_libdir}/libgobject*.so.*
 
 %files -n libgthread-2_0-0
-%defattr(-, root, root)
 %{_libdir}/libgthread*.so.*
 
 %files -n libgio-2_0-0
-%defattr(-, root, root)
 %{_libdir}/libgio*.so.*
 %dir %{_libdir}/gio
 %dir %{_libdir}/gio/modules
@@ -473,13 +450,11 @@ done
 %ghost %{_localstatedir}/cache/gio-2.0/lxde-mimeapps.list
 
 %files -n libgio-fam
-%defattr(-,root,root)
 %{_libdir}/gio/modules/libgiofam.so
 
 %files lang -f %{_name}20.lang
 
 %files devel
-%defattr(-,root,root)
 %doc ChangeLog
 %{_bindir}/gdbus-codegen
 %{_bindir}/glib-compile-resources
@@ -489,14 +464,14 @@ done
 %{_bindir}/gobject-query
 %{_bindir}/gtester
 %{_bindir}/gtester-report
-%{_mandir}/man?/gdbus-codegen.*
+%{_mandir}/man?/gdbus-codegen*%{ext_man}
-%{_mandir}/man?/glib-compile-resources.*
+%{_mandir}/man?/glib-compile-resources*%{ext_man}
-%{_mandir}/man?/glib-genmarshal.*
+%{_mandir}/man?/glib-genmarshal*%{ext_man}
-%{_mandir}/man?/glib-gettextize.*
+%{_mandir}/man?/glib-gettextize*%{ext_man}
-%{_mandir}/man?/glib-mkenums.*
+%{_mandir}/man?/glib-mkenums*%{ext_man}
-%{_mandir}/man?/gobject-query.*
+%{_mandir}/man?/gobject-query*%{ext_man}
-%{_mandir}/man?/gtester.*
+%{_mandir}/man?/gtester*%{ext_man}
-%{_mandir}/man?/gtester-report.*
+%{_mandir}/man?/gtester-report*%{ext_man}
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/glib-2.0.m4
 %{_datadir}/aclocal/glib-gettext.m4
@@ -533,7 +508,6 @@ done
 %dir %{_datadir}/gdb/auto-load%{_libdir}
 
 %files devel-static
-%defattr(-,root,root)
 %{_libdir}/lib*.a
 
 %changelog