[apt/f20: 8/8] Scriptlets replaced with new systemd macros

[Mosaab Alzoubi]

commit 4a0eaef2366c3f5feda62d44ed63c37943340adf
Merge: 050f72d 0f24791
Author: Mosaab Alzoubi <moceap at hotmail.com>
Date:   Wed Mar 11 19:14:05 2015 +0300

    Scriptlets replaced with new systemd macros

 apt-0.5.15lorg3.95-format-security.patch |  21 ++
 apt-0.5.15lorg3.95-lua-5.2d.patch        | 379 +++++++++++++++++++++++++++++++
 apt-0.5.15lorg3.95-lua-5.3.patch         |  51 +++++
 apt-0.5.15lorg3.95-rpm-suggest-fix.patch |  12 +
 apt.spec                                 |  74 ++++--
 5 files changed, 521 insertions(+), 16 deletions(-)
---
diff --cc apt.spec
index 29b25cc,35daca7..0a4da4b
--- a/apt.spec
+++ b/apt.spec
@@@ -10,7 -15,7 +15,11 @@@
  Summary: Debian's Advanced Packaging Tool with RPM support
  Name: apt
  Version: %{aptver}
++<<<<<<< HEAD
 +Release: 10.%{snapver}.1%{?dist}
++=======
+ Release: 16.%{snapver}%{?dist}
++>>>>>>> master
  Group: System Environment/Base
  URL: http://apt-rpm.org/
  # SourceLicense: GPLv2+ except lua/ which is MIT
@@@ -361,6 -372,30 +376,33 @@@ rm -f %{buildroot}%{_libdir}/*.l
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Wed Mar 11 2015 Mosaab Alzoubi <moceap at hotmail.com> - 0.5.15lorg3.95-16.git522
+ - Accept Vaclav Pavlin patch #850028
+ -
+ 
+ * 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)
+ 
+ * Thu Jan 15 2015 Tom Callaway <spot at fedoraproject.org> - 0.5.15lorg3.95-15.git522
+ - add lua 5.3 support
+ 
+ * Wed Dec 10 2014 Tom Callaway <spot at fedoraproject.org> - 0.5.15lorg3.95-14.git522
+ - fix lua patch again
+ - fix build with modern RPM
+ - disable python support (it is bitrotten and broken)
+ 
+ * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.15lorg3.95-13.git522
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.15lorg3.95-12.git522
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Tue Jun  3 2014 Tom Callaway <spot at fedoraproject.org> - 0.5.14lorg3.95-11.git522
+ - fix format-security issues
+ 
++>>>>>>> master
  * Tue May 20 2014 Tom Callaway <spot at fedoraproject.org> - 0.5.14lorg3.95-10.git522.1
  - updated lua fix