X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxfconf.git;a=blobdiff_plain;f=xfconf.spec;h=79fd0a11957bddfabd7e11b9b69823a59db99e6b;hp=d09a4cdbb7995df5777499b20df655c0f7760405;hb=HEAD;hpb=fed3f1b663b51247f183055f3907c9800b2b4b23

diff --git a/xfconf.spec b/xfconf.spec
index d09a4cd..79fd0a1 100644
--- a/xfconf.spec
+++ b/xfconf.spec
@@ -1,37 +1,35 @@
-#
-%include	/usr/lib/rpm/macros.perl
-#
-%define		xfce_version	4.10.0
+%define		xfce_version	4.18.0
 Summary:	Simple configuration storage and query system
 Summary(pl.UTF-8):	Prosty system przechowywania i odpytywania konfiguracji
 Name:		xfconf
-Version:	4.10.0
-Release:	4
+Version:	4.18.3
+Release:	1
 License:	LGPL v2
 Group:		Libraries
-Source0:	http://archive.xfce.org/xfce/4.10/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	4ed48150a03fb5f42b455494307b7f28
-URL:		http://www.xfce.org/projects/xfconf
-BuildRequires:	dbus-devel >= 1.1.0
-BuildRequires:	dbus-glib-devel >= 0.84
+Source0:	https://archive.xfce.org/src/xfce/xfconf/4.18/%{name}-%{version}.tar.bz2
+# Source0-md5:	f807ed0a1b88af479ec70b28c1f78dcc
+URL:		https://docs.xfce.org/xfce/xfconf/start
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.24.0
-BuildRequires:	gtk-doc >= 1.0
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.66.0
+BuildRequires:	gobject-introspection-devel >= 1.66.0
+BuildRequires:	gtk-doc >= 1.20
+BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libxfce4util-devel >= %{xfce_version}
-BuildRequires:	perl-ExtUtils-Depends >= 0.3
+BuildRequires:	perl-ExtUtils-Depends >= 0.300
 BuildRequires:	perl-ExtUtils-PkgConfig >= 1.0
 BuildRequires:	perl-Glib-devel >= 1.224-2
 BuildRequires:	perl-devel >= 1:5.6
 BuildRequires:	pkgconfig
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.98
-BuildRequires:	xfce4-dev-tools >= 4.10.0
-Requires:	dbus-glib >= 0.84
-Requires:	dbus-libs >= 1.1.0
-Requires:	glib2 >= 1:2.24.0
+BuildRequires:	rpmbuild(macros) >= 2.000
+BuildRequires:	vala
+BuildRequires:	xfce4-dev-tools >= 4.18.0
+Requires:	glib2 >= 1:2.66.0
 Requires:	libxfce4util >= %{xfce_version}
-Obsoletes:	libxfce4mcs
+Obsoletes:	libxfce4mcs < 4.5
+Obsoletes:	perl-Xfce4-Xfconf < 4.16
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,11 +44,9 @@ Summary:	Header files for Xfconf library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Xfconf
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	dbus-devel >= 1.1.0
-Requires:	dbus-glib-devel >= 0.84
-Requires:	glib2-devel >= 1:2.24.0
-Obsoletes:	libxfce4mcs-devel
-Obsoletes:	xfce-mcs-manager-devel
+Requires:	glib2-devel >= 1:2.66.0
+Obsoletes:	libxfce4mcs-devel < 4.5
+Obsoletes:	xfce-mcs-manager-devel < 4.5
 
 %description devel
 Header files for Xfconf library.
@@ -63,7 +59,8 @@ Summary:	Xfconf API documentation
 Summary(pl.UTF-8):	Dokumentacja API Xfconf
 Group:		Documentation
 Requires:	gtk-doc-common
-Obsoletes:	libxfce4mcs-apidocs
+Obsoletes:	libxfce4mcs-apidocs < 4.5
+BuildArch:	noarch
 
 %description apidocs
 Xfconf API documentation.
@@ -71,18 +68,33 @@ Xfconf API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API Xfconf.
 
-%package -n perl-Xfce4-Xfconf
-Summary:	Perl interface to the Xfce4 Xfconf
-Summary(pl.UTF-8):	Interfejs perlowy do Xfce4 Xfconf
-Group:		Development/Languages/Perl
-Requires:	%{name} = %{version}-%{release}
-Requires:	perl-Glib >= 1.020
+%package -n bash-completion-xfconf-query
+Summary:	bash-completion for xfconf-query command
+Summary(pl.UTF-8):	bashowe uzupełnianie parametrów polecenia xfconf-query
+Group:		Applications/Shells
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	bash-completion >= 1:2.0
+BuildArch:	noarch
+
+%description -n bash-completion-xfconf-query
+Bash-completion for xfconf-query command.
+
+%description -n bash-completion-xfconf-query -l pl.UTF-8
+Bashowe uzupełnianie parametrów polecenia xfconf-query.
+
+%package -n vala-xfconf
+Summary:	Vala API for Xfconf library
+Summary(pl.UTF-8):	API języka Vala do biblioteki Xfconf
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	vala
+BuildArch:	noarch
 
-%description -n perl-Xfce4-Xfconf
-Perl interface to the Xfce4 Xfconf.
+%description -n vala-xfconf
+Vala API for Xfconf library.
 
-%description -n perl-Xfce4-Xfconf -l pl.UTF-8
-Interfejs perlowy do Xfce4 Xfconf.
+%description -n vala-xfconf -l pl.UTF-8
+API języka Vala do biblioteki Xfconf.
 
 %prep
 %setup -q
@@ -91,8 +103,7 @@ Interfejs perlowy do Xfce4 Xfconf.
 %configure \
 	--enable-gtk-doc \
 	--disable-silent-rules \
-	--with-html-dir=%{_gtkdocdir} \
-	--with-perl-options="INSTALLDIRS=vendor"
+	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
@@ -102,13 +113,15 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Xfce4/Xfconf/.packlist
-
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gio/modules/libxfconfgsettingsbackend.la
+# unify
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{hy_AM,hy}
 # just a copy or ur
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ur_PK
+# not supported
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/hye
 
 %find_lang %{name}
 
@@ -123,30 +136,31 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS TODO
 %attr(755,root,root) %{_bindir}/xfconf-query
 %attr(755,root,root) %{_libdir}/libxfconf-0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxfconf-0.so.2
+%attr(755,root,root) %{_libdir}/gio/modules/libxfconfgsettingsbackend.so
+%attr(755,root,root) %ghost %{_libdir}/libxfconf-0.so.3
 %dir %{_libdir}/xfce4/xfconf
 %attr(755,root,root) %{_libdir}/xfce4/xfconf/xfconfd
 %dir %{_sysconfdir}/xdg/xfce4/xfconf
 %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
 %{_datadir}/dbus-1/services/org.xfce.Xfconf.service
+%{_libdir}/girepository-1.0/Xfconf-0.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libxfconf-0.so
 %{_includedir}/xfce4/xfconf-0
 %{_pkgconfigdir}/libxfconf-0.pc
+%{_datadir}/gir-1.0/Xfconf-0.gir
 
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/xfconf
 
-%files -n perl-Xfce4-Xfconf
+%files -n bash-completion-xfconf-query
+%defattr(644,root,root,755)
+%{bash_compdir}/xfconf-query
+
+%files -n vala-xfconf
 %defattr(644,root,root,755)
-%dir %{perl_vendorarch}/Xfce4
-%{perl_vendorarch}/Xfce4/Xfconf.pm
-%dir %{perl_vendorarch}/Xfce4/Xfconf
-%{perl_vendorarch}/Xfce4/Xfconf/Install
-%dir %{perl_vendorarch}/auto/Xfce4
-%dir %{perl_vendorarch}/auto/Xfce4/Xfconf
-%attr(755,root,root) %{perl_vendorarch}/auto/Xfce4/Xfconf/Xfconf.so
-%{_mandir}/man3/Xfce4::Xfconf.3pm*
+%{_datadir}/vala/vapi/libxfconf-0.deps
+%{_datadir}/vala/vapi/libxfconf-0.vapi