auto-import esc-1.0.1-1.EL4 on branch devel from esc-1.0.1-1.EL4.src.rpm

.cvsignore

@@ -1,4 +1,2 @@
-esc-1.0.0.tar.bz2
-xulrunner-1.8.0.1-source.tar.bz2
 esc-1.0.1.tar.bz2
 xulrunner-1.8.0.4-source.tar.bz2

esc

@@ -1,21 +1,4 @@
 #!/bin/sh
-# 
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
 
 ESC_PROFILE_BASE=~/.redhat/esc
 ESC_LOG_FILE=esc.log
@@ -25,6 +8,10 @@ ESC_BIN_PATH=/usr/bin
 ESC_EXEC=esc
 ESCD_EXEC=escd
 
+LD_LIBRARY_PATH=$ESC_PATH/xulrunner:$ESC_PATH/xulrunner/components:$ESC_PATH/xulrunner/plugins
+
+export LD_LIBRARY_PATH
+
 ESC_BIN=$ESC_PATH/xulrunner/xulrunner-bin
 ESCD_BIN=./$ESCD_EXEC
 

esc.spec

@@ -8,20 +8,40 @@ Group: Applications/Internet
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#Patch1: firefox-1.5.0.1-dumpstack.patch
+#Patch2: xulrunner-1.8.0.1-coreconf.patch
 Patch1: firefox-1.5-with-system-nss.patch
 Patch2: firefox-1.1-nss-system-nspr.patch
+#Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
+#Patch6: esc-1.0.0-ui-enhance.patch
+#Patch7: esc-1.0.0-notify-icon-fixes.patch
+#Patch8: esc-1.0.0-strings-fix.patch
+#Patch9: esc-rhel4-nss-nspr.patch
+Patch3: esc-xulrunner-lin-64.patch 
+Patch4: esc-rhel4-cool-build.patch
+#Patch11: esc-1.0.0.strings-1-fix.patch
+#Patch12: esc-1.0.0-ui-enhance-1.patch
+#Patch13: esc-1.0.0-pw-reset-fix.patch
+#Patch14: esc-1.0.0-escd.patch
+#Patch15: esc-1.0.0-escd1.patch
+#Patch16: esc-1.0.0-escd2.patch
+#Patch17: esc-1.0.0-build-fix.patch
+#Patch18: esc-1.0.0-diag-fix.patch
+#Patch19: esc-1.0.0-mac-win-fix.patch
+#Patch20: esc-1.0.0-mac-win-fix1.patch
+#Patch21: esc-1.0.0-mac-win-fix2.patch
+
+
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
 BuildRequires: pango-devel libpng-devel pkgconfig zlib-devel
-BuildRequires: nspr-devel nss-devel
+BuildRequires: mozilla-nspr-devel mozilla-nss-devel
-BuildRequires: autoconf213 libX11-devel libXt-devel
+#BuildRequires: autoconf213 
 
 BuildRequires: pcsc-lite-devel coolkey-devel
-BuildRequires: desktop-file-utils zip binutils libnotify-devel
+BuildRequires: desktop-file-utils zip binutils
-BuildRequires: dbus-devel
+Requires: pcsc-lite ifd-egate coolkey mozilla-nss mozilla-nspr
-Requires: pcsc-lite ifd-egate coolkey nss nspr
-Requires: zip dbus >= 0.90 libnotify >= 0.4.2
 
 # 390 does not have coolkey or smartCards
 # Xulrunner won't compile on ppc64 right now.
@@ -58,7 +78,13 @@ cryptographic smartcards.
 
 %setup -q -c -n %{escname}
 
+#patch esc 
 
+%ifarch x86_64 ppc64 ia64
+%patch3 -p1 -b .fix1
+%endif
+
+%patch4 -p1 -b .fix2
 
 #Unpack xulrunner where esc expects it to be.
 
@@ -73,7 +99,12 @@ cd mozilla
 
 %build
 
+MOZ_OFFSET=mozilla-1.7.3
+export MOZ_OFFSET
+
 %ifarch x86_64 ppc64 ia64
+MOZ_OFFSET=mozilla-1.7.12
+export MOZ_OFFSET
 USE_64=1
 export USE_64
 %endif
@@ -82,7 +113,7 @@ export USE_64
 
 cd ../..
 
-make BUILD_OPT=1 HAVE_LIB_NOTIFY=1 ESC_VERSION=%{version}-%{release}
+make BUILD_OPT=1 NO_SYSTEM_NSS=1 ESC_VERSION=%{version}-%{release}
 
 %install
 
@@ -99,7 +130,6 @@ mkdir -p $RPM_BUILD_ROOT/%{docdir}
 sed -e 's;\$LIBDIR;'%{_libdir}';g'  %{SOURCE1} > $RPM_BUILD_ROOT/%{escbindir}/%{name}
 
 
-
 chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
 
 mkdir -p $RPM_BUILD_ROOT/%{escdir}
@@ -166,40 +196,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 %changelog
-* Mon Mar 05 2007 Jack Magne <jmagne@redhat.com>- 1.0.0-1
+* Sat Aug 22 2006 Jack Magne <jmagne@redhat.com>-  1.0.0-8
-- Stability fixes
-* Fri Oct 27 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-19
-- More mac and win fixes.
-* Tue Oct 24 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-18
--rebuilt on RHEL-5 branch
-* Sun Oct 4  2006 Jack Magne <jmagne@redhat.com>- 1.0.0-17
-- Diagnostics display fixes, Mac and Window fixes.
-
-* Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 1.0.0-16
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Fri Sep 22 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-15
-- Fix to the build version
-
-* Fri Sep 22 2006 Jack Magne <jmagne@redhat.com>= 1.0.0-14
-- Fix to compile error in daemon
-
-* Fri Sep 22 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-13
-- Fix to include the new esc daemon.  
-
-* Sat Sep 16 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-12
-- Fix for Password Reset and minor UI revision.
-
-* Fri Sep 15 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-11
-- Further UI enhancement bug fixes
-
-* Thu Sep 7 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-10
-- Further strings revisions.
-
-* Wed Aug 30 2006 Jack Magne <jmagne@redhat.com>-  1.0.0-9
-- Revision of the strings used in ESC.
-
-* Sat Aug 27 2006 Jack Magne <jmagne@redhat.com>-  1.0.0-8
 - Fixes to get libnotify working properly on FC6 systems.
 
 * Tue Aug 22 2006 Jack Magne <jmagne@redhat.com> - 1.0.0-7

sources

@@ -1,4 +1,2 @@
-a344ae0baa8ec2f1e5d916c2df7f7d3c  esc-1.0.0.tar.bz2
-d60ccb6cc28afa7d880c8602a2c88450  xulrunner-1.8.0.1-source.tar.bz2
 3d3def2acd3c8d04dff47af5312a707c  esc-1.0.1.tar.bz2
 4dc09831aa4e94fda5182a4897ed08e9  xulrunner-1.8.0.4-source.tar.bz2