[xulrunner] Remove some spurious variables

[Christopher Aillon]

commit 80f086ce45a39eb359857a327eae76a73e6dd987
Author: Christopher Aillon <caillon at redhat.com>
Date:   Tue Feb 1 18:09:54 2011 -0800

    Remove some spurious variables
    
    We already have global macros for the app dir, no need to redefine them.
    This also fixes up an issue with the postun script.

 xulrunner.spec |   47 +++++++++++++++++++----------------------------
 1 files changed, 19 insertions(+), 28 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 7d524ea..59de3ed 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -189,10 +189,6 @@ esac
 
 cd %{tarballdir}
 
-INTERNAL_GECKO=%{version_internal}
-MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
-
-
 # -fpermissive is needed to build with gcc 4.6+ which has become stricter
 # 
 # Mozilla builds with -Wall with exception of a few warnings which show up
@@ -218,7 +214,7 @@ MOZ_SMP_FLAGS=-j1
 [ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
 %endif
 
-export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}"
+export LDFLAGS="-Wl,-rpath,%{mozappdir}"
 make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_SERVICES_SYNC="1"
 
 # create debuginfo for crash-stats.mozilla.com
@@ -232,24 +228,19 @@ make buildsymbols
 %install
 cd %{tarballdir}
 
-INTERNAL_GECKO=%{version_internal}
-
-INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO}
-MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME}
-
-INTERNAL_APP_SDK_NAME=%{name}-sdk-${INTERNAL_GECKO}
+INTERNAL_APP_SDK_NAME=%{name}-sdk-%{version_internal}
 MOZ_APP_SDK_DIR=%{_libdir}/${INTERNAL_APP_SDK_NAME}
 
 DESTDIR=$RPM_BUILD_ROOT make install
 
-%{__mkdir_p} $RPM_BUILD_ROOT/${MOZ_APP_DIR} \
+%{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir} \
              $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} \
              $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_SDK_NAME}
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
 
 # set up our default preferences
 %{__cat} %{SOURCE12} | %{__sed} -e 's,RPM_VERREL,%{version}-%{release},g' > rh-default-prefs
-%{__install} -p -D -m 644 rh-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-redhat.js
+%{__install} -p -D -m 644 rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
 %{__rm} rh-default-prefs
 
 # Start script install
@@ -258,9 +249,9 @@ DESTDIR=$RPM_BUILD_ROOT make install
   $RPM_BUILD_ROOT%{_bindir}/%{name}
 %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/%{name}
 
-%{__rm} -f $RPM_BUILD_ROOT${MOZ_APP_DIR}/%{name}-config
+%{__rm} -f $RPM_BUILD_ROOT%{mozappdir}/%{name}-config
 
-cd $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome
+cd $RPM_BUILD_ROOT%{mozappdir}/chrome
 find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
 cd -
 
@@ -314,10 +305,10 @@ popd
   dist/bin/xpidl \
   dist/bin/xpt_dump \
   dist/bin/xpt_link \
-  $RPM_BUILD_ROOT/${MOZ_APP_DIR}
+  $RPM_BUILD_ROOT/%{mozappdir}
 
-%{__rm} -rf $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_NAME}
-%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_NAME}
+%{__rm} -rf $RPM_BUILD_ROOT/%{_includedir}/%{name}-%{version_internal}
+%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/idl/%{name}-%{version_internal}
 
 %{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/include
 ln -s  %{_includedir}/${INTERNAL_APP_SDK_NAME} \
@@ -339,9 +330,9 @@ find $RPM_BUILD_ROOT/%{_includedir} -type f -name "*.h" | xargs chmod 644
 find $RPM_BUILD_ROOT/%{_datadir}/idl -type f -name "*.idl" | xargs chmod 644
 
 %{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/lib/*.so
-pushd $RPM_BUILD_ROOT${MOZ_APP_DIR}
+pushd $RPM_BUILD_ROOT%{mozappdir}
 for i in *.so; do
-    ln -s ${MOZ_APP_DIR}/$i $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/lib/$i
+    ln -s %{mozappdir}/$i $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/lib/$i
 done
 popd
 
@@ -366,20 +357,20 @@ chmod 644 $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file}
 
 %{__mkdir_p} $RPM_BUILD_ROOT/etc/ld.so.conf.d
 %{__cat} > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{ld_conf_file} << EOF
-${MOZ_APP_DIR}
+%{mozappdir}
 EOF
                         
 # Copy over the LICENSE
-%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR}
+%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir}
 
 # Use the system hunspell dictionaries
-%{__rm} -rf ${RPM_BUILD_ROOT}${MOZ_APP_DIR}/dictionaries
-ln -s %{_datadir}/myspell ${RPM_BUILD_ROOT}${MOZ_APP_DIR}/dictionaries
+%{__rm} -rf ${RPM_BUILD_ROOT}%{mozappdir}/dictionaries
+ln -s %{_datadir}/myspell ${RPM_BUILD_ROOT}%{mozappdir}/dictionaries
 
 # ghost files
-%{__mkdir_p} $RPM_BUILD_ROOT${MOZ_APP_DIR}/components
-touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/compreg.dat
-touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat
+%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/components
+touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
+touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{enable_mozilla_crashreporter}
@@ -400,7 +391,7 @@ cp dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_
 %preun
 # is it a final removal?
 if [ $1 -eq 0 ]; then
-  %{__rm} -rf ${MOZ_APP_DIR}/components
+  %{__rm} -rf %{mozappdir}/components
 fi
 
 %files