Update to ver 1.0.1.
This commit is contained in:
Jack Magne
parent
8aa5776503
commit
f90e7052e3
19
esc
19
esc
@ -1,9 +1,26 @@
|
|||||||
#!/bin/sh
|
#!/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_PROFILE_BASE=~/.redhat/esc
|
||||||
ESC_LOG_FILE=esc.log
|
ESC_LOG_FILE=esc.log
|
||||||
|
|
||||||
ESC_PATH=$LIBDIR/esc-1.0.0
|
ESC_PATH=$LIBDIR/esc-1.0.1
|
||||||
ESC_BIN_PATH=/usr/bin
|
ESC_BIN_PATH=/usr/bin
|
||||||
ESC_EXEC=esc
|
ESC_EXEC=esc
|
||||||
ESCD_EXEC=escd
|
ESCD_EXEC=escd
|
||||||
|
|||||||
46
esc.spec
46
esc.spec
@ -1,6 +1,6 @@
|
|||||||
Name: esc
|
Name: esc
|
||||||
Version: 1.0.0
|
Version: 1.0.1
|
||||||
Release: 19%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Enterprise Security Client Smart Card Client
|
Summary: Enterprise Security Client Smart Card Client
|
||||||
License: GPL
|
License: GPL
|
||||||
URL: http://directory.fedora.redhat.com/wiki/CoolKey
|
URL: http://directory.fedora.redhat.com/wiki/CoolKey
|
||||||
@ -8,24 +8,8 @@ Group: Applications/Internet
|
|||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
Patch1: firefox-1.5.0.1-dumpstack.patch
|
Patch1: firefox-1.5-with-system-nss.patch
|
||||||
Patch2: xulrunner-1.8.0.1-coreconf.patch
|
Patch2: firefox-1.1-nss-system-nspr.patch
|
||||||
Patch3: firefox-1.5-with-system-nss.patch
|
|
||||||
Patch4: 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
|
|
||||||
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
|
|
||||||
|
|
||||||
BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
|
BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
|
||||||
BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
|
BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
|
||||||
@ -63,7 +47,7 @@ AutoReqProv: 0
|
|||||||
Source0: %{escname}.tar.bz2
|
Source0: %{escname}.tar.bz2
|
||||||
Source1: esc
|
Source1: esc
|
||||||
Source2: esc.desktop
|
Source2: esc.desktop
|
||||||
Source3: xulrunner-1.8.0.1-source.tar.bz2
|
Source3: xulrunner-1.8.0.4-source.tar.bz2
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -74,22 +58,7 @@ cryptographic smartcards.
|
|||||||
|
|
||||||
%setup -q -c -n %{escname}
|
%setup -q -c -n %{escname}
|
||||||
|
|
||||||
#patch esc to use system nss and nspr.
|
|
||||||
|
|
||||||
%patch5 -p1 -b .fix5
|
|
||||||
%patch6 -p1 -b .fix6
|
|
||||||
%patch7 -p1 -b .fix7
|
|
||||||
%patch8 -p1 -b .fix8
|
|
||||||
%patch11 -p1 -b .fix11
|
|
||||||
%patch12 -p1 -b .fix12
|
|
||||||
%patch13 -p1 -b .fix13
|
|
||||||
%patch14 -p1 -b .fix14
|
|
||||||
%patch15 -p1 -b .fix15
|
|
||||||
%patch16 -p1 -b .fix16
|
|
||||||
%patch17 -p1 -b .fix17
|
|
||||||
%patch18 -p1 -b .fix18
|
|
||||||
%patch19 -p1 -b .fix19
|
|
||||||
%patch20 -p1 -b .fix20
|
|
||||||
|
|
||||||
#Unpack xulrunner where esc expects it to be.
|
#Unpack xulrunner where esc expects it to be.
|
||||||
|
|
||||||
@ -101,8 +70,6 @@ cd mozilla
|
|||||||
|
|
||||||
%patch1 -p1 -b .fix1
|
%patch1 -p1 -b .fix1
|
||||||
%patch2 -p1 -b .fix2
|
%patch2 -p1 -b .fix2
|
||||||
%patch3 -p1 -b .fix3
|
|
||||||
%patch4 -p1 -b .fix4
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -132,6 +99,7 @@ mkdir -p $RPM_BUILD_ROOT/%{docdir}
|
|||||||
sed -e 's;\$LIBDIR;'%{_libdir}';g' %{SOURCE1} > $RPM_BUILD_ROOT/%{escbindir}/%{name}
|
sed -e 's;\$LIBDIR;'%{_libdir}';g' %{SOURCE1} > $RPM_BUILD_ROOT/%{escbindir}/%{name}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
|
chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{escdir}
|
mkdir -p $RPM_BUILD_ROOT/%{escdir}
|
||||||
@ -198,6 +166,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 05 2007 Jack Magne <jmagne@redhat.com>- 1.0.0-1
|
||||||
|
- Stability fixes
|
||||||
* Fri Oct 27 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-19
|
* Fri Oct 27 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-19
|
||||||
- More mac and win fixes.
|
- More mac and win fixes.
|
||||||
* Tue Oct 24 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-18
|
* Tue Oct 24 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-18
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user