commit gconf2 for openSUSE:Leap:15.2

30 Jan 2020

Hello community,

here is the log from the commit of package gconf2 for openSUSE:Leap:15.2 checked in at 2020-01-30 14:49:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/gconf2 (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.gconf2.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gconf2"

Thu Jan 30 14:49:32 2020 rev:10 rq:757838 version:3.2.6

Changes:
--------

--- /work/SRC/openSUSE:Leap:15.2/gconf2/gconf2.changes	2020-01-15 14:59:05.553705795 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.gconf2.new.26092/gconf2.changes	2020-01-30 14:50:14.634897469 +0100
@@ -1,0 +2,26 @@
+Wed Nov  6 21:55:06 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Drop gtk3 BuildRequires, only used by gconf-sanity-check,
+  removed in version 3.2.6.
+- Only Require python3-base for gsettings-schema-convert, which
+  provides xml/etree.
+- Remove huge Changelog (commit log), the NEWS file is sufficient.
+
+-------------------------------------------------------------------
+Tue Jun 11 16:16:53 UTC 2019 - mgorse@suse.com
+
+- Run gsettings-schema-convert through 2to3, and adjust to use
+  python 3. Also require python3, rather than python, and remove
+  python-lxml Recommends (boo#1136216).
+
+-------------------------------------------------------------------
+Tue May 14 11:14:42 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Move RPM macros to %_rpmmacrodir.
+
+-------------------------------------------------------------------
+Wed Feb 28 16:25:39 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gconf2.spec ++++++
--- /var/tmp/diff_new_pack.I9dVaU/_old	2020-01-30 14:50:15.170897754 +0100
+++ /var/tmp/diff_new_pack.I9dVaU/_new	2020-01-30 14:50:15.174897756 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package gconf2
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,27 +12,18 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-Name:           gconf2
-BuildRequires:  dbus-1-glib-devel
-BuildRequires:  gobject-introspection-devel
-BuildRequires:  gtk3-devel
-BuildRequires:  intltool
-BuildRequires:  libidl-devel
-BuildRequires:  libxml2-devel
-BuildRequires:  polkit-devel
-BuildRequires:  translation-update-upstream
-BuildRequires:  update-desktop-files
-Url:            http://www.gnome.org/
 %define _name GConf
+Name:           gconf2
 Version:        3.2.6
 Release:        0
 Summary:        GNOME Configuration Database System
-License:        GPL-2.0+ and LGPL-2.1+
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          System/GUI/GNOME
+URL:            http://www.gnome.org/
 Source:         http://download.gnome.org/sources/GConf/3.2/%{_name}-%{version}.tar.xz
 # Generic tool, not upstreamed:
 Source1:        gconftool-rebuild
@@ -51,7 +42,16 @@
 Patch6:         gconf2-pass-warning-to-caller.patch
 # PATCH-FIX-OPENSUSE gconf2-fdatasync.patch mgorse@suse.com bsc#909045 -- Use fdatasync instead of fsync, and only if not installing
 Patch7:         gconf2-fdatasync.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  dbus-1-glib-devel
+BuildRequires:  gobject-introspection-devel
+BuildRequires:  intltool
+BuildRequires:  libidl-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  polkit-devel
+# for 2to3
+BuildRequires:  python3-tools
+BuildRequires:  translation-update-upstream
+BuildRequires:  update-desktop-files
 Recommends:     %{name}-lang = %{version}
 # gconf-sanity-check was dropped by upstream in GConf 3.2.6
 Obsoletes:      gconf-sanity-check < %{version}
@@ -83,9 +83,8 @@
 Summary:        Include files and libraries mandatory for development
 Group:          Development/Libraries/GNOME
 Requires:       %{name} = %{version}
-# For gsettings-schema-convert:
-Requires:       python
-Recommends:     python-lxml
+# For gsettings-schema-convert (xml/etree):
+Requires:       python3-base
 Provides:       gconf2-doc = %{version}
 Obsoletes:      gconf2-doc < %{version}
 
@@ -94,31 +93,31 @@
 to develop applications that require these.
 
 %lang_package
+
 %prep
 %setup -q -n %{_name}-%{version}
 translation-update-upstream
-%patch2 -p0
+%patch2
 %patch3
 %patch4
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-cp -a %{S:1} %{S:2} .
+2to3 --write --nobackup gsettings/gsettings-schema-convert
+sed -i "s/env python$/python3/" gsettings/gsettings-schema-convert
+cp -a %{SOURCE1} %{SOURCE2} .
 
 %build
 %configure --with-pic\
 	--libexecdir=%{_libexecdir}/GConf/2\
 	--disable-static \
-        --with-gtk=3.0 \
+        --disable-gtk \
         --disable-orbit
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-%if 0%{?suse_version} <= 1120
-%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
-%endif
-find %{buildroot} -name '*.la' -delete -print
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{_name}2
 %suse_update_desktop_file gsettings-data-convert
 # Empty dir for schemas.
@@ -134,8 +133,8 @@
 install gconftool-rebuild %{buildroot}%{_bindir}
 echo xml:merged:%{_sysconfdir}/gconf/gconf.xml.schemas >%{buildroot}%{_sysconfdir}/gconf/schema-install-source
 # Install rpm macros
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cp macros.gconf2 %{buildroot}%{_sysconfdir}/rpm
+mkdir -p %{buildroot}%{_rpmmacrodir}
+cp macros.gconf2 %{buildroot}%{_rpmmacrodir}
 
 %pre
 # FIXME: We should probably remove this entire section for 11.3 (Checked my mboman@suse.de, 2009-02-21)
@@ -175,18 +174,15 @@
     rm -rf etc/gconf/gconf.xml.schemas
 fi
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%license COPYING
+%doc AUTHORS NEWS README
 %{_bindir}/gconf-merge-tree
 %{_bindir}/gconftool-2
 %{_bindir}/gconftool-rebuild
 %{_bindir}/gsettings-data-convert
-%doc %{_mandir}/man1/gconftool-2.1*
-%doc %{_mandir}/man1/gsettings-data-convert.1*
+%{_mandir}/man1/gconftool-2.1*
+%{_mandir}/man1/gsettings-data-convert.1*
 %{_datadir}/dbus-1/services/org.gnome.GConf.service
 %{_libdir}/girepository-1.0/GConf-2.0.typelib
 %{_datadir}/sgml/gconf
@@ -214,7 +210,6 @@
 %{_sysconfdir}/xdg/autostart/gsettings-data-convert.desktop
 
 %files -n gconf-polkit
-%defattr(-, root, root)
 %{_libexecdir}/GConf/2/gconf-defaults-mechanism
 %{_datadir}/dbus-1/system-services/org.gnome.GConf.Defaults.service
 %{_datadir}/polkit-1/actions/org.gnome.gconf.defaults.policy
@@ -223,7 +218,6 @@
 %files lang -f %{_name}2.lang
 
 %files devel
-%defattr(-, root, root)
 %doc %{_datadir}/gtk-doc/html/gconf/
 %{_datadir}/aclocal/gconf-2.m4
 %{_datadir}/gir-1.0/GConf-2.0.gir
@@ -232,6 +226,6 @@
 %{_libdir}/pkgconfig/gconf-2.0.pc
 %{_bindir}/gsettings-schema-convert
 %{_mandir}/man1/gsettings-schema-convert.1*
-%{_sysconfdir}/rpm/macros.gconf2
+%{_rpmmacrodir}/macros.gconf2
 
 %changelog

    

root

tags

participants (1)