diff --git a/openbox.spec b/openbox.spec index e22bf64..3bdd607 100644 --- a/openbox.spec +++ b/openbox.spec @@ -1,6 +1,6 @@ Name: openbox Version: 3.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A highly configurable and standards-compliant X11 window manager Group: User Interface/Desktops @@ -88,6 +88,10 @@ gcc %{optflags} -o setlayout %{SOURCE1} -lX11 rm -rf %{buildroot} make install DESTDIR=%{buildroot} +# avoid conflict with openbabel +mv %{buildroot}%{_bindir}/ob{,x}prop +sed -i 's/obpro[pb]/obxprop/g' %{buildroot}%{_sysconfdir}/xdg/%{name}/rc.xml + install setlayout %{buildroot}%{_bindir} install -p %{SOURCE2} %{buildroot}%{_datadir}/%{name}/xdg-menu sed 's|_XDGMENU_|%{_datadir}/%{name}/xdg-menu|g' < %{SOURCE3} \ @@ -115,7 +119,7 @@ rm -rf %{buildroot} %{_bindir}/gnome-panel-control %{_bindir}/gdm-control %{_bindir}/%{name}* -%{_bindir}/obprop +%{_bindir}/obxprop %{_bindir}/setlayout %{_datadir}/applications/*%{name}.desktop %{_datadir}/%{name} @@ -143,6 +147,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 04 2010 Miroslav Lichvar - 3.4.9-2 +- Rename obprop to obxprop to avoid conflict with openbabel (#549152) + * Sat Dec 19 2009 Miroslav Lichvar - 3.4.9-1 - Update to 3.4.9