================================
firefox:source=1.5.0.6-2 (previous: 1.5.0.6-1)
cvc rdiff firefox -1 /[EMAIL PROTECTED]:1-devel/1.5.0.6-2
================================
1.5.0.6-2 Ken VanDine ([EMAIL PROTECTED]) Wed Aug 9 10:51:54 2006
Merged with rpl:devel
firefox.recipe: changed
Index: firefox.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- firefox.recipe /[EMAIL PROTECTED]:1-devel/1.5.0.6-1
+++ firefox.recipe /[EMAIL PROTECTED]:1-devel/1.5.0.6-2
@@ -4,16 +4,24 @@
# A copy is available at http://www.rpath.com/permanent/mit-license.html
#
-class FireFox(CPackageRecipe):
+loadSuperClass('rpmpackage', label='[EMAIL PROTECTED]:devel')
+class FireFox(RPMPackageRecipe, CPackageRecipe):
name = 'firefox'
version = '1.5.0.6'
+ rpmUpVer = '1.5.0.6'
+ rpmRelease = '3'
+
buildRequires = ['atk:devel', 'autoconf:runtime',
'cairo:devel', 'desktop-file-utils:runtime', 'fontconfig:devel',
- 'freetype:devel', 'gcc:devel', 'glib:devel', 'gtk:devel',
+ 'freetype:devel', 'gcc:devel', 'glib:devel', 'gtk:devel', 'nss:devel',
'libIDL:devel', 'libjpeg:devel', 'libpng:devel', 'pango:devel',
'perl:runtime', 'pkgconfig:devel', 'xorg-x11:devel', 'zip:runtime',
- 'zlib:devel', 'libstdc++:devel', 'libgcc:devellib' ]
+ 'zlib:devel', 'libstdc++:devel', 'libgcc:devellib', 'nspr:devel', ]
+
+ rpmPatches = [ 'firefox-1.1-nss-system-nspr.patch',
+ 'firefox-1.5-with-system-nss.patch' ]
+ externalArchive =
'http://ftp.mozilla.org/pub/mozilla.org/%(name)s/releases/%(version)s/source/%(name)s-%(version)s-source.tar.bz2'
if Use.gnome:
buildRequires.extend(['GConf:devel', 'ORBit2:devel', 'gnome-vfs:devel',
@@ -25,7 +33,9 @@
buildRequires.append('krb5:devel')
def setup(r):
-
r.addArchive('http://ftp.mozilla.org/pub/mozilla.org/%(name)s/releases/%(version)s/source/%(name)s-%(version)s-source.tar.bz2')
+ r.unpack()
+
+ r.addPatch('foresight-homepage.patch')
r.macros.fflib = '%(libdir)s/firefox/'
r.macros.ffinc = '%(includedir)s/firefox/'
@@ -43,7 +53,6 @@
r.addPatch('firefox-use-running.patch')
r.addPatch('firefox-nopangoxft.patch')
- r.addPatch('foresight-homepage.patch')
r.disableParallelMake()
r.Replace(('%%MOZAPPDIR%%', '%(libdir)s/firefox'),
@@ -68,3 +77,14 @@
# files in this directory are dynamically generated by the
# tag handler script. They should always be replaced on update
r.Transient('%(libdir)s/firefox/extensions/')
+
+ # Install :devel component
+ r.Install('dist/include/*', '%(ffinc)s/')
+ r.MakeDirs('%(datadir)s/idl/firefox')
+ r.Install('dist/idl/*', '%(datadir)s/idl/firefox')
+ for file in ('xpcshell', 'xpidl', 'xpt_dump', 'xpt_link'):
+ r.Install('dist/bin/%s' % file, '%(fflib)s')
+ for file in ('gtkmozembed', 'js', 'nspr', 'nss', 'plugin', 'xpcom'):
+ r.Replace('\/local', '', 'build/unix/firefox-%s.pc' % file)
+ r.Replace('firefox-.*', 'firefox', 'build/unix/firefox-%s.pc' %
file)
+ r.Install('build/unix/firefox-%s.pc' % file,
'%(libdir)s/pkgconfig/')
firefox-1.5.0.6-3.src.rpm: new
Committed by: krv
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
