From 851dd7b3594096fff3a4da8748370b7b05e382c7 Mon Sep 17 00:00:00 2001
From: Luis Bazan <bazanluis20@gmail.com>
Date: May 27 2019 18:47:15 +0000
Subject: Merge branch 'f30' into f29


---

diff --git a/.gitignore b/.gitignore
index c2b8c92..cd1fe62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,10 @@ dar-2.3.8.tar.gz
 /dar-2.6.1.tar.gz
 /dar-2.6.2.tar.gz
 /dar-2.6.3.tar.gz
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+/dar-2.6.4.tar.gz
+>>>>>>> master
+>>>>>>> f30
diff --git a/dar.spec b/dar.spec
index 36cec13..443c8cd 100644
--- a/dar.spec
+++ b/dar.spec
@@ -13,11 +13,10 @@
 # Basic descriptive tags for this package:
 #
 Name:           dar
-Version:        2.6.3
+Version:        2.6.4
 Release:        1%{?dist}
 Summary:        Software for making/restoring incremental CD/DVD backups
 
-Group:          Applications/Archiving
 License:        GPLv2+
 URL:            http://dar.linux.free.fr
 
@@ -53,7 +52,6 @@ and symbolic links.
 ################################################################################
 
 %package -n libdar
-Group:      System Environment/Libraries
 Summary:    Library providing support for the DAR API
 
 %description -n libdar
@@ -62,9 +60,8 @@ Common library code for DAR.
 ################################################################################
 
 %package -n libdar-devel
-Group:      Development/Libraries
 Summary:    Development files for libdar
-Requires:   libdar = %{version}-%{release}
+Requires:   libdar%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n libdar-devel
 This package contains the header files and libraries for developing
@@ -77,7 +74,6 @@ programs that use the DAR API (libdar).
 %if %{with_static}
 
 %package -n dar-static
-Group:      Applications/System
 Summary:    Statically linked version of dar
 
 %description -n dar-static
@@ -85,7 +81,6 @@ Statically linked version of dar that can be installed onto backup disks for
 easier file retrieval.
 
 %package -n libdar-static-devel
-Group:      Development/Libraries
 Summary:    Statically linked dar library files
 
 %description -n libdar-static-devel
@@ -148,8 +143,7 @@ cp -a %{SOURCE1} .
 
 ################################################################################
 
-%post   -n libdar -p /sbin/ldconfig
-%postun -n libdar -p /sbin/ldconfig
+%ldconfig_scriptlets   -n libdar
 
 
 %files -f %{name}.lang
@@ -192,15 +186,24 @@ cp -a %{SOURCE1} .
 %endif
 
 %changelog
+* Mon May 27 2019 Luis Bazan <lbazan@fedoraproject.org> - 2.6.4-1
+- New upstream version
+
 * Mon Apr 01 2019 Luis Bazan <lbazan@fedoraproject.org> - 2.6.3-1
 - New upstream version
 
 * Mon Feb 11 2019 Luis Bazan <lbazan@fedoraproject.org> - 2.6.2-1
 - New upstream version
 
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Jan 19 2019 Luis Bazan <lbazan@fedoraproject.org> - 2.6.1-1
 - New upstream version
 
+* Tue Jan 15 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:2.6.0-2
+- Bump epoch to prevent downgrade
+
 * Tue Jan 08 2019 Luis Bazan <lbazan@fedoraproject.org> - 2.6.0-1
 - New upstream version
 
diff --git a/sources b/sources
index e239b9b..7bbd69c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dar-2.6.3.tar.gz) = 3e3e1fa92a6954ac745dce9ecd4e82589bde562760f6cd5402fae9250f84e2df4784672ae9b0c4fa0e0baf5b2b642a025fa694a5975a5346e890655b65d93783
+SHA512 (dar-2.6.4.tar.gz) = ba78936e645cc06f94e64bf0e288398ee522b4be6c3501f9b21d7038d7a66a083386c7520aaaddd265de68937d017dcb2fd87bf06f3e2a91f444f3307b4c15b9