summaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorMichel Alexandre Salim <salimma@fedoraproject.org>2020-03-26 14:18:23 -0700
committerMichel Alexandre Salim <salimma@fedoraproject.org>2020-03-26 14:18:23 -0700
commit547d283087db0d07ead7bd2b6d196345cf49cbf1 (patch)
tree291e473ad7b46d9ef23dede6be8a7d67ad762bd1 /admin
parente759923ed997fd73644e652a48c1b960be1238fe (diff)
downloadspecs-547d283087db0d07ead7bd2b6d196345cf49cbf1.tar.gz
specs-547d283087db0d07ead7bd2b6d196345cf49cbf1.tar.xz
specs-547d283087db0d07ead7bd2b6d196345cf49cbf1.zip
admin/pam-cryptsetup: incorporate review feedback
Diffstat (limited to 'admin')
-rw-r--r--admin/pam-cryptsetup.spec20
1 files changed, 14 insertions, 6 deletions
diff --git a/admin/pam-cryptsetup.spec b/admin/pam-cryptsetup.spec
index 7d7dfcf..3d2750b 100644
--- a/admin/pam-cryptsetup.spec
+++ b/admin/pam-cryptsetup.spec
@@ -1,21 +1,23 @@
+%global commit 7b42892ea42cd710eab962236b3dd0ac55fbb402
+%global shortcommit 7b42892
%global snapshot_date 20190823
-%global snapshot_rev 7b42892
-%global snapinfo %{snapshot_date}.%{snapshot_rev}
+%global snapinfo %{snapshot_date}.%{shortcommit}
Name: pam-cryptsetup
Version: 0.1
-Release: 0.2.%{snapinfo}%{?dist}
+Release: 0.3.%{snapinfo}%{?dist}
Summary: PAM module for updating LUKS-encrypted volumes
License: ASL 2.0
URL: https://github.com/google/pam-cryptsetup/
# git archive --format=tar --prefix=pam-cryptsetup/ -o /tmp/pam-cryptsetup-0.1-$(git rev-parse --short HEAD).tar master
-Source0: %{name}-%{version}-%{snapshot_rev}.tar.xz
+Source0: %{url}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
# https://github.com/google/pam-cryptsetup/pull/9
Patch0: %{name}-0.1-fix-stringop-truncation.patch
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: gcc
BuildRequires: libtool
BuildRequires: cryptsetup-devel
BuildRequires: device-mapper-devel
@@ -33,17 +35,18 @@ perform the actual encryption checks and modifications required.
%prep
-%autosetup -n %{name} -p1
+%autosetup -n %{name}-%{commit} -p1
%build
./autogen.sh
%configure
+# Workaround libtool reordering -Wl,--as-needed after all the libraries.
+sed -i 's|CC="\(.*g..\)"|CC="\1 -Wl,--as-needed"|' libtool
%make_build
%install
-rm -rf $RPM_BUILD_ROOT
%make_install
rm $RPM_BUILD_ROOT%{_libdir}/security/pam_cryptsetup.la
@@ -62,6 +65,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/security/pam_cryptsetup.la
%changelog
+* Thu Mar 26 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.1-0.3.20190823.7b42892
+- Add missing BR on gcc
+- Spec cleanup
+- Make source downloadable
+
* Tue Mar 3 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.1-0.2.20190823.7b42892
- Update patch to use #pragma to suppress stringop-truncation