[packages/libxfce4ui] - up to 4.16.0

mrozowik mrozowik at pld-linux.org
Mon Dec 28 11:26:40 CET 2020 

commit 9872a0f7be01170e8f4fbcf4d38b9dc2df55f9cf
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Mon Dec 28 10:26:24 2020 +0000

    - up to 4.16.0

 libxfce4ui.spec | 90 +++++++++++++++++++++++++++------------------------------
 1 file changed, 42 insertions(+), 48 deletions(-)
---
diff --git a/libxfce4ui.spec b/libxfce4ui.spec
index bc55981..c091b25 100644
--- a/libxfce4ui.spec
+++ b/libxfce4ui.spec
@@ -1,50 +1,50 @@
 #
 # Conditional build:
-%bcond_without	glade3		# Glade3 catalog
+%bcond_without	gladeui2	# Glade catalog
 %bcond_with	static_libs	# static library
 
-%define		xfce_version	4.14.0
+%define		xfce_version	4.16.0
 Summary:	Various GTK+ widgets for Xfce
 Summary(pl.UTF-8):	Różne widgety GTK+ dla Xfce
 Name:		libxfce4ui
-Version:	4.14.1
+Version:	4.16.0
 Release:	1
 License:	LGPL v2
 Group:		X11/Libraries
-Source0:	https://archive.xfce.org/src/xfce/libxfce4ui/4.14/%{name}-%{version}.tar.bz2
-# Source0-md5:	50eae4bab5eeced186bce16fb5f802ac
+Source0:	https://archive.xfce.org/src/xfce/libxfce4ui/4.16/%{name}-%{version}.tar.bz2
+# Source0-md5:	4a7035374f016efa968b776a110065d9
 URL:		https://www.xfce.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-tools
-# if no glade3, then glade 3.x catalog can be installed
-#BuildRequires:	glade-devel >= 3.5.0
-BuildRequires:	glib2-devel >= 1:2.42.0
+%{?with_gladeui2:BuildRequires:	glade-devel >= 3.5.0}
+BuildRequires:	glib2-devel >= 1:2.50.0
 BuildRequires:	gobject-introspection-devel >= 1.30.0
-BuildRequires:	gtk+2-devel >= 2:2.24.0
 BuildRequires:	gtk+3-devel >= 3.18.0
 BuildRequires:	gtk-doc >= 1.0
 BuildRequires:	gtk-doc-automake >= 1.0
 BuildRequires:	intltool >= 0.35.0
-%{?with_glade3:BuildRequires:	libgladeui-devel >= 3.5.0}
+BuildRequires:	libgtop-devel >= 2.24.0
+BuildRequires:	libgudev-devel >= 232
 BuildRequires:	libtool >= 2:2.4
 BuildRequires:	libxfce4util-devel >= %{xfce_version}
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	startup-notification-devel >= 0.8
 BuildRequires:	vala
-BuildRequires:	xfce4-dev-tools >= 4.12.0
+BuildRequires:	vala-libxfce4util >= 4.16.0
+BuildRequires:	xfce4-dev-tools >= 4.16.0
 BuildRequires:	xfconf-devel >= %{xfce_version}
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libX11-devel
 Requires:	%{name}-about
-Requires:	glib2 >= 1:2.42.0
-Requires:	gtk+2 >= 2:2.24.0
+Requires:	glib2 >= 1:2.50.0
 Requires:	gtk+3 >= 3.18.0
 Requires:	libxfce4util >= %{xfce_version}
 Requires:	startup-notification >= 0.8
 Requires:	xfconf >= %{xfce_version}
+Obsoletes:	xfce4-quicklauncher-plugin
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -70,8 +70,7 @@ Summary:	Development files for libxfce4ui library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libxfce4ui
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.42.0
-Requires:	gtk+2-devel >= 2:2.24.0
+Requires:	glib2-devel >= 1:2.50.0
 Requires:	gtk+3-devel >= 3.18.0
 Requires:	libxfce4util-devel >= %{xfce_version}
 Requires:	startup-notification-devel >= 0.8
@@ -127,18 +126,19 @@ Vala API for libxfce4ui library.
 %description -n vala-libxfce4ui -l pl.UTF-8
 API języka Vala do biblioteki libxfce4ui.
 
-%package -n glade3-libxfce4ui
-Summary:	libxfce4ui support for Glade 3
-Summary(pl.UTF-8):	Wsparcie dla libxfce4ui w Glade 3
+%package -n glade-libxfce4ui
+Summary:	libxfce4ui support for Glade
+Summary(pl.UTF-8):	Wsparcie dla libxfce4ui w Glade
 Group:		Development/Building
 Requires:	%{name} = %{version}-%{release}
-Requires:	glade3 >= 3.5.0
+Requires:	glade-libs >= 3.5.0
+Obsoletes:	glade3-libxfce4ui
 
-%description -n glade3-libxfce4ui
-libxfce4ui support for Glade 3.
+%description -n glade-libxfce4ui
+libxfce4ui support for Glade.
 
-%description -n glade3-libxfce4ui -l pl.UTF-8
-Wsparcie dla libxfce4ui w Glade 3.
+%description -n glade-libxfce4ui -l pl.UTF-8
+Wsparcie dla libxfce4ui w Glade.
 
 %prep
 %setup -q
@@ -156,6 +156,7 @@ mkdir -p m4
 	--enable-gtk-doc \
 	--disable-silent-rules \
 	%{?with_static_libs:--enable-static} \
+	%{__enable_disable gladeui2} \
 	--with-html-dir=%{_gtkdocdir}
 
 %{__make}
@@ -166,9 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%if %{with glade3}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libxfce4uiglade.la
-%{?with_static_libs:%{__rm} $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libxfce4uiglade.a}
+%if %{with gladeui2}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/glade/modules/libxfce4uiglade2.la
+%{?with_static_libs:%{__rm} $RPM_BUILD_ROOT%{_libdir}/glade/modules/libxfce4uiglade2.a}
 %endif
 
 # obsoleted by pkg-config
@@ -176,7 +177,7 @@ rm -rf $RPM_BUILD_ROOT
 # duplicates of hy,ur
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{hy_AM,ur_PK}
 # not supported by glibc (as of 2.32)
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{hye,ie}
 
 %find_lang %{name}
 
@@ -188,45 +189,38 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/libxfce4kbd-private-2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxfce4kbd-private-2.so.0
+%doc AUTHORS ChangeLog NEWS
 %attr(755,root,root) %{_libdir}/libxfce4kbd-private-3.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libxfce4kbd-private-3.so.0
-%attr(755,root,root) %{_libdir}/libxfce4ui-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxfce4ui-1.so.0
 %attr(755,root,root) %{_libdir}/libxfce4ui-2.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libxfce4ui-2.so.0
 %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
-%{_libdir}/girepository-1.0/libxfce4ui-2.0.typelib
+%{_libdir}/girepository-1.0/Libxfce4ui-2.0.typelib
 
 %files about
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xfce4-about
 %{_desktopdir}/xfce4-about.desktop
-%{_iconsdir}/hicolor/48x48/apps/xfce4-logo.png
+%{_iconsdir}/hicolor/*x*/apps/xfce4-logo.png
+%{_iconsdir}/hicolor/*x*/apps/org.xfce.about.png
+%{_iconsdir}/hicolor/scalable/apps/xfce4-logo.svg
+%{_iconsdir}/hicolor/scalable/apps/org.xfce.about.svg
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libxfce4kbd-private-2.so
 %attr(755,root,root) %{_libdir}/libxfce4kbd-private-3.so
-%attr(755,root,root) %{_libdir}/libxfce4ui-1.so
 %attr(755,root,root) %{_libdir}/libxfce4ui-2.so
-%{_includedir}/xfce4/libxfce4kbd-private-2
 %{_includedir}/xfce4/libxfce4kbd-private-3
-%{_includedir}/xfce4/libxfce4ui-1
 %{_includedir}/xfce4/libxfce4ui-2
-%{_pkgconfigdir}/libxfce4kbd-private-2.pc
 %{_pkgconfigdir}/libxfce4kbd-private-3.pc
-%{_pkgconfigdir}/libxfce4ui-1.pc
 %{_pkgconfigdir}/libxfce4ui-2.pc
-%{_datadir}/gir-1.0/libxfce4ui-2.0.gir
+%{_datadir}/gir-1.0/Libxfce4ui-2.0.gir
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libxfce4kbd-private-2.a
-%{_libdir}/libxfce4ui-1.a
+%{_libdir}/libxfce4kbd-private-3.a
+%{_libdir}/libxfce4ui-2.a
 %endif
 
 %files apidocs
@@ -238,10 +232,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libxfce4ui-2.deps
 %{_datadir}/vala/vapi/libxfce4ui-2.vapi
 
-%if %{with glade3}
-%files -n glade3-libxfce4ui
+%if %{with gladeui2}
+%files -n glade-libxfce4ui
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/glade3/modules/libxfce4uiglade.so
-%{_datadir}/glade3/catalogs/libxfce4ui.xml
-%{_datadir}/glade3/pixmaps/hicolor/*x*/actions/widget-libxfce4ui-xfce-titled-dialog.png
+%attr(755,root,root) %{_libdir}/glade/modules/libxfce4uiglade2.so
+%{_datadir}/glade/catalogs/libxfce4ui-2.xml
+%{_datadir}/glade/pixmaps/hicolor/*x*/actions/widget-libxfce4ui-xfce-titled-dialog.png
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libxfce4ui.git/commitdiff/9872a0f7be01170e8f4fbcf4d38b9dc2df55f9cf

More information about the pld-cvs-commit mailing list