SPECS: opera.spec - not confusing mv

[glen]

Author: glen                         Date: Wed Nov  8 19:29:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- not confusing mv

---- Files affected:
SPECS:
   opera.spec (1.203 -> 1.204) 

---- Diffs:

================================================================
Index: SPECS/opera.spec
diff -u SPECS/opera.spec:1.203 SPECS/opera.spec:1.204
--- SPECS/opera.spec:1.203	Wed Nov  8 18:30:01 2006
+++ SPECS/opera.spec	Wed Nov  8 20:29:13 2006
@@ -333,7 +333,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_sysconfdir}}
 
 sh install.sh \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -345,9 +345,8 @@
 install images/opera.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
 
-sed -i -e 's#\(.*\)OPERA_SCRIPT_PATH=.*\(\$0.*\)#\1OPERA_SCRIPT_PATH=%{_bindir}/\2#g' $RPM_BUILD_ROOT%{_bindir}/opera
-
-mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config $RPM_BUILD_ROOT/etc
+%{__sed} -i -e 's#\(.*\)OPERA_SCRIPT_PATH=.*\(\$0.*\)#\1OPERA_SCRIPT_PATH=%{_bindir}/\2#g' $RPM_BUILD_ROOT%{_bindir}/opera
+mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config/* $RPM_BUILD_ROOT%{_sysconfdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -355,7 +354,7 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE
-%config(noreplace) %verify(not md5 mtime size) /etc/opera*rc*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opera*rc*
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/opera
 %dir %{_libdir}/opera/bin
@@ -382,6 +381,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204  2006/11/08 19:29:13  glen
+- not confusing mv
+
 Revision 1.203  2006/11/08 17:30:01  arekm
 - fixed todo item
 
@@ -407,7 +409,7 @@
 - up to 9.02 419 builddir
 
 Revision 1.195  2006/08/11 10:10:38  arekm
-9.01
+- 9.01
 
 Revision 1.194  2006/07/29 14:07:58  arekm
 - up to 400 weekly
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/opera.spec?r1=1.203&r2=1.204&f=u