SHA256
1
0
forked from pool/createrepo_c

- 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
This commit is contained in:
Neal Gompa 2019-11-29 12:48:56 +00:00 committed by Git OBS Bridge
parent 606f5b7896
commit a163c167e6
4 changed files with 43 additions and 7 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:352b6fe91733b2d1610cdf18c6c2a971fd0c11de759a1be58bf9f5e35da2d1d3
size 595090

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a3ad8f29f45799e85a5a097dce5b6f08525984ef1dc6d19dcd07281d674efd5
size 595144

View File

@ -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> Mon Nov 25 13:39:11 UTC 2019 - Neal Gompa <ngompa13@gmail.com>

View File

@ -41,6 +41,12 @@
%bcond_with libmodulemd %bcond_with libmodulemd
%endif %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}} %{!?make_build: %global make_build %{__make} %{?_smp_mflags}}
%define major 0 %define major 0
@ -48,7 +54,7 @@
%define devname lib%{name}-devel %define devname lib%{name}-devel
Name: createrepo_c Name: createrepo_c
Version: 0.15.2 Version: 0.15.3
Release: 0 Release: 0
Summary: RPM repository metadata generation utility Summary: RPM repository metadata generation utility
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -98,8 +104,15 @@ BuildRequires: drpm-devel >= 0.4.0
Requires: %{libname} = %{version}-%{release} 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(post): update-alternatives
Requires(postun): update-alternatives Requires(postun): update-alternatives
%endif
Provides: createrepo-implementation Provides: createrepo-implementation
@ -114,10 +127,7 @@ rpm packages and maintaining it.
%package -n %{libname} %package -n %{libname}
Summary: Library for repodata manipulation Summary: Library for repodata manipulation
# The function to create DeltaRPMs calls /usr/bin/makedeltarpm,
# which is part of the 'deltarpm' package
Group: System/Libraries Group: System/Libraries
Requires: deltarpm
%description -n %{libname} %description -n %{libname}
Libraries for applications using the createrepo_c library 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 %define __builddir build
%cmake_install %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 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
for i in createrepo mergerepo modifyrepo sqliterepo;do for i in createrepo mergerepo modifyrepo sqliterepo;do
ln -s %{_bindir}/$i\_c %{buildroot}%{_sysconfdir}/alternatives/$i 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 %{_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 ln -s %{_sysconfdir}/alternatives/$i\.8.gz %{buildroot}%{_mandir}/man8/$i\.8.gz
done done
%endif
%fdupes %{buildroot}%{_prefix} %fdupes %{buildroot}%{_prefix}
%fdupes build/doc/html %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 %post
update-alternatives --install \ update-alternatives --install \
%{_bindir}/createrepo createrepo %{_bindir}/createrepo_c 20 \ %{_bindir}/createrepo createrepo %{_bindir}/createrepo_c 20 \
@ -198,6 +221,7 @@ update-alternatives --install \
if [ ! -f %{_bindir}/createrepo_c ]; then if [ ! -f %{_bindir}/createrepo_c ]; then
update-alternatives --remove createrepo %{_bindir}/createrepo_c update-alternatives --remove createrepo %{_bindir}/createrepo_c
fi fi
%endif
%post -n %{libname} -p /sbin/ldconfig %post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig
@ -222,6 +246,7 @@ fi
%{_bindir}/mergerepo %{_bindir}/mergerepo
%{_bindir}/modifyrepo %{_bindir}/modifyrepo
%{_bindir}/sqliterepo %{_bindir}/sqliterepo
%if ! %{with as_createrepo}
%ghost %_sysconfdir/alternatives/createrepo %ghost %_sysconfdir/alternatives/createrepo
%ghost %_sysconfdir/alternatives/mergerepo %ghost %_sysconfdir/alternatives/mergerepo
%ghost %_sysconfdir/alternatives/modifyrepo %ghost %_sysconfdir/alternatives/modifyrepo
@ -230,6 +255,7 @@ fi
%ghost %_sysconfdir/alternatives/mergerepo.8.gz %ghost %_sysconfdir/alternatives/mergerepo.8.gz
%ghost %_sysconfdir/alternatives/modifyrepo.8.gz %ghost %_sysconfdir/alternatives/modifyrepo.8.gz
%ghost %_sysconfdir/alternatives/sqliterepo.8.gz %ghost %_sysconfdir/alternatives/sqliterepo.8.gz
%endif
%files -n %{libname} %files -n %{libname}
%license COPYING %license COPYING