diff --git a/xfconf-4.14.3.tar.bz2 b/xfconf-4.14.3.tar.bz2 deleted file mode 100644 index d872982..0000000 Binary files a/xfconf-4.14.3.tar.bz2 and /dev/null differ diff --git a/xfconf-4.16.0.tar.bz2 b/xfconf-4.16.0.tar.bz2 new file mode 100644 index 0000000..17aa9a2 Binary files /dev/null and b/xfconf-4.16.0.tar.bz2 differ diff --git a/xfconf.spec b/xfconf.spec index 2555de3..38b9d01 100644 --- a/xfconf.spec +++ b/xfconf.spec @@ -1,22 +1,45 @@ +%global xfceversion 4.16 + +%if 0%{?openEuler} +%bcond_with perl +%else +%bcond_without perl +%endif + Name: xfconf -Version: 4.14.3 +Version: 4.16.0 Release: 1 Summary: Hierarchical configuration system for Xfce + License: GPLv2 URL: http://www.xfce.org/ -Source0: http://archive.xfce.org/src/xfce/%{name}/4.14/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.14 +Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 + +BuildRequires: make +BuildRequires: glib2-devel +BuildRequires: pkgconfig(libxfce4util-1.0) >= %{xfceversion} BuildRequires: pkgconfig(dbus-1) >= 1.1.0 BuildRequires: pkgconfig(dbus-glib-1) >= 0.84 -BuildRequires: glib2-devel +%if %{with perl} +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: perl(ExtUtils::Depends) +BuildRequires: perl(ExtUtils::PkgConfig) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Glib) +BuildRequires: perl(Glib::MakeHelper) +%endif BuildRequires: gettext +BuildRequires: intltool BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel -BuildRequires: intltool BuildRequires: vala + Requires: dbus-x11 +Obsoletes: libxfce4mcs < 4.4.3-3 +Obsoletes: xfconf-perl < 4.13.8 + %description Xfconf is a hierarchical (tree-like) configuration system where the immediate child nodes of the root are called "channels". All settings @@ -29,16 +52,29 @@ Requires: pkgconfig Requires: dbus-devel Requires: dbus-glib-devel Requires: glib2-devel +Obsoletes: libxfce4mcs-devel < 4.4.3-3 +Obsoletes: xfce-mcs-manager-devel < 4.4.3-3 %description devel This package includes the libraries and header files you will need to compile applications for xfconf. +%if %{with perl} +%package perl +Summary: Perl modules for xfconf +Requires: %{name} = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%description perl +This package includes the perl modules and files you will need to +interact with xfconf using perl. +%endif + %prep %setup -q %build -%configure --disable-static +%configure --disable-static --with-perl-options=INSTALLDIRS="vendor" sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool export LD_LIBRARY_PATH="`pwd`/xfconf/.libs" @@ -48,6 +84,23 @@ export LD_LIBRARY_PATH="`pwd`/xfconf/.libs" %install %make_install +# fix permissions for installed libraries +chmod 755 %{buildroot}/%{_libdir}/*.so + +%if %{with perl} +# remove perl temp file +rm -f %{buildroot}/%{perl_archlib}/perllocal.pod + +# remove unneeded dynloader bootstrap file +rm -f %{buildroot}/%{perl_vendorarch}/auto/Xfce4/Xfconf/Xfconf.bs + +# fix permissions on the .so file +chmod 755 %{buildroot}/%{perl_vendorarch}/auto/Xfce4/Xfconf/Xfconf.so +%endif + +# remove .packlist files. +find %{buildroot} -type f -name .packlist -exec rm -f {} \; + # get rid of .la files find %{buildroot} -type f -name *.la -exec rm -f {} \; @@ -55,7 +108,7 @@ find %{buildroot} -type f -name *.la -exec rm -f {} \; %files -f %{name}.lang %license COPYING -%doc AUTHORS ChangeLog NEWS TODO +%doc AUTHORS NEWS TODO %{_libdir}/lib*.so.* %{_bindir}/xfconf-query %{_libdir}/xfce4/xfconf/ @@ -64,13 +117,26 @@ find %{buildroot} -type f -name *.la -exec rm -f {} \; %{_datadir}/vala/vapi/libxfconf-0.vapi %{_datadir}/dbus-1/services/org.xfce.Xfconf.service %{_datadir}/gir-1.0/Xfconf-0.gir +%{_datadir}/bash-completion/completions/xfconf-query %files devel %doc %{_datadir}/gtk-doc %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/xfce4/xfconf-0 +%{_libdir}/gio/modules/libxfconfgsettingsbackend.so +%{_datadir}/gtk-doc/html/%{name}/* + +%if %{with perl} +%files perl +%{perl_vendorarch}/auto/* +%{perl_vendorarch}/Xfce4 +%{_mandir}/man3/*.3* +%endif %changelog +* Fri Jun 18 2021 zhanglin - 4.16.0-1 +- Update to 4.16.0 + * Mon Jul 6 2020 Dillon Chen - 4.14.3-1 - Init package