-@@ -929,10 +930,10 @@
- export RPM_BUILD_ROOT}\
- %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
- export CLASSPATH}\
-- unset PERL_MM_OPT\
-+ unset PERL_MM_OPT || :\
- LANG=C\
- export LANG\
-- unset DISPLAY\
-+ unset DISPLAY || :\
- \
- %{verbose:set -x}%{!verbose:exec > /dev/null}\
- umask 022\
-@@ -1091,7 +1092,7 @@
+@@ -1127,17 +1127,17 @@
+ %_exec_prefix %{_prefix}
+ %_bindir %{_exec_prefix}/bin
+ %_sbindir %{_exec_prefix}/sbin
+-%_libexecdir %{_exec_prefix}/libexec
++%_libexecdir %{_exec_prefix}/lib
+ %_datadir %{_prefix}/share
+-%_sysconfdir %{_prefix}/etc
+-%_sharedstatedir %{_prefix}/com
+-%_localstatedir %{_prefix}/var
++%_sysconfdir /etc
++%_sharedstatedir /var/lib
++%_localstatedir /var
+ %_lib lib
+ %_libdir %{_exec_prefix}/%{_lib}