|
|
@@ -1,6 +1,6 @@
|
|
|
Name: openbox
|
|
|
-Version: 3.4.11.2
|
|
|
-Release: 3%{?_dist_release}
|
|
|
+Version: 3.5.0
|
|
|
+Release: 1%{?_dist_release}
|
|
|
Summary: A highly configurable and standards-compliant X11 window manager
|
|
|
Summary(ja): 高度に設定可能な標準準拠の X11 ウィンドウマネージャ
|
|
|
|
|
|
@@ -12,14 +12,10 @@ Source1: http://icculus.org/openbox/tools/setlayout.c
|
|
|
Source2: xdg-menu
|
|
|
Source3: menu.xml
|
|
|
Source4: openbox.desktop
|
|
|
+Source5: terminals.menu
|
|
|
|
|
|
-Patch0: openbox-3.4.9-autostartdir.patch
|
|
|
-#Patch1: openbox-3.4.8-gdm.patch
|
|
|
-#Patch3: openbox-3.4.7.2-autostartid.patch
|
|
|
-Patch7: openbox-3.4.7.2-24bit.patch
|
|
|
-Patch9: openbox-3.4.10-obxpropman.patch
|
|
|
-Patch10: openbox-3.4.11-Xau.patch
|
|
|
-Patch11: 06_fix_swap_byte_order.patch
|
|
|
+Patch0: openbox-3.4.10-obxpropman.patch
|
|
|
+Patch1: openbox-3.4.11.2-gnomesession.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
@@ -83,14 +79,9 @@ The %{name}-libs package contains shared libraries used by %{name}.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch0 -p1 -b .autostartdir
|
|
|
-#%patch1 -p1 -b .gdm
|
|
|
-#%patch3 -p1 -b .autostartid
|
|
|
-%patch7 -p1 -b .24bit
|
|
|
-%patch9 -p1 -b .obxpropman
|
|
|
-%patch10 -p1 -b .Xau
|
|
|
-%patch11 -p1 -b .color
|
|
|
-
|
|
|
+%patch0 -p1 -b .obxpropman
|
|
|
+%patch1 -p1
|
|
|
+autoreconf
|
|
|
|
|
|
%build
|
|
|
%configure \
|
|
|
@@ -106,14 +97,19 @@ gcc %{optflags} -o setlayout %{SOURCE1} -lX11
|
|
|
rm -rf %{buildroot}
|
|
|
make install DESTDIR=%{buildroot}
|
|
|
|
|
|
+mkdir -m 644 %{buildroot}%{_datadir}/%{name}
|
|
|
install setlayout %{buildroot}%{_bindir}
|
|
|
-install -p %{SOURCE2} %{buildroot}%{_datadir}/%{name}/xdg-menu
|
|
|
-sed 's|_XDGMENU_|%{_datadir}/%{name}/xdg-menu|g' < %{SOURCE3} \
|
|
|
+
|
|
|
+install -p %{SOURCE2} %{buildroot}%{_libexecdir}/openbox-xdg-menu
|
|
|
+sed 's|_LIBEXECDIR_|%{_libexecdir}|g' < %{SOURCE3} \
|
|
|
> %{buildroot}%{_sysconfdir}/xdg/%{name}/menu.xml
|
|
|
|
|
|
desktop-file-install --vendor="" \
|
|
|
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
|
|
|
%{SOURCE4}
|
|
|
+
|
|
|
+install -m644 -p %{SOURCE5} \
|
|
|
+ %{buildroot}%{_sysconfdir}/xdg/%{name}/terminals.menu
|
|
|
|
|
|
%find_lang %{name}
|
|
|
rm -f %{buildroot}%{_libdir}/*.la
|
|
|
@@ -141,16 +137,17 @@ rm -rf %{buildroot}
|
|
|
%{_datadir}/pixmaps/%{name}.png
|
|
|
%{_datadir}/gnome/wm-properties/
|
|
|
%{_datadir}/xsessions/%{name}*.desktop
|
|
|
+%{_libexecdir}/openbox-*
|
|
|
%{_mandir}/man1/*
|
|
|
|
|
|
%files libs
|
|
|
%{_libdir}/libobrender.so.*
|
|
|
-%{_libdir}/libobparser.so.*
|
|
|
+%{_libdir}/libobt.so*
|
|
|
|
|
|
%files devel
|
|
|
%{_includedir}/%{name}/
|
|
|
%{_libdir}/libobrender.so
|
|
|
-%{_libdir}/libobparser.so
|
|
|
+%{_libdir}/libobt.so*
|
|
|
%{_libdir}/pkgconfig/*.pc
|
|
|
|
|
|
|
|
|
@@ -161,6 +158,14 @@ rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Aug 26 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.5.0-1
|
|
|
+- new upstream release
|
|
|
+- dropt Patch0,7,10,11
|
|
|
+ - renumbered patches
|
|
|
+- added Source5 from Fedora development
|
|
|
+- improved Source3
|
|
|
+- run autoreconf in %%prep
|
|
|
+
|
|
|
* Fri Jun 10 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.4.11.2-3
|
|
|
- dropt Patch1,3
|
|
|
- added patch11 from Debian
|
kudoh