rpms/openbox/devel openbox.spec,1.46,1.47

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/openbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13786

Modified Files:
	openbox.spec 
Log Message:
- Rename obprop to obxprop to avoid conflict with openbabel (#549152)



Index: openbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/openbox.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- openbox.spec	19 Dec 2009 10:38:20 -0000	1.46
+++ openbox.spec	4 Jan 2010 13:42:00 -0000	1.47
@@ -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} 
 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 <mlichvar at redhat.com> - 3.4.9-2
+- Rename obprop to obxprop to avoid conflict with openbabel (#549152)
+
 * Sat Dec 19 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.9-1
 - Update to 3.4.9