[packages/garcon] - up to 0.8.0

mrozowik mrozowik at pld-linux.org
Mon Dec 28 11:32:19 CET 2020 

commit 136806ae7af5c00fcb40e4dd7ee8d655d547364e
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Mon Dec 28 10:32:09 2020 +0000

    - up to 0.8.0

 garcon.spec | 101 +++++++++++++++---------------------------------------------
 1 file changed, 24 insertions(+), 77 deletions(-)
---
diff --git a/garcon.spec b/garcon.spec
index 1b9a295..ff70cfb 100644
--- a/garcon.spec
+++ b/garcon.spec
@@ -6,27 +6,27 @@
 Summary:	Freedesktop.org compliant menu library for the Xfce desktop environment
 Summary(pl.UTF-8):	Biblioteka menu dla środowiska Xfce zgodna z freedesktop.org
 Name:		garcon
-Version:	0.7.0
-Release:	2
+Version:	0.8.0
+Release:	1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	https://archive.xfce.org/src/xfce/garcon/0.7/%{name}-%{version}.tar.bz2
-# Source0-md5:	2964c7a7e5d4aac58b4afef9b8602914
+Source0:	https://archive.xfce.org/src/xfce/garcon/0.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	a9c2116b0c34a022385f421b639df0f4
 URL:		https://gitlab.xfce.org/xfce/garcon
 BuildRequires:	gettext-tools
-BuildRequires:	glib2-devel >= 1:2.30.0
-BuildRequires:	gtk+2-devel >= 2:2.24.0
+BuildRequires:	glib2-devel >= 1:2.50.0
 BuildRequires:	gtk+3-devel >= 3.20.0
 BuildRequires:	gtk-doc >= 1.0
 BuildRequires:	intltool >= 0.35
-BuildRequires:	libxfce4ui-devel >= 4.12.0
-BuildRequires:	libxfce4util-devel >= 4.12.0
+BuildRequires:	libxfce4ui-devel >= 4.16.0
+BuildRequires:	libxfce4util-devel >= 4.16.0
 BuildRequires:	pkgconfig
-BuildRequires:	xfce4-dev-tools >= 4.10.0
+BuildRequires:	xfce4-dev-tools >= 4.16.0
 Requires:	filesystem >= 4.1-15
-Requires:	glib2 >= 1:2.30.0
-Requires:	libxfce4util >= 4.12.0
+Requires:	glib2 >= 1:2.50.0
+Requires:	libxfce4util >= 4.16.0
 Obsoletes:	libxfce4menu
+Obsoletes:	garcon-gtk2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,8 +48,9 @@ Summary:	Header files for garcon library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki garcon
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.30.0
+Requires:	glib2-devel >= 1:2.50.0
 Obsoletes:	libxfce4menu-devel
+Obsoletes:	garcon-gtk2-devel
 
 %description devel
 Header files for garcon library.
@@ -70,54 +71,13 @@ Static garcon library.
 %description static -l pl.UTF-8
 Statyczna biblioteka garcon.
 
-%package gtk2
-Summary:	Freedesktop.org compliant menu library - GTK+ 2 support
-Summary(pl.UTF-8):	Biblioteka menu zgodnego z Freedesktop.org - obsługa GTK+2
-Group:		X11/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	gtk+2 >= 2:2.24.0
-Requires:	libxfce4ui >= 4.12.0
-
-%description gtk2
-Freedesktop.org compliant menu library - GTK+ 2 support.
-
-%description gtk2 -l pl.UTF-8
-Biblioteka menu zgodnego z Freedesktop.org - obsługa GTK+2.
-
-%package gtk2-devel
-Summary:	Header files for garcon-gtk2 library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki garcon-gtk2
-Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-Requires:	%{name}-gtk2 = %{version}-%{release}
-Requires:	gtk+2-devel >= 2:2.24.0
-Requires:	libxfce4ui-devel >= 4.12.0
-
-%description gtk2-devel
-Header files for garcon-gtk2 library.
-
-%description gtk2-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki garcon-gtk2.
-
-%package gtk2-static
-Summary:	Static garcon-gtk2 library
-Summary(pl.UTF-8):	Biblioteka statyczna garcon-gtk2
-Group:		X11/Development/Libraries
-Requires:	%{name}-gtk2-devel = %{version}-%{release}
-
-%description gtk2-static
-Static garcon-gtk2 library.
-
-%description gtk2-static -l pl.UTF-8
-Biblioteka statyczna garcon-gtk2.
-
 %package gtk3
 Summary:	Freedesktop.org compliant menu library - GTK+ 3 support
 Summary(pl.UTF-8):	Biblioteka menu zgodnego z Freedesktop.org - obsługa GTK+3
 Group:		X11/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gtk+3 >= 3.20.0
-Requires:	libxfce4ui >= 4.12.0
+Requires:	libxfce4ui >= 4.16.0
 
 %description gtk3
 Freedesktop.org compliant menu library - GTK+ 3 support.
@@ -132,7 +92,7 @@ Group:		X11/Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-gtk3 = %{version}-%{release}
 Requires:	gtk+3-devel >= 3.20.0
-Requires:	libxfce4ui-devel >= 4.12.0
+Requires:	libxfce4ui-devel >= 4.16.0
 
 %description gtk3-devel
 Header files for garcon-gtk3 library.
@@ -186,6 +146,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/garcon}
+
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 # duplicate of hy
@@ -193,7 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 # older version of uz
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/uz at Latn
 # 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}
 
@@ -203,25 +165,25 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%post	gtk2 -p /sbin/ldconfig
-%postun	gtk2 -p /sbin/ldconfig
-
 %post	gtk3 -p /sbin/ldconfig
 %postun	gtk3 -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog HACKING NEWS README STATUS TODO
+%doc AUTHORS ChangeLog HACKING NEWS STATUS TODO
 %attr(755,root,root) %{_libdir}/libgarcon-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgarcon-1.so.0
 %{_sysconfdir}/xdg/menus/xfce-applications.menu
 %{_datadir}/desktop-directories/xfce-*.directory
+%{_libdir}/girepository-1.0/Garcon-1.0.typelib
+%{_iconsdir}/hicolor/32x32/apps/org.xfce.garcon.png
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgarcon-1.so
 %{_includedir}/garcon-1
 %{_pkgconfigdir}/garcon-1.pc
+%{_datadir}/gir-1.0/Garcon-1.0.gir
 
 %if %{with static_libs}
 %files static
@@ -229,33 +191,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgarcon-1.a
 %endif
 
-%files gtk2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgarcon-gtk2-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgarcon-gtk2-1.so.0
-
-%files gtk2-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgarcon-gtk2-1.so
-%{_includedir}/garcon-gtk2-1
-%{_pkgconfigdir}/garcon-gtk2-1.pc
-
-%if %{with static_libs}
-%files gtk2-static
-%defattr(644,root,root,755)
-%{_libdir}/libgarcon-gtk2-1.a
-%endif
-
 %files gtk3
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgarcon-gtk3-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgarcon-gtk3-1.so.0
+%{_libdir}/girepository-1.0/GarconGtk-1.0.typelib
 
 %files gtk3-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgarcon-gtk3-1.so
 %{_includedir}/garcon-gtk3-1
 %{_pkgconfigdir}/garcon-gtk3-1.pc
+%{_datadir}/gir-1.0/GarconGtk-1.0.gir
 
 %if %{with static_libs}
 %files gtk3-static
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/garcon.git/commitdiff/136806ae7af5c00fcb40e4dd7ee8d655d547364e

More information about the pld-cvs-commit mailing list