commit 82922af8b214b118747f66d674711b6ec141561a
Author: Jakub Bogusz <[email protected]>
Date:   Sat May 6 20:08:34 2023 +0200

    - updated to 0.10.1

 lxpanel.spec | 161 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 118 insertions(+), 43 deletions(-)
---
diff --git a/lxpanel.spec b/lxpanel.spec
index ee971c8..de885e9 100644
--- a/lxpanel.spec
+++ b/lxpanel.spec
@@ -1,99 +1,174 @@
-# TODO:  /etc/xdg/lxpanel - proper tags/flags etc.
-Summary:       LXPanel is a lightweight X11 desktop panel
+#
+# Conditional build:
+%bcond_with    gtk3            # use GTK+3 instead of GTK+2
+%bcond_without appindicator    # libindicator support (only GTK+2 variant 
supported)
+
+%if %{with gtk3}
+%undefine      with_appindicator
+%endif
+Summary:       LXPanel - a lightweight X11 desktop panel
+Summary(pl.UTF-8):     LXPanel - lekki panel pulpitu X11
 Name:          lxpanel
-Version:       0.7.0
-Release:       2
-License:       GPL v2
+Version:       0.10.1
+Release:       1
+License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.xz
-# Source0-md5: 39698de2c5eda2837607762c9f522cd0
-URL:           http://wiki.lxde.org/en/LXPanel
-BuildRequires: autoconf
+Source0:       https://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.xz
+# Source0-md5: c922d044789c3d7ae028f0e80dea18b0
+URL:           http://www.lxde.org/
+BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.12
 BuildRequires: alsa-lib-devel
+BuildRequires: curl-devel
 BuildRequires: gettext-tools
-BuildRequires: gtk+2-devel >= 2:2.12.0
-BuildRequires: intltool
+BuildRequires: glib2-devel >= 2.0
+%{!?with_gtk3:BuildRequires:   gtk+2-devel >= 2:2.12.0}
+%{?with_gtk3:BuildRequires:    gtk+3-devel >= 3.0.0}
+BuildRequires: intltool >= 0.40.0
+%{!?with_gtk3:BuildRequires:   keybinder-devel}
+%{?with_gtk3:BuildRequires:    keybinder3-devel}
+BuildRequires: libfm-devel >= 1.2.0
+%{?with_appindicator:BuildRequires:    libindicator-devel >= 0.3.0}
 BuildRequires: libiw-devel
+BuildRequires: libtool >= 2:2.2
 BuildRequires: libwnck2-devel
-BuildRequires: libtool
-BuildRequires: libfm-devel
+BuildRequires: libxml2-devel >= 2.0
 BuildRequires: menu-cache-devel
 BuildRequires: pkgconfig
+%{!?with_gtk3:BuildRequires:   pkgconfig(libfm-gtk) >= 1.2.0}
+%{?with_gtk3:BuildRequires:    pkgconfig(libfm-gtk3) >= 1.2.0}
 BuildRequires: tar >= 1:1.22
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xz
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      lxmenu-data
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 LXPanel is a lightweight X11 desktop panel.
 
+%description -l pl.UTF_8
+LXPanel to lekki panel pulpitu X11.
+
+%package libs
+Summary:       LXPanel shared library
+Summary(pl.UTF-8):     Biblioteka współdzielona LXPanelu
+Group:         Libraries
+Requires:      libfm >= 1.2.0
+%{!?with_gtk3:Requires:        gtk+2 >= 2:2.12.0}
+
+%description libs
+LXPanel shared library.
+
+%description libs -l pl.UTF-8
+Biblioteka współdzielona LXPanelu.
+
 %package devel
-Summary:       Header files for lxpanel library
-Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki lxpanel
+Summary:       Header files for lxpanel plugins
+Summary(pl.UTF-8):     Pliki nagłówkowe dla wtyczek lxpanelu
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      libfm-devel >= 1.2.0
+%{!?with_gtk3:Requires:        gtk+2-devel >= 2:2.12.0}
+%{?with_gtk3:Requires: gtk+3-devel >= 3.0.0}
 
 %description devel
-Header files for lxpanel library.
+Header files for lxpanel plugins.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki lxpanel.
+Pliki nagłówkowe dla wtyczek lxpanelu.
 
 %prep
 %setup -q
 
 %build
-%{__aclocal}
-%{__autoheader}
 %{__libtoolize}
 %{__intltoolize}
-%{__automake}
+%{__aclocal}
 %{__autoconf}
-%configure
-%{__make} V=1
+%{__autoheader}
+%{__automake}
+%configure \
+       %{?with_appindicator:--enable-indicator-support} \
+       --disable-silent-rules
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/{frp,ur_PK,tt_RU}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lxpanel/liblxpanel.la
+
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{tt_RU,tt}
+# not supported by glibc
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/frp
+# duplicate of ur
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ur_PK
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README
 %attr(755,root,root) %{_bindir}/lxpanel
 %attr(755,root,root) %{_bindir}/lxpanelctl
-%dir %{_libdir}/lxpanel
 %dir %{_libdir}/lxpanel/plugins
-%attr(755,root,root) %{_libdir}/lxpanel/plugins/*.so
-%{_mandir}/man1/lxpanel.1*
-%{_mandir}/man1/lxpanelctl.1*
-
 %dir %{_datadir}/lxpanel
-##%{_datadir}/lxpanel/profile
+%{_datadir}/lxpanel/images
 %{_datadir}/lxpanel/ui
+%{_datadir}/lxpanel/xkeyboardconfig
+%dir %{_sysconfdir}/xdg/lxpanel
+%dir %{_sysconfdir}/xdg/lxpanel/default
+%config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/xdg/lxpanel/default/config
+%dir %{_sysconfdir}/xdg/lxpanel/default/panels
+%config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/xdg/lxpanel/default/panels/panel
+%dir %{_sysconfdir}/xdg/lxpanel/two_panels
+%config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/xdg/lxpanel/two_panels/config
+%dir %{_sysconfdir}/xdg/lxpanel/two_panels/panels
+%config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/xdg/lxpanel/two_panels/panels/bottom
+%config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/xdg/lxpanel/two_panels/panels/top
+%{_mandir}/man1/lxpanel.1*
+%{_mandir}/man1/lxpanelctl.1*
 
-%dir %{_datadir}/lxpanel/images
-%{_datadir}/lxpanel/images/*.png
-
-%dir %{_datadir}/lxpanel/images/xkb-flags
-# TODO: lang tags here
-%{_datadir}/lxpanel/images/xkb-flags/*.png
-
-%dir %{_datadir}/lxpanel/xkeyboardconfig
-%{_datadir}/lxpanel/xkeyboardconfig/*.cfg
-
-%{_sysconfdir}/xdg/lxpanel
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/batt.so
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/cpu.so
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/cpufreq.so
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/deskno.so
+%if %{with appindicator}
+# R: libindicator
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/indicator.so
+%endif
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/kbled.so
+# R: libfm-gtk
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/monitors.so
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/netstat.so
+# R: libfm-gtk
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/netstatus.so
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/thermal.so
+# R: alsa-lib libfm-gtk
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/volume.so
+# R: curl-libs libxml2
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/weather.so
+# R: libX11
+%attr(755,root,root) %{_libdir}/lxpanel/plugins/xkb.so
+
+%files libs
+%defattr(644,root,root,755)
+%dir %{_libdir}/lxpanel
+%attr(755,root,root) %{_libdir}/lxpanel/liblxpanel.so.*.*.*
+%attr(755,root,root) %{_libdir}/lxpanel/liblxpanel.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%dir %{_includedir}/lxpanel
-%{_includedir}/lxpanel/*.h
+%attr(755,root,root) %{_libdir}/lxpanel/liblxpanel.so
+%{_includedir}/lxpanel
 %{_pkgconfigdir}/lxpanel.pc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxpanel.git/commitdiff/82922af8b214b118747f66d674711b6ec141561a

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to