rpms/esc
5
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import esc-1.0.0-7 on branch devel from esc-1.0.0-7.src.rpm

Browse Source
This commit is contained in:
Jack Magne 2006-08-23 15:59:42 +00:00
parent 75795d86d0
commit dc94d41a2e
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
esc.spec
View File

@ -1,6 +1,6 @@
Name: esc Name: esc
Version: 1.0.0 Version: 1.0.0
Release: 6%{?dist} Release: 7%{?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
@ -13,8 +13,6 @@ Patch2: xulrunner-1.8.0.1-coreconf.patch
Patch3: firefox-1.5-with-system-nss.patch Patch3: firefox-1.5-with-system-nss.patch
Patch4: firefox-1.1-nss-system-nspr.patch Patch4: firefox-1.1-nss-system-nspr.patch
Patch5: esc-1.0.0-xul-sys-nss-nspr.patch Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
Patch6: esc-1.0.0-ui-enhance.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
@ -23,7 +21,7 @@ BuildRequires: nspr-devel nss-devel
BuildRequires: autoconf213 libX11-devel libXt-devel BuildRequires: autoconf213 libX11-devel libXt-devel
BuildRequires: pcsc-lite-devel coolkey-devel BuildRequires: pcsc-lite-devel coolkey-devel
BuildRequires: desktop-file-utils zip binutils libnotify-devel BuildRequires: desktop-file-utils zip binutils
Requires: pcsc-lite ifd-egate coolkey nss nspr Requires: pcsc-lite ifd-egate coolkey nss nspr
Requires: zip Requires: zip
@ -65,8 +63,6 @@ cryptographic smartcards.
#patch esc to use system nss and nspr. #patch esc to use system nss and nspr.
%patch5 -p1 -b .fix5 %patch5 -p1 -b .fix5
%patch6 -p1 -b .fix6
#Unpack xulrunner where esc expects it to be. #Unpack xulrunner where esc expects it to be.
@ -81,8 +77,6 @@ cd mozilla
%patch3 -p1 -b .fix3 %patch3 -p1 -b .fix3
%patch4 -p1 -b .fix4 %patch4 -p1 -b .fix4
%build %build
%ifarch x86_64 ppc64 ia64 %ifarch x86_64 ppc64 ia64
@ -94,7 +88,7 @@ export USE_64
cd ../.. cd ../..
make BUILD_OPT=1 HAVE_LIB_NOTIFY=1 make BUILD_OPT=1
%install %install
@ -107,8 +101,10 @@ mkdir -p $RPM_BUILD_ROOT/%{autostartdir}
mkdir -p $RPM_BUILD_ROOT/%{pixmapdir} mkdir -p $RPM_BUILD_ROOT/%{pixmapdir}
mkdir -p $RPM_BUILD_ROOT/%{docdir} 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}
@ -174,15 +170,23 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
fi fi
%changelog %changelog
* Tue Aug 22 2006 Jack Magne <jmagne@redhat.com> - 1.0.0-7
- Fix for bug #203211, use of system NSS and NSPR for
- Xulrunner ,addressing the problem running on 64 bit.
- Overwriting 5 and 6 due to important bug #203211.
* Fri Aug 18 2006 Jack Magne <jmagne@redhat.com> - 1.0.0-6 * Fri Aug 18 2006 Jack Magne <jmagne@redhat.com> - 1.0.0-6
- Correct problem with Patch #6 - Correct problem with Patch #6
* Tue Aug 17 2006 Jack Magne <jmagne@redhat.com> - 1.0.0-4 * Tue Aug 17 2006 Jack Magne <jmagne@redhat.com> - 1.0.0-5
- Build ESC's xulrunner component using system nss and nspr - Build ESC's xulrunner component using system nss and nspr
- Build process creates run script based on {_libdir} variable, - Build process creates run script based on {_libdir} variable,
accounting for differences on 64 bit machines. accounting for differences on 64 bit machines.
- UI enhancements - UI enhancements
* Tue Aug 1 2006 Matthias Clasen <mclasen@redhat.com> - 1.0.0-4
- Don't auto-generate requires either
* Mon Jul 31 2006 Matthias Clasen <mclasen@redhat.com> - 1.0.0-3 * Mon Jul 31 2006 Matthias Clasen <mclasen@redhat.com> - 1.0.0-3
- Don't provide mozilla libraries - Don't provide mozilla libraries