Author: paszczus Date: Sat Feb 4 09:50:29 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - adaptarized, sorted BRs, cleanup
---- Files affected: SPECS: mozilla-firefox.spec (1.120 -> 1.121) ---- Diffs: ================================================================ Index: SPECS/mozilla-firefox.spec diff -u SPECS/mozilla-firefox.spec:1.120 SPECS/mozilla-firefox.spec:1.121 --- SPECS/mozilla-firefox.spec:1.120 Thu Feb 2 19:00:11 2006 +++ SPECS/mozilla-firefox.spec Sat Feb 4 10:50:24 2006 @@ -4,7 +4,7 @@ # - handle locales differently (runtime, since it's possible to do) # - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff* # for hints how to make locales and other stuff like extensions working -# - rpm upgrade is broken. First you need uninstall Firefox 1.0.x. +# - rpm upgrade is broken. First you need uninstall Firefox 1.0.x. # Conditional build: %bcond_with tests # enable tests (whatever they check) %bcond_without gnome # disable all GNOME components (gnomevfs, gnome, gnomeui) @@ -26,14 +26,14 @@ Patch3: %{name}-nopangoxft.patch Patch4: %{name}-name.patch # UPDATE or DROP? -#PatchX: %{name}-searchplugins.patch +#PatchX: %{name}-searchplugins.patch URL: http://www.mozilla.org/projects/firefox/ %{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1} BuildRequires: automake BuildRequires: cairo-devel >= 1.0.0 +%{?with_gnome:BuildRequires: gnome-vfs2-devel >= 2.0} BuildRequires: gtk+2-devel >= 1:2.0.0 BuildRequires: heimdal-devel >= 0.7.1 -%{?with_gnome:BuildRequires: gnome-vfs2-devel >= 2.0} BuildRequires: libIDL-devel >= 0.8.0 %{?with_gnome:BuildRequires: libgnome-devel >= 2.0} %{?with_gnome:BuildRequires: libgnomeui-devel >= 2.2.0} @@ -73,9 +73,9 @@ Summary: Headers for developing programs that will use Mozilla Firefox Summary(pl): Mozilla Firefox - pliki nagłówkowe Group: X11/Development/Libraries -Obsoletes: mozilla-devel Requires: %{name} = %{epoch}:%{version}-%{release} Requires: nspr-devel >= 1:4.6-0.20041030.1 +Obsoletes: mozilla-devel %description devel Mozilla Firefox development package. @@ -194,7 +194,7 @@ $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \ $RPM_BUILD_ROOT{%{_includedir}/%{name}/idl,%{_pkgconfigdir}} # extensions dir is needed (it can be empty) - + %{__make} -C xpinstall/packager \ MOZ_PKG_APPNAME="mozilla-firefox" \ MOZILLA_BIN="\$(DIST)/bin/firefox-bin" \ @@ -227,7 +227,7 @@ ln -sf %{_includedir}/mozilla-firefox/necko/nsIURI.h \ $RPM_BUILD_ROOT%{_includedir}/mozilla-firefox/nsIURI.h - + # CA certificates ln -s %{_libdir}/libnssckbi.so $RPM_BUILD_ROOT%{_firefoxdir}/libnssckbi.so @@ -243,10 +243,10 @@ sed -i -e 's#firefox-nspr =.*#mozilla-nspr#g' -e 's#irefox-nss =.*#mozilla-nss#g' \ $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc -# includedir/dom CFLAGS +# includedir/dom CFLAGS sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}' \ $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-plugin.pc - + cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/firefox-chrome+xpcom-generate #!/bin/sh umask 022 @@ -367,6 +367,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.121 2006/02/04 09:50:24 paszczus +- adaptarized, sorted BRs, cleanup + Revision 1.120 2006/02/02 18:00:11 qboosh - desc cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.120&r2=1.121&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
