From bfb7c5ae460cae938bae885568eb01cf8548afbb Mon Sep 17 00:00:00 2001 From: Jirka Hladky Date: Fri, 21 Aug 2015 18:19:19 +0200 Subject: [PATCH] Fixing build issue on F24 --- aespipe.spec | 59 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/aespipe.spec b/aespipe.spec index 8af9b46..e994a95 100644 --- a/aespipe.spec +++ b/aespipe.spec @@ -1,9 +1,8 @@ Summary: AES-based encryption tool for tar/cpio and loop-aes images Name: aespipe Version: 2.4d -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Group: Applications/System URL: http://loop-aes.sourceforge.net/ Source: http://loop-aes.sourceforge.net/aespipe/aespipe-v%{version}.tar.bz2 @@ -26,7 +25,8 @@ kernel module. %setup -q -n %{name}-v%{version} %build -%configure +# Package calls CC to link +%configure LDFLAGS="${CFLAGS}" %global make_target %{nil} %ifarch x86_64 @@ -35,36 +35,61 @@ kernel module. %ifarch %{ix86} %global make_target x86 %endif -%{__make} %{?_smp_mflags} %{make_target} +make %{?_smp_mflags} %{make_target} %check -%{__make} tests +make tests %install -%{__rm} -rf %{buildroot} -%{__mkdir} -p %{buildroot}%{_defaultdocdir}/%{name}/examples -%{__cp} -p ChangeLog README %{buildroot}%{_defaultdocdir}/%{name} -%{__install} -Dp -m0644 bz2aespipe %{buildroot}%{_defaultdocdir}/%{name}/examples -%{__install} -Dp -m0644 aespipe.1 %{buildroot}%{_mandir}/man1/aespipe.1 -%{__install} -Dp -m0755 aespipe %{buildroot}%{_bindir}/aespipe +mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/examples +cp -p ChangeLog README %{buildroot}%{_defaultdocdir}/%{name} +install -Dp -m0644 bz2aespipe %{buildroot}%{_defaultdocdir}/%{name}/examples +install -Dp -m0644 aespipe.1 %{buildroot}%{_mandir}/man1/aespipe.1 +install -Dp -m0755 aespipe %{buildroot}%{_bindir}/aespipe -%clean -%{__rm} -rf %{buildroot} %files -%defattr(-, root, root, -) %dir %{_defaultdocdir}/%{name} %{_defaultdocdir}/%{name}/* %{_mandir}/man1/* %{_bindir}/aespipe %changelog +* Fri Aug 21 2015 Jirka Hladky - 2.4d-2 +- fixing build issue on F24 + * Thu Aug 20 2015 Jirka Hladky - 2.4d-1 - Update to version 2.4d -* Sat Jan 04 2014 Jirka Hladky - 2.4c-1 -- Unversioned docdir change, more info on - https://fedoraproject.org/wiki/Changes/UnversionedDocdirs +* Tue Jul 07 2015 Ralf Corsépius - 2.4c-10 +- Add LDFLAGS=${CFLAGS} to %%configure (Fix F23FTBFS RHBZ#1239364). + +* Tue Jun 16 2015 Fedora Release Engineering - 2.4c-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Aug 15 2014 Fedora Release Engineering - 2.4c-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 22 2014 Peter Robinson 2.4c-7 +- Modernise spec, fixup scew with f20 + +* Sat Jun 07 2014 Fedora Release Engineering - 2.4c-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Aug 8 2013 Ville Skyttä - 2.4c-5 +- Use special %%doc to install docs (#993663). + +* Sat Aug 03 2013 Fedora Release Engineering - 2.4c-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 2.4c-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 2.4c-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 2.4c-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild * Sun Jul 3 2011 Jirka Hladky - 2.4c - Update to version 2.4c