summaryrefslogtreecommitdiffstats
path: root/redhat/applications/smartcardauth
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-08-30 12:27:30 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-08-30 12:27:30 +0200
commit972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2 (patch)
treeab6620583bc880bd61cceb0058ecc1f7e896b992 /redhat/applications/smartcardauth
parente5f2386a7884932cffd7c862b6ddedbd2e8a6810 (diff)
downloadtde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.tar.gz
tde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.zip
RPM packaging: massive update SPEC files
Diffstat (limited to 'redhat/applications/smartcardauth')
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-14.0.0.spec6
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec7
2 files changed, 4 insertions, 9 deletions
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index 0be439fd8..99bc7d0c8 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
@@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: SmartCard Login and LUKS Decrypt, Setup Utility
Group: Applications/System
URL: http://www.trinitydesktop.org/
@@ -56,7 +56,7 @@ 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}-14.0.0.patch
+#Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -139,7 +139,7 @@ in addition to the PKCS certificate functionality
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1
+#patch0 -p1
%__sed -i "Makefile" \
-e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g"
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec
index e7c9a8b1d..026a14143 100644
--- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec
@@ -2,11 +2,6 @@
%define tde_pkg smartcardauth
%define tde_version 3.5.13.2
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@@ -27,7 +22,7 @@
Name: trinity-%{tde_pkg}
Summary: SmartCard Login and LUKS Decrypt, Setup Utility
Version: 1.0
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
License: GPLv2+
Group: Applications/System