From a163c167e64552f1cfb199bf507fd4430dc1f4a236c7596a7dc8eefe49e98872 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Fri, 29 Nov 2019 12:48:56 +0000
Subject: [PATCH] - Update to 0.15.3   + Export all changelog entries in
 compatibility mode   + Libmagic to follow symlinks (rh#1776399)   + Add
 shortcut to detect *.yaml files as not compressed - Ensure createrepo_c fully
 replaces createrepo on Tumbleweed - Remove old and now unused dependency on
 deltarpm as drpm is used now

OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=44
---
 createrepo_c-0.15.2.tar.gz |  3 ---
 createrepo_c-0.15.3.tar.gz |  3 +++
 createrepo_c.changes       | 10 ++++++++++
 createrepo_c.spec          | 34 ++++++++++++++++++++++++++++++----
 4 files changed, 43 insertions(+), 7 deletions(-)
 delete mode 100644 createrepo_c-0.15.2.tar.gz
 create mode 100644 createrepo_c-0.15.3.tar.gz

diff --git a/createrepo_c-0.15.2.tar.gz b/createrepo_c-0.15.2.tar.gz
deleted file mode 100644
index 602a6b5..0000000
--- a/createrepo_c-0.15.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:352b6fe91733b2d1610cdf18c6c2a971fd0c11de759a1be58bf9f5e35da2d1d3
-size 595090
diff --git a/createrepo_c-0.15.3.tar.gz b/createrepo_c-0.15.3.tar.gz
new file mode 100644
index 0000000..044f649
--- /dev/null
+++ b/createrepo_c-0.15.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a3ad8f29f45799e85a5a097dce5b6f08525984ef1dc6d19dcd07281d674efd5
+size 595144
diff --git a/createrepo_c.changes b/createrepo_c.changes
index 9f70759..9a83c94 100644
--- a/createrepo_c.changes
+++ b/createrepo_c.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Nov 29 12:42:37 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
+
+- Update to 0.15.3
+  + Export all changelog entries in compatibility mode
+  + Libmagic to follow symlinks (rh#1776399)
+  + Add shortcut to detect *.yaml files as not compressed
+- Ensure createrepo_c fully replaces createrepo on Tumbleweed
+- Remove old and now unused dependency on deltarpm as drpm is used now
+
 -------------------------------------------------------------------
 Mon Nov 25 13:39:11 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
 
diff --git a/createrepo_c.spec b/createrepo_c.spec
index 4dffc4b..8f7cbb5 100644
--- a/createrepo_c.spec
+++ b/createrepo_c.spec
@@ -41,6 +41,12 @@
 %bcond_with libmodulemd
 %endif
 
+%if 0%{?sle_version} && 0%{?sle_version} < 160000
+%bcond_with as_createrepo
+%else
+%bcond_without as_createrepo
+%endif
+
 %{!?make_build: %global make_build %{__make} %{?_smp_mflags}}
 
 %define major 0
@@ -48,7 +54,7 @@
 %define devname lib%{name}-devel
 
 Name:           createrepo_c
-Version:        0.15.2
+Version:        0.15.3
 Release:        0
 Summary:        RPM repository metadata generation utility
 License:        GPL-2.0-or-later
@@ -98,8 +104,15 @@ BuildRequires:  drpm-devel >= 0.4.0
 
 Requires:       %{libname} = %{version}-%{release}
 
+%if %{with as_createrepo}
+# Fully replaces createrepo
+Requires(pre):  update-alternatives
+Obsoletes:      createrepo < 0.11.0
+Provides:       createrepo = %{version}-%{release}
+%else
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
+%endif
 
 Provides:       createrepo-implementation
 
@@ -114,10 +127,7 @@ rpm packages and maintaining it.
 
 %package -n %{libname}
 Summary:        Library for repodata manipulation
-# The function to create DeltaRPMs calls /usr/bin/makedeltarpm,
-# which is part of the 'deltarpm' package
 Group:          System/Libraries
-Requires:       deltarpm
 
 %description -n %{libname}
 Libraries for applications using the createrepo_c library
@@ -172,6 +182,12 @@ sed -i -e '/HTML_TIMESTAMP/d' doc/Doxyfile.in.in
 %define __builddir build
 %cmake_install
 
+%if %{with as_createrepo}
+for i in createrepo mergerepo modifyrepo sqliterepo;do
+  ln -s %{_bindir}/$i\_c %{buildroot}%{_bindir}/$i
+  echo ".so man8/$i\_c.8" > %{buildroot}%{_mandir}/man1/$i\.8
+done
+%else
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for i in createrepo mergerepo modifyrepo sqliterepo;do
   ln -s %{_bindir}/$i\_c %{buildroot}%{_sysconfdir}/alternatives/$i
@@ -179,10 +195,17 @@ for i in createrepo mergerepo modifyrepo sqliterepo;do
   ln -s %{_mandir}/man8/$i\_c.8.gz %{buildroot}%{_sysconfdir}/alternatives/$i\.8.gz
   ln -s %{_sysconfdir}/alternatives/$i\.8.gz %{buildroot}%{_mandir}/man8/$i\.8.gz
 done
+%endif
 
 %fdupes %{buildroot}%{_prefix}
 %fdupes build/doc/html
 
+%if %{with as_createrepo}
+%pre
+if [ -e %{_sysconfdir}/alternatives/createrepo ]; then
+  update-alternatives --remove createrepo %{_bindir}/createrepo_c
+fi
+%else
 %post
 update-alternatives --install \
   %{_bindir}/createrepo createrepo %{_bindir}/createrepo_c  20 \
@@ -198,6 +221,7 @@ update-alternatives --install \
 if [ ! -f %{_bindir}/createrepo_c ]; then
   update-alternatives --remove createrepo %{_bindir}/createrepo_c
 fi
+%endif
 
 %post -n %{libname} -p /sbin/ldconfig
 %postun -n %{libname} -p /sbin/ldconfig
@@ -222,6 +246,7 @@ fi
 %{_bindir}/mergerepo
 %{_bindir}/modifyrepo
 %{_bindir}/sqliterepo
+%if ! %{with as_createrepo}
 %ghost %_sysconfdir/alternatives/createrepo
 %ghost %_sysconfdir/alternatives/mergerepo
 %ghost %_sysconfdir/alternatives/modifyrepo
@@ -230,6 +255,7 @@ fi
 %ghost %_sysconfdir/alternatives/mergerepo.8.gz
 %ghost %_sysconfdir/alternatives/modifyrepo.8.gz
 %ghost %_sysconfdir/alternatives/sqliterepo.8.gz
+%endif
 
 %files -n %{libname}
 %license COPYING