diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-06-27 13:54:07 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-06-27 13:54:07 +0200 |
| commit | 14aa9dd4948db58c958c37ec93648d0e757b1610 (patch) | |
| tree | fd837b3927486a8cf207d1be210f0f96538b69aa | |
| parent | c04a613301f53ffd04afbcea91569882a9541756 (diff) | |
| download | tde-packaging-14aa9dd4948db58c958c37ec93648d0e757b1610.tar.gz tde-packaging-14aa9dd4948db58c958c37ec93648d0e757b1610.zip | |
RPM packaging: update smartcardauth, trinity-filesystem
| -rw-r--r-- | redhat/applications/smartcardauth/smartcardauth-14.0.0.spec | 9 | ||||
| -rw-r--r-- | redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec index 4176d716d..75d7e35b6 100644 --- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec +++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec @@ -53,6 +53,8 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: trinity-%{tde_pkg}-rpmlintrc +Patch0: %{tde_pkg}-%{tde_version}.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -135,6 +137,7 @@ in addition to the PKCS certificate functionality %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch0 -p1 -b .ftbfs %__sed -i "Makefile" \ -e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g" @@ -143,10 +146,8 @@ in addition to the PKCS certificate functionality %build export PATH="%{tde_bindir}:${PATH}" -export CFLAGS="${CXXFLAGS} ${RPM_OPT_FLAGS}" -export CXXFLAGS="${CXXFLAGS} ${RPM_OPT_FLAGS}" - -./build_ckpasswd +cd src +make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" %install diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec index 1d7014ad5..f6e1b2616 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec @@ -211,7 +211,7 @@ This package installs the Trinity directory structure. for t in crystalsvg hicolor locolor ; do %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}" %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable" - for i in {16,22,32,48,64,128} ; do + for i in {16,22,32,48,64,128,256} ; do %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}" done |