rpms/xulrunner/devel xulrunner.spec, 1.114, 1.115 find-external-requires, 1.1, NONE

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12742

Modified Files:
	xulrunner.spec 
Removed Files:
	find-external-requires 
Log Message:
cleanups



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- xulrunner.spec	7 Apr 2008 04:02:14 -0000	1.114
+++ xulrunner.spec	8 Apr 2008 04:01:22 -0000	1.115
@@ -26,9 +26,7 @@
 Source0:        %{tarball}
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
-#Source21:       %{name}.sh.in
 Source23:       %{name}.1
-Source100:      find-external-requires
 
 # build patches
 Patch4:         mozilla-build.patch
@@ -72,9 +70,6 @@
 Requires:       nss >= %{nss_version}
 Provides:       gecko-libs = %{version}
 
-#define _use_internal_dependency_generator 0
-#define __find_requires %{SOURCE100}
-
 %description
 XULRunner provides the XUL Runtime environment for Gecko applications.
 
@@ -161,10 +156,6 @@
 %{__mkdir_p} $RPM_BUILD_ROOT/${MOZ_APP_DIR} \
              $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} \
              $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_SDK_NAME}
-#%{__install} -p -d dist/sdk/include $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_SDK_NAME}
-#%{__install} -p -d dist/sdk/idl $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_SDK_NAME}
-#%{__install} -p dist/sdk/bin/* $RPM_BUILD_ROOT/$MOZ_APP_DIR
-#%{__install} -p dist/sdk/lib/* $RPM_BUILD_ROOT/$MOZ_APP_SDK_DIR
 %{__install} -p dist/sdk/bin/regxpcom $RPM_BUILD_ROOT/$MOZ_APP_DIR
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
@@ -197,14 +188,8 @@
 
 %{__cp} -rL dist/include/* \
   $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
-#%{__cp} -rL dist/idl/* \
-#  $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME}
-#%{__mv} $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_NAME}/* \
-#  $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
-#%{__mv} $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_NAME}/* \
-#  $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME}
 
-install -c -m 755 dist/bin/xpcshell \
+%{__install} -p -c -m 755 dist/bin/xpcshell \
   dist/bin/xpidl \
   dist/bin/xpt_dump \
   dist/bin/xpt_link \
@@ -259,7 +244,7 @@
 EOF
                         
 # Copy over the LICENSE
-install -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR}
+%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR}
 
 # Use the system hunspell dictionaries
 %{__rm} -rf ${RPM_BUILD_ROOT}${MOZ_APP_DIR}/dictionaries


--- find-external-requires DELETED ---