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

Secondary arch fixes, Use %%license

Browse Source
This commit is contained in:
Peter Robinson 2016-05-08 12:23:30 +01:00
parent 61e6bb68f9
commit 662e4a437a
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
esc.spec
View File

@ -1,13 +1,11 @@
Name: esc Name: esc
Version: 1.1.0 Version: 1.1.0
Release: 29%{?dist} Release: 30%{?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
Group: Applications/Internet Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Fix to build against XUlrunner SDK. #Fix to build against XUlrunner SDK.
Patch1: esc-1.1.0-fix1.patch Patch1: esc-1.1.0-fix1.patch
#Fix to the smart card handling thread #Fix to the smart card handling thread
@ -127,7 +125,7 @@ GECKO_BIN_PATH=%{_libdir}/xulrunner
GECKO_INCLUDE_PATH=%{_includedir}/xulrunner-%{geckoversion} GECKO_INCLUDE_PATH=%{_includedir}/xulrunner-%{geckoversion}
GECKO_IDL_PATH=/usr/share/idl/xulrunner-%{geckoversion} GECKO_IDL_PATH=/usr/share/idl/xulrunner-%{geckoversion}
%ifarch x86_64 ppc64 ia64 %ifarch x86_64 %{power64} ia64 aarch64
USE_64=1 USE_64=1
export USE_64 export USE_64
%endif %endif
@ -166,7 +164,7 @@ chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
mkdir -p $RPM_BUILD_ROOT/%{escdir} mkdir -p $RPM_BUILD_ROOT/%{escdir}
%ifarch x86_64 ppc64 ia64 %ifarch x86_64 %{power64} ia64 aarch64
USE_64=1 USE_64=1
export USE_64 export USE_64
%endif %endif
@ -198,12 +196,10 @@ chmod 755 -R $RPM_BUILD_ROOT/%{escdir}/defaults
chmod 755 $RPM_BUILD_ROOT/%{escdir}/application.ini chmod 755 $RPM_BUILD_ROOT/%{escdir}/application.ini
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc}
%license %{docdir}/LICENSE
%{escdir}/esc %{escdir}/esc
%{escdir}/escd %{escdir}/escd
@ -225,7 +221,6 @@ rm -rf $RPM_BUILD_ROOT
%{pixmapdir}/esc.png %{pixmapdir}/esc.png
%{autostartdir}/esc.desktop %{autostartdir}/esc.desktop
%{_datadir}/%{appdir}/esc.desktop %{_datadir}/%{appdir}/esc.desktop
%doc %{docdir}/LICENSE
%post %post
touch --no-create %{_datadir}/icons/hicolor || : touch --no-create %{_datadir}/icons/hicolor || :
@ -245,10 +240,14 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
fi fi
%changelog %changelog
* Mon Feb 08 2016 Jack Magne <jmagne@redhat.com>=1.1.0-29 * Sun May 8 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.0-30
- Secondary arch fixes
- Use %%license
* Mon Feb 08 2016 Jack Magne <jmagne@redhat.com> 1.1.0-29
- Apease latest xullrunner api changes. - Apease latest xullrunner api changes.
* Thu Apr 09 2015 Jack Magne <jmagne@redhat.com>=1.1.0-27 * Thu Apr 09 2015 Jack Magne <jmagne@redhat.com> 1.1.0-27
- More xulrunner adjustments. - More xulrunner adjustments.
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-26 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild