From: Jakub Bogusz Date: Sat, 6 May 2023 11:37:43 +0000 (+0200) Subject: - cleanups, restored gl locale, updated python shebang, do track sonames; release 5 X-Git-Tag: auto/th/openbox-3.6.1-5 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=825ac99712812de3403d13572d8b9afd4b15f8d2;p=packages%2Fopenbox.git - cleanups, restored gl locale, updated python shebang, do track sonames; release 5 --- diff --git a/openbox-link.patch b/openbox-link.patch deleted file mode 100644 index c2974a0..0000000 --- a/openbox-link.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- openbox-3.5.0/Makefile.am.orig 2011-08-01 22:14:58.000000000 +0200 -+++ openbox-3.5.0/Makefile.am 2012-02-06 18:46:11.035139562 +0100 -@@ -83,7 +83,8 @@ - $(PANGO_LIBS) \ - $(GLIB_LIBS) \ - $(IMLIB2_LIBS) \ -- $(XML_LIBS) -+ $(XML_LIBS) \ -+ obt/libobt.la - obrender_libobrender_la_SOURCES = \ - gettext.h \ - obrender/color.h \ diff --git a/openbox.spec b/openbox.spec index 1be13ce..7ae6d96 100644 --- a/openbox.spec +++ b/openbox.spec @@ -1,33 +1,38 @@ # # Conditional build: -%bcond_with gnome2 # build with support for GNOME2 wm-properties +%bcond_with gnome2 # build with support for GNOME2 wm-properties Summary: Small and fast window manger for the X Window Summary(pl.UTF-8): Mały i szybki zarządca okien dla X Window Name: openbox Version: 3.6.1 -Release: 4 +Release: 5 Epoch: 1 License: GPL v2+ Group: X11/Window Managers -Source0: http://openbox.org/releases/%{name}-%{version}.tar.xz +Source0: http://openbox.org/dist/openbox/%{name}-%{version}.tar.xz # Source0-md5: 46bf5f1edda0eda0d9e824b585988be9 -#Patch0: %{name}-link.patch URL: http://openbox.org/ BuildRequires: autoconf >= 2.54 -BuildRequires: automake +BuildRequires: automake >= 1:1.11 BuildRequires: gettext-tools >= 0.15 BuildRequires: glib2-devel >= 1:2.14.0 +BuildRequires: imlib2-devel +BuildRequires: librsvg-devel >= 2 BuildRequires: libtool -BuildRequires: libuuid-devel BuildRequires: libxml2-devel >= 1:2.6.31 -BuildRequires: pango-devel >= 1.18.3 +BuildRequires: pango-devel >= 1:1.18.3 BuildRequires: pkgconfig BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.197 -BuildRequires: startup-notification-devel +BuildRequires: sed >= 4.0 +BuildRequires: startup-notification-devel >= 0.8 +BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libSM-devel +BuildRequires: xorg-lib-libX11-devel +BuildRequires: xorg-lib-libXau-devel BuildRequires: xorg-lib-libXcursor-devel +BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXinerama-devel BuildRequires: xorg-lib-libXrandr-devel Requires: %{name}-libs = %{epoch}:%{version}-%{release} @@ -35,10 +40,10 @@ Requires: %{name}-theme-base = %{epoch}:%{version}-%{release} Requires: dbus-x11 Suggests: obconf Provides: gnome-wm -Obsoletes: openbox-themes-Allegro -Obsoletes: openbox-themes-Artwiz -Obsoletes: openbox-themes-Blah41 -Obsoletes: openbox-themes-Om4Ob +Obsoletes: openbox-themes-Allegro < 1:3.3.1 +Obsoletes: openbox-themes-Artwiz < 1:3.3.1 +Obsoletes: openbox-themes-Blah41 < 1:3.3.1 +Obsoletes: openbox-themes-Om4Ob < 1:3.3.1 Conflicts: filesystem < 3.0-20 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -58,6 +63,9 @@ zgodność ze standardami oraz inteligentne zarządzanie oknami. Summary: Openbox libraries Summary(pl.UTF-8): Biblioteki Openboksa Group: Libraries +Requires: glib2 >= 1:2.14.0 +Requires: libxml2 >= 1:2.6.31 +Requires: pango >= 1:1.18.3 %description libs Openbox libraries. @@ -71,9 +79,13 @@ Summary(pl.UTF-8): Pliki nagłówkowe Openboksa Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: glib2-devel >= 1:2.14.0 +Requires: imlib2-devel +Requires: librsvg-devel >= 2 Requires: libxml2-devel >= 1:2.6.31 -Requires: pango-devel >= 1.18.3 +Requires: pango-devel >= 1:1.18.3 +Requires: xorg-lib-libICE-devel Requires: xorg-lib-libSM-devel +Requires: xorg-lib-libX11-devel %description devel Development header files for writing applications based on Openbox. @@ -112,7 +124,7 @@ Summary(pl.UTF-8): Motyw Bear dla Openboksa Group: Themes Requires: %{name} = %{epoch}:%{version}-%{release} Provides: openbox-theme-base = %{epoch}:%{version}-%{release} -Obsoletes: openbox-themes-TheBear +Obsoletes: openbox-themes-TheBear < 1:3.3.1 %description themes-bear Bear theme for Openbox. @@ -226,15 +238,17 @@ Motyw Syscrash dla Openboksa. %prep %setup -q -#%patch0 -p1 + +%{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' data/autostart/openbox-xdg-autostart %build %{__libtoolize} %{__aclocal} -I m4 %{__autoconf} %{__automake} -%configure -%{__make} V=1 +%configure \ + --disable-silent-rules +%{__make} %install rm -rf $RPM_BUILD_ROOT @@ -248,8 +262,8 @@ rm -rf $RPM_BUILD_ROOT %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc/openbox %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/libob*.la -%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{no,nb} -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/gl_ES +%{__mv} $RPM_BUILD_ROOT%{_localedir}/{no,nb} +%{__mv} $RPM_BUILD_ROOT%{_localedir}/{gl_ES,gl} %find_lang %{name} --all-name @@ -270,6 +284,9 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/openbox-session %attr(755,root,root) %{_bindir}/gdm-control %attr(755,root,root) %{_bindir}/obxprop +# requires gnome-session - subpackage? +#%{_datadir}/gnome-session/sessions/openbox-gnome.session +#%{_datadir}/gnome-session/sessions/openbox-gnome-fallback.session %{_datadir}/xsessions/openbox-gnome.desktop %{_datadir}/xsessions/openbox-kde.desktop %{_datadir}/xsessions/openbox.desktop @@ -279,10 +296,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/openbox-session.1* %{_mandir}/man1/openbox.1* %dir %{_sysconfdir}/xdg/openbox -%{_sysconfdir}/xdg/openbox/autostart -%{_sysconfdir}/xdg/openbox/environment -%{_sysconfdir}/xdg/openbox/menu.xml -%{_sysconfdir}/xdg/openbox/rc.xml +%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/openbox/autostart +%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/openbox/environment +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/openbox/menu.xml +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/openbox/rc.xml %{?with_gnome2:%{_wmpropsdir}/openbox.desktop} %{_desktopdir}/openbox.desktop %{_pixmapsdir}/openbox.png @@ -292,9 +309,9 @@ rm -rf $RPM_BUILD_ROOT %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libobrender.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libobrender.so.?? +%attr(755,root,root) %ghost %{_libdir}/libobrender.so.32 %attr(755,root,root) %{_libdir}/libobt.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libobt.so.? +%attr(755,root,root) %ghost %{_libdir}/libobt.so.2 %files devel %defattr(644,root,root,755) @@ -324,6 +341,7 @@ rm -rf $RPM_BUILD_ROOT %files themes-Clearlooks %defattr(644,root,root,755) %{_datadir}/themes/Clearlooks +%{_datadir}/themes/Clearlooks-3.4 %files themes-Mikachu %defattr(644,root,root,755)