[apt] Support F21 and bug fixes

[Mosaab Alzoubi]

commit 38dab2c9331ca59a426a166971511709b08f882c
Author: Mosaab Alzoubi <moceap at hotmail.com>
Date:   Thu Mar 12 05:57:19 2015 +0300

    Support F21 and bug fixes

 apt.spec | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/apt.spec b/apt.spec
index 35daca7..d788e50 100644
--- a/apt.spec
+++ b/apt.spec
@@ -15,7 +15,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
 Version: %{aptver}
-Release: 16.%{snapver}%{?dist}
+Release: 17.%{snapver}%{?dist}
 Group: System Environment/Base
 URL: http://apt-rpm.org/
 # SourceLicense: GPLv2+ except lua/ which is MIT
@@ -56,9 +56,10 @@ Patch3: apt-0.5.15lorg3.95-lua-5.2d.patch
 Patch4: apt-0.5.15lorg3.95-format-security.patch
 # Fix to build against modern rpm
 Patch5: apt-0.5.15lorg3.95-rpm-suggest-fix.patch
+%if 0%{?fedora} > 21
 # Fix for lua 5.3
 Patch6:	apt-0.5.15lorg3.95-lua-5.3.patch
-
+%endif
 
 # TODO: verify the required minimum Python version
 BuildRequires: python-devel >= 2.2
@@ -80,7 +81,11 @@ BuildRequires: %{comps}
 %endif
 # libxml2-devel, #183689
 BuildRequires: pkgconfig
+%if 0%{?fedora} < 21
+BuildRequires: lua-devel >= 5.1
+%else
 BuildRequires: lua-devel >= 5.3
+%endif
 BuildRequires: systemd-units
 Requires: gnupg
 Requires: bzip2
@@ -180,7 +185,9 @@ about it in /var/log/apt.log, or in the configured file.
 %patch3 -p1 -b .lua-52
 %patch4 -p1 -b .format-security
 %patch5 -p1 -b .rpm-suggest-fix
+%if 0%{?fedora} > 21
 %patch6 -p1 -b .lua-53
+%endif
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
@@ -188,7 +195,9 @@ install -pm 644 %{SOURCE19} comps2prio.xsl
 find contrib/ -type f | xargs chmod 0644
 
 %build
+%if 0%{?fedora} > 21
 CXXFLAGS="%{optflags} -DLUA_COMPAT_MODULE"
+%endif
 %configure --disable-dependency-tracking --disable-static
 
 make %{?_smp_mflags}
@@ -244,7 +253,7 @@ touch %{buildroot}%{python_sitearch}/apt.pyo
 
 # Nightly updater scripts & default config
 mkdir -p %{buildroot}%{_unitdir}
-install -Dpm 755 %{SOURCE200} %{buildroot}%{_unitdir}/apt.service
+install -Dpm 644 %{SOURCE200} %{buildroot}%{_unitdir}/apt.service
 install -Dpm 755 contrib/apt-cron/apt.cron %{buildroot}/%{_sysconfdir}/cron.daily/apt.cron
 install -Dpm 644 contrib/apt-cron/apt.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/apt
 
@@ -372,9 +381,10 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 
 %changelog
-* Wed Mar 11 2015 Mosaab Alzoubi <moceap at hotmail.com> - 0.5.15lorg3.95-16.git522
+* Wed Mar 11 2015 Mosaab Alzoubi <moceap at hotmail.com> - 0.5.15lorg3.95-17.git522
 - Accept Vaclav Pavlin patch #850028
--
+- Support F21 with old lua
+- Set apt.service attr to 644 #1158853
 
 * Wed Mar 11 2015 Václav Pavlín <vpavlin at redhat.com> - 0.5.15lorg3.95-16.git522
 - Scriptlets replaced with new systemd macros (#850028)