[apt/f20: 2/2] fixes

[Mosaab Alzoubi]

commit 56d3c0ed7891e281f6b5c680a80a67ed63704fb2
Merge: 4a0eaef 38dab2c
Author: Mosaab Alzoubi <moceap at hotmail.com>
Date:   Thu Mar 12 06:05:06 2015 +0300

    fixes

 apt.spec | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)
---
diff --cc apt.spec
index 0a4da4b,d788e50..73cc898
--- a/apt.spec
+++ b/apt.spec
@@@ -15,11 -15,7 +15,15 @@@
  Summary: Debian's Advanced Packaging Tool with RPM support
  Name: apt
  Version: %{aptver}
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +Release: 10.%{snapver}.1%{?dist}
 +=======
 +Release: 16.%{snapver}%{?dist}
 +>>>>>>> master
++=======
+ Release: 17.%{snapver}%{?dist}
++>>>>>>> master
  Group: System Environment/Base
  URL: http://apt-rpm.org/
  # SourceLicense: GPLv2+ except lua/ which is MIT
@@@ -376,11 -381,10 +389,16 @@@ rm -f %{buildroot}%{_libdir}/*.l
  
  
  %changelog
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +=======
 +* 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
++>>>>>>> master
  - 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)