SPECS: swiftfox.spec - some fixes, not complete

[glen]

Author: glen                         Date: Thu Sep 21 10:32:28 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- some fixes, not complete

---- Files affected:
SPECS:
   swiftfox.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/swiftfox.spec
diff -u SPECS/swiftfox.spec:1.4 SPECS/swiftfox.spec:1.5
--- SPECS/swiftfox.spec:1.4	Tue Sep 19 20:56:26 2006
+++ SPECS/swiftfox.spec	Thu Sep 21 12:32:22 2006
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-#
 # TODO:
 # - with new gcc version (it is possible that)
 #   - -fvisibility=hiddenn and ac_cv_visibility_pragma=no can be removed
@@ -106,17 +105,19 @@
 Anglojęzyczne zasoby dla przeglądarki Swiftfox.
 
 %prep
-%setup -q -n mozilla
+%setup -qc
+cd mozilla
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+#%patch4 -p1
 %patch5 -p1
 
-sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
+%{__sed} -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
 
 %build
+cd mozilla
 rm -f .mozconfig
 export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
 export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
@@ -125,13 +126,13 @@
 cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
 cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
-cp -f other-licenses/branding/firefox/content/*.png browser/base/branding
-cp -f other-licenses/branding/firefox/default.xpm browser/app
+#cp -f other-licenses/branding/firefox/content/*.png browser/base/branding
+#cp -f other-licenses/branding/firefox/default.xpm browser/app
 
 LIBIDL_CONFIG="%{_bindir}/libIDL-config-2"; export LIBIDL_CONFIG
 
-cat << EOF > .mozconfig
-. \$topsrcdir/browser/config/mozconfig
+cat << 'EOF' > .mozconfig
+. $topsrcdir/browser/config/mozconfig
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
@@ -200,6 +201,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd mozilla
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}{,extensions}} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
@@ -235,29 +237,10 @@
 install dist/bin/xpt_dump $RPM_BUILD_ROOT%{_bindir}
 install dist/bin/xpt_link $RPM_BUILD_ROOT%{_bindir}
 
-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
-
-# pkgconfig files
-for f in build/unix/*.pc ; do
-        sed -e 's/firefox-%{version}/mozilla-firefox/' $f \
-	    > $RPM_BUILD_ROOT%{_pkgconfigdir}/$(basename $f)
-done
-
-# already provided by standalone packages
-rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-{nss,nspr}.pc
-
-sed -i -e 's#firefox-nspr =.*#mozilla-nspr#g' -e 's#irefox-nss =.*#mozilla-nss#g' \
-	$RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
+#ln -s %{_libdir}/libnssckbi.so $RPM_BUILD_ROOT%{_firefoxdir}/libnssckbi.so
 
-# 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
+cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
 #!/bin/sh
 umask 022
 rm -f %{_firefoxdir}/chrome/{chrome.rdf,overlayinfo/*/*/*.rdf}
@@ -284,7 +267,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/firefox-chrome+xpcom-generate
+%{_sbindir}/%{name}-chrome+xpcom-generate
 
 %postun
 if [ "$1" = "0" ]; then
@@ -294,17 +277,9 @@
 	rm -rf %{_firefoxdir}/extensions
 fi
 
-%triggerpostun -- %{name} < 1.5
-%banner %{name} -e <<EOF
-NOTICE:
-If you have problem with upgrade from old mozilla-firefox 1.0.x,
-you should remove it first and reinstall %{name}-%{version}
-EOF
-
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mozilla*
-%attr(755,root,root) %{_bindir}/firefox
+%attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_firefoxdir}
 %{_firefoxdir}/res
@@ -362,6 +337,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/09/21 10:32:22  glen
+- some fixes, not complete
+
 Revision 1.4  2006/09/19 18:56:26  paszczus
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/swiftfox.spec?r1=1.4&r2=1.5&f=u