rpm/xfconf
SHA256
1
0
Fork 0
forked from pool/xfconf
Code Pull Requests Activity

Accepting request 861623 from X11:xfce

Browse Source 
Fixed build dependency cycle. Do not require exo-tools as built dependency as it's not supposed to

OBS-URL: https://build.opensuse.org/request/show/861623
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfconf?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger 2021-01-11 16:11:03 +00:00 committed by Git OBS Bridge
parent 0936500473
commit 5cfeb13938
5 changed files with 82 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xfconf-4.14.4.tar.bz2
View File

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

3
xfconf-4.16.0.tar.bz2 Normal file
View File

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

23
xfconf-4.7.3-remove-rpath.patch
View File

@ -1,23 +0,0 @@
Index: xfconf-4.7.4/xfconf-perl/Makefile.PL.in
===================================================================
--- xfconf-4.7.4.orig/xfconf-perl/Makefile.PL.in
+++ xfconf-4.7.4/xfconf-perl/Makefile.PL.in
@@ -98,6 +98,18 @@ WriteMakefile(
$xfconf->get_makefile_vars,
);
+rename "Makefile.perl", "Makefile.perl.orig"
+ or die "Cannot rename: $!";
+open IN, "<Makefile.perl.orig"
+ or die "Cannot open: $!";
+open OUT, ">Makefile.perl"
+ or die "Cannot create: $!";
+while (<IN>)
+{
+ print OUT $_ unless /^LD_RUN_PATH /;
+}
+close IN;
+close OUT;
sub MY::postamble
{

46
xfconf.changes
View File

@ -1,3 +1,49 @@
-------------------------------------------------------------------
Fri Jan 8 11:54:44 UTC 2021 - Maurizio Galli <maurizio.galli@gmail.com>
- %{_sysconfdir}/xdg/xfce4 needs to be owned by the package
-------------------------------------------------------------------
Fri Jan 8 11:32:48 UTC 2021 - Maurizio Galli <maurizio.galli@gmail.com>
- Do not require exo-tools as built dependency. It is not supposed
to depend on it.
-------------------------------------------------------------------
Wed Dec 23 00:57:06 UTC 2020 - Maurizio Galli <maurizio.galli@gmail.com>
- Update to version 4.16.0
* Don't use shebang for bash completion file
* Remove GLIB_CHECK_VERSION IFDEFs which are obsolete after glib bump
* bump glib (and gio, gthread, etc) minimum to 2.50.0
* remove last traces of xfconf-perl
* Fix make distcheck and enable it on gitlab CI
* Add README.md to EXTRA_DIST
-------------------------------------------------------------------
Mon Nov 9 12:05:03 UTC 2020 - Marcel Kuehlhorn <tux93@opensuse.org>
- Update to version 4.15.1
* Fix stray double-quote in bash-completion PKG_CONFIG invocation
* Disable parallelism on all tests
* Adds new README.md and updates AM_INIT_AUTOMAKE
* xfconf-cache: Fix access to freed data (gxo#xfce/xfconf#16)
* Translation Updates
- Update to version 4.15.0
* Implement custom test driver
* Use 'gsettings' as a common channel name for the GSetting backend
* bxo#14789: Fix GSettings backend assertion error, when probed
but not used
* Enable GSettings backend build by default
* Add Bash completion for xfconf-query
* bxo#15960: Add some missing xfconf_shutdown() in xfconf-query
* bxo#15951: Fix 'xfconf_get_error_quark' introspecting warning
* Remove perl bindings
* Fix vala binding in dist tarball
* Translation Updates
- Removed xfconf-4.7.3-remove-rpath.patch
-------------------------------------------------------------------
Mon Nov 9 09:21:40 UTC 2020 - Ali Abdallah <ali.abdallah@suse.com>

64
xfconf.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xfconf
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,21 +16,23 @@
#
# gobject-introspection build fails with lto, see:
# https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/247
%define _lto_cflags %{nil}
%bcond_with git
%define libname libxfconf-0-3
Name: xfconf
Version: 4.14.4
Version: 4.16.0
Release: 0
Summary: Simple Configuration Storage for Xfce
License: GPL-2.0-or-later
Group: System/GUI/XFCE
URL: https://docs.xfce.org/xfce/xfconf/start
Source0: https://archive.xfce.org/src/xfce/xfconf/4.14/%{name}-%{version}.tar.bz2
Source0: https://archive.xfce.org/src/xfce/xfconf/4.16/%{name}-%{version}.tar.bz2
Source1: xfconf-query.1
Source100: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE xfconf-remove-rpath.patch gber@opensuse.org -- Do not set RPATH for Xfconf.so
Patch0: xfconf-4.7.3-remove-rpath.patch
BuildRequires: intltool
BuildRequires: pkgconfig
BuildRequires: perl(ExtUtils::Depends)
@ -42,9 +44,11 @@ BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gobject-2.0) >= 2.42.0
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gthread-2.0) >= 2.42.0
BuildRequires: pkgconfig(gtk-doc)
BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.10.0
BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.14
BuildRequires: pkgconfig(vapigen)
%if %{with git}
BuildRequires: xfce4-dev-tools
%endif
@ -54,16 +58,6 @@ Recommends: %{name}-lang = %{version}
Xfconf is a simple client-server configuration storage and query system for the
Xfce desktop.
%package -n perl-xfconf
Summary: Perl Interface to xfconf
Group: Development/Libraries/Perl
Requires: %{name} = %{version}
Requires: perl = %{perl_version}
Requires: perl(Glib)
%description -n perl-xfconf
This package contains the Perl interface to %{name}.
%package -n %{libname}
Summary: Xfconf Shared Library
Group: System/Libraries
@ -87,6 +81,13 @@ Obsoletes: xfce-mcs-manager-devel < %{version}
This package contains the files needed for developing applications using
xfconf.
%package -n typelib-1_0-Xfconf-0
Summary: Xfconf Shared Library
Group: System/Libraries
%description -n typelib-1_0-Xfconf-0
GObject introspection bindings for Xfconf
# this should be replaced by %%lang_package once bnc#513786 is resolved
%package lang
Summary: Languages for package %{name}
@ -109,15 +110,13 @@ NOCONFIGURE=1 ./autogen.sh
--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-vala=yes \
--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-vala=yes \
--enable-gtk-doc
%endif
%make_build
@ -127,7 +126,7 @@ NOCONFIGURE=1 ./autogen.sh
install -D -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/xfconf-query.1
rm -f %{buildroot}%{_libdir}/*.la \
%{buildroot}%{perl_vendorarch}/auto/Xfce4/Xfconf/Xfconf.bs
%{buildroot}%{_libdir}/gio/modules/*.la
%perl_process_packlist
@ -135,23 +134,33 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,ur_PK}
%find_lang %{name} %{?no_lang_C}
mkdir -p %{buildroot}%{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%files
%doc AUTHORS NEWS TODO
%doc AUTHORS NEWS TODO README.md
%license COPYING
%{_bindir}/xfconf-query
%dir %{_sysconfdir}/xdg/xfce4
%dir %{_sysconfdir}/xdg/xfce4/xfconf
%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
%dir %{_libexecdir}/xfce4
%dir %{_libexecdir}/xfce4/xfconf
%{_libexecdir}/xfce4/xfconf/xfconfd
%{_datadir}/dbus-1/services/org.xfce.Xfconf.service
%{_datadir}/bash-completion/completions/xfconf-query
%doc %{_mandir}/man1/xfconf-query.1*
%files -n %{libname}
%license COPYING
%{_libdir}/libxfconf-*.so.*
%{_libdir}/gio/modules/libxfconfgsettingsbackend.so
%files -n typelib-1_0-Xfconf-0
%{_libdir}/girepository-1.0/Xfconf-0.typelib
%files lang -f %{name}.lang
@ -162,14 +171,7 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,ur_PK}
%{_includedir}/xfce4
%{_libdir}/libxfconf-*.so
%{_libdir}/pkgconfig/libxfconf-*.pc
%files -n perl-xfconf
%doc %{_mandir}/man3/Xfce4::Xfconf.3pm*
%dir %{perl_vendorarch}/Xfce4
%{perl_vendorarch}/Xfce4/Xfconf
%{perl_vendorarch}/Xfce4/Xfconf.pm
%dir %{perl_vendorarch}/auto
%dir %{perl_vendorarch}/auto/Xfce4
%{perl_vendorarch}/auto/Xfce4/Xfconf
%{_datadir}/vala/vapi/libxfconf-0.*
%{_datadir}/gir-1.0/Xfconf-0.gir
%changelog