rpms/xulrunner/OLPC-2 xulrunner.spec,1.20,1.21

[Marco Pesenti Gritti (mpg)]

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24786

Modified Files:
	xulrunner.spec 
Log Message:
* Wed Aug 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.7.20070820cvs
- Update the pyxpcom build patch
- Adapt to the new build installation




Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xulrunner.spec	21 Aug 2007 22:41:06 -0000	1.20
+++ xulrunner.spec	22 Aug 2007 00:43:20 -0000	1.21
@@ -3,6 +3,7 @@
 %define nss_version 3.10
 %define cairo_version 1.3.12
 %define alpha 20070820cvs 
+%define prerelease a8pre
 
 Summary:        XUL Runner
 Name:           xulrunner
@@ -95,7 +96,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f %{buildroot}%{_libdir}/xulrunner-%{version}%{prerelease}/sdk/*.so
 
 # own mozilla plugin dir (#135050)
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
@@ -110,41 +110,20 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE LEGAL
-%{_bindir}/xulrunner
-%{_libdir}/mozilla
-%{_libdir}/xulrunner-%{version}%{prerelease}/chrome
-%{_libdir}/xulrunner-%{version}%{prerelease}/components
-%{_libdir}/xulrunner-%{version}%{prerelease}/defaults
-%{_libdir}/xulrunner-%{version}%{prerelease}/dictionaries
-%{_libdir}/xulrunner-%{version}%{prerelease}/greprefs
-%{_libdir}/xulrunner-%{version}%{prerelease}/icons
-%{_libdir}/xulrunner-%{version}%{prerelease}/modules
-%{_libdir}/xulrunner-%{version}%{prerelease}/plugins
-%{_libdir}/xulrunner-%{version}%{prerelease}/res
-%{_libdir}/xulrunner-%{version}%{prerelease}/*.so
-%{_libdir}/xulrunner-%{version}%{prerelease}/mozilla-xremote-client
-%{_libdir}/xulrunner-%{version}%{prerelease}/regxpcom
-%{_libdir}/xulrunner-%{version}%{prerelease}/run-mozilla.sh
-%{_libdir}/xulrunner-%{version}%{prerelease}/updater
-%{_libdir}/xulrunner-%{version}%{prerelease}/xp*
-%{_libdir}/xulrunner-%{version}%{prerelease}/xulrunner*
-%{_libdir}/xulrunner-%{version}%{prerelease}/crashreporter
-%{_libdir}/xulrunner-%{version}%{prerelease}/*.chk
+%{_libdir}/xulrunner-%{version}%{prerelease}
 
 %{python_sitearch}/xpcom
 
 %files devel
 %defattr(-, root, root)
-%{_bindir}/xulrunner-config
-%{_libdir}/xulrunner-%{version}%{prerelease}/*.a
-%{_libdir}/pkgconfig/*
-%{_includedir}/xulrunner-%{version}%{prerelease}
 %{_datadir}/idl/xulrunner-%{version}%{prerelease}
-%{_datadir}/aclocal/nspr.m4
+%{_libdir}/xulrunner-devel-%{version}%{prerelease}
+%{_includedir}/xulrunner-%{version}%{prerelease}
 
 %changelog
 * Wed Aug 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.7.20070820cvs
 - Update the pyxpcom build patch
+- Adapt to the new build installation
 
 * Mon Aug 20 2007 John (J5) Palmieri <johnp at redhat.com> - 1.9-0.6.20070820cvs
 - new HEAD snapshot build