From 6020da237e59c6cf632cb11eb213a9f9cd877103ca9b11428541a5835be7d01f Mon Sep 17 00:00:00 2001 From: Maurizio Galli Date: Thu, 15 Aug 2019 01:03:59 +0000 Subject: [PATCH] Accepting request 722856 from X11:xfce:next Update for xfce 4.14 OBS-URL: https://build.opensuse.org/request/show/722856 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfconf?expand=0&rev=50 --- _service | 17 +++++++++++ xfconf-4.12.1.tar.bz2 | 3 -- xfconf-4.14.1.tar.bz2 | 3 ++ xfconf.changes | 71 +++++++++++++++++++++++++++++++++++++++++++ xfconf.spec | 62 ++++++++++++++++++++++++------------- 5 files changed, 132 insertions(+), 24 deletions(-) create mode 100644 _service delete mode 100644 xfconf-4.12.1.tar.bz2 create mode 100644 xfconf-4.14.1.tar.bz2 diff --git a/_service b/_service new file mode 100644 index 0000000..5720319 --- /dev/null +++ b/_service @@ -0,0 +1,17 @@ + + + + https://git.xfce.org/xfce/xfconf// + git + @PARENT_TAG@+git@TAG_OFFSET@.%h + enable + maurizio.galli@gmail.com + xfconf(.*) + + + + + xz + *.tar + + diff --git a/xfconf-4.12.1.tar.bz2 b/xfconf-4.12.1.tar.bz2 deleted file mode 100644 index 71e8da9..0000000 --- a/xfconf-4.12.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:35f48564e5694faa54fdc180cd3268e16fc2352946a89a3c2fc12cbe400ada36 -size 564131 diff --git a/xfconf-4.14.1.tar.bz2 b/xfconf-4.14.1.tar.bz2 new file mode 100644 index 0000000..b6aaebc --- /dev/null +++ b/xfconf-4.14.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b893e0a329aee00902fec2f0509f56916c9dcc7844e1b1f9e3c7399458290d59 +size 644804 diff --git a/xfconf.changes b/xfconf.changes index b6e490f..c086157 100644 --- a/xfconf.changes +++ b/xfconf.changes @@ -1,3 +1,74 @@ +------------------------------------------------------------------- +Sun Aug 11 22:46:29 UTC 2019 - Maurizio Galli + +- Update to version 4.14.1 + * Release rebuild for libxfconf-0.deps + +------------------------------------------------------------------- +Sun Aug 11 21:38:39 UTC 2019 - Maurizio Galli + +- Update to version 4.14.0 + * Translation updates +- Fixed up spec file + +------------------------------------------------------------------- +Thu Jun 27 14:56:46 UTC 2019 - Marcel Kuehlhorn + +- Update to Version 4.13.8 + * Add support for GObject introspection and vala + * Tests: Explicitly handle error reply from Ping method call + * Disable perl bindings by default + * Translation Updates + +------------------------------------------------------------------- +Sat May 18 11:24:16 UTC 2019 - Maurizio Galli + +- Update to version 4.13.7 + - Bump glib version + - bxo#15122: xfconf: disable gsettings backend by default + - Fix compiler error -Wcast-function-type (GCC 8) + - Fix this use of "defined" may not be portable + - Update .gitignore + - Fix warnings reported by GCC 8 (bxo#15112) + - Added gdbus binding to gitignore, add post release git tag + - Translation updates +- Fixed up dependencies + +------------------------------------------------------------------- +Sat Apr 27 11:43:00 UTC 2019 - maurizio.galli@gmail.com + +- Update to version 4.13.6 + * Added .NOTPARALLEL to property change test (bxo#13840) + * Implement an optional GSettings backend +- Changes from 4.13.5 + * Fix make distcheck, (bxo#14082) + * Handle empty arrays by initializing the GValue to G_TYPE_PTR_ARRAY (bxo#13780) +- Changes from 4.13.4 + * Fix segfault in xfconf_cache_set_property_reply_handler when + multiple calls are made (bug #13825) + * Allow to store empty arrays (bug #13791) + * Fix a path in xfconf_cache_set where the mutex isn't locked (bxo#13790) +- Changes from 4.13.3 + * Flush gdbus connection on xfconf_shutdown + * Correctly use xfconf_shutdown in xfconf-query + * Check for invalid GPtrArrays in the conversion + from GValue to GVariant. + * Fix some build issues in AM subdir-objects + * Fix some autogen.sh warnings + Better documentation processing. +- Changes from 4.13.2 + * Fix cache corruption due to a wrong g_value_unset call. + * Update API gtk documentation +- Changes from 4.13.1 + * Revert the bump of libxfconf version from 0 to 1, + to avoid massive changes in all xfce's components. +- Changes from 4.13.0 + * Port xfconf to gdbus + * Bump libxfconf version from 0 to 1. +- Clean up spec file and dropped obsolete macros +- Added conditional %bcond_with git for easier maintanance when using + git master branch + ------------------------------------------------------------------- Fri Sep 22 06:52:27 UTC 2017 - seife+obs@b1-systems.com diff --git a/xfconf.spec b/xfconf.spec index 5d63fa3..291bfe6 100644 --- a/xfconf.spec +++ b/xfconf.spec @@ -1,7 +1,7 @@ # # spec file for package xfconf # -# Copyright (c) 2015 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,19 +12,25 @@ # 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/ # -%define libname libxfconf-0-2 +%bcond_with git +%define libname libxfconf-0-3 + Name: xfconf -Version: 4.12.1 +Version: 4.14.1 Release: 0 Summary: Simple Configuration Storage for Xfce -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/XFCE -Url: http://www.xfce.org/projects#core -Source0: http://archive.xfce.org/src/xfce/xfconf/4.12/%{name}-%{version}.tar.bz2 +URL: https://docs.xfce.org/xfce/xfconf/start +%if %{with git} +Source0: %{name}-%{version}.tar.xz +%else +Source0: https://archive.xfce.org/src/xfce/xfconf/4.14/%{name}-%{version}.tar.bz2 +%endif Source1: xfconf-query.1 Source100: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE xfconf-remove-rpath.patch gber@opensuse.org -- Do not set RPATH for Xfconf.so @@ -33,13 +39,20 @@ BuildRequires: intltool BuildRequires: perl(ExtUtils::Depends) BuildRequires: perl(ExtUtils::PkgConfig) BuildRequires: perl(Glib) +BuildRequires: pkgconfig BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(gobject-2.0) >= 2.42.0 +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gthread-2.0) >= 2.42.0 BuildRequires: pkgconfig(gtk-doc) -BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.9.0 +BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.10.0 +%if %{with git} +BuildRequires: xfce4-dev-tools +%endif Recommends: %{name}-lang = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Xfconf is a simple client-server configuration storage and query system for the @@ -56,7 +69,7 @@ Requires: perl(Glib) This package contains the Perl interface to %{name}. %package -n %{libname} -Summary: xfconf Shared Library +Summary: Xfconf Shared Library Group: System/Libraries Recommends: %{name} = %{version} Provides: libxfce4mcs = %{version} @@ -91,16 +104,27 @@ BuildArch: noarch Provides translations to the package %{name} %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build +%if %{with git} +NOCONFIGURE=1 ./autogen.sh +%configure \ + --enable-maintainer-mode \ + --disable-static \ + --with-helper-path-prefix=%{_libexecdir} \ + --enable-perl-bindings \ + --with-perl-options='NOECHO= OPTIMIZE="%{optflags}" CCDLFLAGS="-Wl,-E" INSTALLDIRS=vendor' \ + --enable-gtk-doc +%else %configure \ --disable-static \ --with-helper-path-prefix=%{_libexecdir} \ + --enable-perl-bindings \ --with-perl-options='NOECHO= OPTIMIZE="%{optflags}" CCDLFLAGS="-Wl,-E" INSTALLDIRS=vendor' \ --enable-gtk-doc -make %{?_smp_mflags} V=1 +%endif +%make_build %install %make_install @@ -120,8 +144,8 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,ur_PK} %postun -n %{libname} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS COPYING NEWS TODO +%doc AUTHORS NEWS TODO +%license COPYING %{_bindir}/xfconf-query %dir %{_libexecdir}/xfce4 %dir %{_libexecdir}/xfce4/xfconf @@ -130,15 +154,12 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,ur_PK} %doc %{_mandir}/man1/xfconf-query.1* %files -n %{libname} -%defattr(-,root,root) -%doc COPYING +%license COPYING %{_libdir}/libxfconf-*.so.* %files lang -f %{name}.lang -%defattr(-,root,root) %files -n libxfconf-devel -%defattr(-,root,root) %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %doc %{_datadir}/gtk-doc/html/xfconf @@ -147,7 +168,6 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,ur_PK} %{_libdir}/pkgconfig/libxfconf-*.pc %files -n perl-xfconf -%defattr(-,root,root) %doc %{_mandir}/man3/Xfce4::Xfconf.3pm* %dir %{perl_vendorarch}/Xfce4 %{perl_vendorarch}/Xfce4/Xfconf