Accepting request 525961 from home:jengelh:branches:GNOME:Factory

- Avoid running fdupes across hardlink boundaries.
  Replace some old RPM macros.
- Update RPM groups and package summaries.

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

glib2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 14 00:13:58 UTC 2017 - jengelh@inai.de
+
+- Avoid running fdupes across hardlink boundaries.
+  Replace some old RPM macros.
+- Update RPM groups and package summaries.
+
 -------------------------------------------------------------------
 Mon Sep 11 08:13:13 UTC 2017 - zaitor@opensuse.org
 

glib2.spec

@@ -24,7 +24,7 @@ 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+
-Group:          System/Libraries
+Group:          Development/Libraries/C and C++
 Url:            http://www.gtk.org/
 Source:         http://download.gnome.org/sources/glib/2.54/%{_name}-%{version}.tar.xz
 Source1:        glib2.sh
@@ -90,7 +90,7 @@ data types, macros, type conversions, string utilities, file utilities,
 a main loop abstraction, and so on.
 
 %package tools
-Summary:        General-Purpose Utility Library -- Tools
+Summary:        Tools from glib2, a general-purpose utility library
 Group:          Development/Libraries/C and C++
 
 %description tools
@@ -124,7 +124,7 @@ This package provides upstream defaults for settings stored with
 GSettings and applications used by the MIME system.
 
 %package devel
-Summary:        General-Purpose Utility Library -- Development Files
+Summary:        Development files for glib, a general-purpose utility library
 # Now require the subpackages too
 Group:          Development/Libraries/C and C++
 Requires:       glib2-tools = %{version}
@@ -153,7 +153,7 @@ a main loop abstraction, and so on.
 This package contains the development files for GLib.
 
 %package devel-static
-Summary:        General-Purpose Utility Library -- Static Libraries
+Summary:        Static libraries for glib, a general-purpose utility library
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
 
@@ -194,7 +194,7 @@ The libgmodule library provides a portable way to dynamically load
 object files (commonly known as 'plug-ins').
 
 %package -n libgio-2_0-0
-Summary:        General-Purpose Utility Library -- Library for VFS
+Summary:        A virtual file system library API
 # The tools are useful for people having libgio
 Group:          System/Libraries
 Requires:       %{name}-tools
@@ -216,7 +216,7 @@ a main loop abstraction, and so on.
 GIO provides a modern, easy-to-use VFS API.
 
 %package -n libgio-fam
-Summary:        General-Purpose Utility Library -- GIO Module to use FAM
+Summary:        GIO module to use FAM
 # we need gio-querymodules in %post/%postun
 Group:          System/Libraries
 Requires(post): %{name}-tools
@@ -231,7 +231,7 @@ a main loop abstraction, and so on.
 This packages provides a GIO module to use FAM for file monitoring.
 
 %package -n libgthread-2_0-0
-Summary:        General-Purpose Utility Library -- Library for Threads
+Summary:        Portable API from glib wrapping system threads
 Group:          System/Libraries
 
 %description -n libgthread-2_0-0
@@ -243,7 +243,7 @@ The libgthread library provides a portable way to write multi-threaded
 software.
 
 %package -n libgobject-2_0-0
-Summary:        General-Purpose Utility Library -- Object-Oriented Framework for C
+Summary:        Object-Oriented Framework for C
 Group:          System/Libraries
 
 %description -n libgobject-2_0-0
@@ -289,10 +289,10 @@ make %{?_smp_mflags} V=1
 
 %check
 # make check does not work on x86_64. See http://bugzilla.gnome.org/show_bug.cgi?id=554969
-# %%{__make} %%{?jobs:-j%%jobs} check
+# %%{__make} %%{?_smp_mflags} check
 
 %install
-%makeinstall
+%make_install
 %if 0%{?suse_version} <= 1120
 rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
@@ -323,7 +323,7 @@ cp %{SOURCE6} %{buildroot}%{_sysconfdir}/rpm
 # Install zsh completion for gsettings
 mkdir -p  %{buildroot}%{_datadir}/zsh/site-functions/
 cp %{SOURCE8} %{buildroot}%{_datadir}/zsh/site-functions/_gsettings
-%fdupes %{buildroot}
+%fdupes %{buildroot}/%{_prefix}
 
 %posttrans
 # If it is an upgrade and gnome_defaults.conf were edited,