SPECS: iceweasel.spec, icedove.spec - reverted separate wrappers for Titanium

[hawk]

Author: hawk                         Date: Mon Aug 18 18:04:07 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reverted separate wrappers for Titanium

---- Files affected:
SPECS:
   iceweasel.spec (1.24 -> 1.25) , icedove.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/iceweasel.spec
diff -u SPECS/iceweasel.spec:1.24 SPECS/iceweasel.spec:1.25
--- SPECS/iceweasel.spec:1.24	Mon Aug 18 18:48:10 2008
+++ SPECS/iceweasel.spec	Mon Aug 18 20:04:02 2008
@@ -32,7 +32,6 @@
 Source2:	%{name}-rm_nonfree.sh
 Source3:	%{name}.desktop
 Source4:	%{name}.sh
-Source5:	%{name}-ti.sh
 Patch0:		%{name}-branding.patch
 Patch1:		%{name}-install.patch
 Patch2:		%{name}-gcc3.patch
@@ -280,11 +279,7 @@
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 %endif
 
-%if "%{pld_release}" == "ti"
-sed 's, at LIBDIR@,%{_libdir},' %{SOURCE5} > $RPM_BUILD_ROOT%{_bindir}/iceweasel
-%else
 sed 's, at LIBDIR@,%{_libdir},' %{SOURCE4} > $RPM_BUILD_ROOT%{_bindir}/iceweasel
-%endif
 ln -s iceweasel $RPM_BUILD_ROOT%{_bindir}/firefox
 ln -s iceweasel $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
 
@@ -492,6 +487,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2008/08/18 18:04:02  hawk
+- reverted separate wrappers for Titanium
+
 Revision 1.24  2008/08/18 16:48:10  arekm
 - release 4
 

================================================================
Index: SPECS/icedove.spec
diff -u SPECS/icedove.spec:1.12 SPECS/icedove.spec:1.13
--- SPECS/icedove.spec:1.12	Mon Aug 18 18:48:16 2008
+++ SPECS/icedove.spec	Mon Aug 18 20:04:02 2008
@@ -33,8 +33,7 @@
 Source3:	%{name}-rm_nonfree.sh
 Source4:	%{name}.desktop
 Source5:	%{name}.sh
-Source6:	%{name}-ti.sh
-Source7:	%{name}-enigmail.manifest
+Source6:	%{name}-enigmail.manifest
 Patch0:		%{name}-branding.patch
 Patch1:		%{name}-lib_path.patch
 Patch2:		%{name}-enigmail-shared.patch
@@ -264,11 +263,7 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 
-%if "%{pld_release}" == "ti"
-%{__sed} -e 's, at LIBDIR@,%{_libdir},' %{SOURCE6} > $RPM_BUILD_ROOT%{_bindir}/icedove
-%else
 %{__sed} -e 's, at LIBDIR@,%{_libdir},' %{SOURCE5} > $RPM_BUILD_ROOT%{_bindir}/icedove
-%endif
 ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/thunderbird
 ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
 
@@ -293,7 +288,7 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/components/enig*
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/libenigmime.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/ipc.xpt
-cp -f %{SOURCE7} $_enig_dir/chrome.manifest
+cp -f %{SOURCE6} $_enig_dir/chrome.manifest
 cp -f icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/icedove.png
 %endif
 
@@ -374,6 +369,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2008/08/18 18:04:02  hawk
+- reverted separate wrappers for Titanium
+
 Revision 1.12  2008/08/18 16:48:16  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/iceweasel.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/icedove.spec?r1=1.12&r2=1.13&f=u