From c3920b3384b2d87167abfcabab1560f050cfea0a Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Wed, 1 Aug 2018 06:57:59 +0200 Subject: [PATCH] Update to 0.11.1. [spec] Fix ldconfig for rhel <= 7 --- .gitignore | 1 + ...ages-in-mergerepo_c-in-case-multiple.patch | 35 ------------------- createrepo_c.spec | 24 +++++++++---- sources | 2 +- 4 files changed, 19 insertions(+), 43 deletions(-) delete mode 100644 0001-Fix-missing-packages-in-mergerepo_c-in-case-multiple.patch diff --git a/.gitignore b/.gitignore index 164c639..5217757 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /createrepo_c-7a74bb7.tar.xz /createrepo_c-0.10.0.tar.gz /createrepo_c-0.11.0.tar.gz +/createrepo_c-0.11.1.tar.gz diff --git a/0001-Fix-missing-packages-in-mergerepo_c-in-case-multiple.patch b/0001-Fix-missing-packages-in-mergerepo_c-in-case-multiple.patch deleted file mode 100644 index 1944397..0000000 --- a/0001-Fix-missing-packages-in-mergerepo_c-in-case-multiple.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a7d4e4a8263e0da53959b49803f5b2dd249e3c69 Mon Sep 17 00:00:00 2001 -From: Jan Kaluza -Date: Wed, 25 Jul 2018 15:05:11 +0200 -Subject: [PATCH] Fix missing packages in mergerepo_c in case multiple VR - exists for single pkg in repo. - ---- - src/mergerepo_c.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/mergerepo_c.c b/src/mergerepo_c.c -index 94b929c..ad20a84 100644 ---- a/src/mergerepo_c.c -+++ b/src/mergerepo_c.c -@@ -471,7 +471,7 @@ new_merged_metadata_hashtable() - { - GHashTable *hashtable = g_hash_table_new_full(g_str_hash, - g_str_equal, -- NULL, -+ g_free, - free_merged_values); - return hashtable; - } -@@ -824,7 +824,7 @@ add_package(cr_Package *pkg, - repopath_with_protocol = prepend_protocol(repopath); - pkg->location_base = cr_safe_string_chunk_insert(pkg->chunk, repopath_with_protocol); - } -- g_hash_table_insert (merged, (gpointer) pkg->name, (gpointer) list); -+ g_hash_table_insert (merged, (gpointer) g_strdup(pkg->name), (gpointer) list); - return 1; - } - --- -2.18.0 - diff --git a/createrepo_c.spec b/createrepo_c.spec index 58297bc..32cb46b 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -21,15 +21,12 @@ Summary: Creates a common metadata repository Name: createrepo_c -Version: 0.11.0 -Release: 4%{?dist} +Version: 0.11.1 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/rpm-software-management/createrepo_c Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# https://github.com/rpm-software-management/createrepo_c/pull/100 -Patch0001: 0001-Fix-missing-packages-in-mergerepo_c-in-case-multiple.patch - BuildRequires: cmake BuildRequires: gcc BuildRequires: bzip2-devel @@ -118,7 +115,7 @@ mkdir build-py3 # Build createrepo_c with Python 2 %if %{with python2} pushd build-py2 - %cmake ../ + %cmake .. -DPYTHON_DESIRED:str=2 make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" %if %{without python3} # Build C documentation @@ -130,7 +127,7 @@ popd # Build createrepo_c with Pyhon 3 %if %{with python3} pushd build-py3 - %cmake ../ -DPYTHON_DESIRED:str=3 + %cmake .. -DPYTHON_DESIRED:str=3 make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" # Build C documentation make doc-c @@ -180,7 +177,12 @@ ln -sr %{buildroot}%{_bindir}/createrepo_c %{buildroot}%{_bindir}/createrepo ln -sr %{buildroot}%{_bindir}/mergerepo_c %{buildroot}%{_bindir}/mergerepo ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo +%if 0%{?rhel} && 0%{?rhel} <= 7 +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig +%else %ldconfig_scriptlets libs +%endif %files %doc README.md @@ -222,6 +224,14 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo %endif %changelog +* Tue Jul 31 2018 Daniel Mach - 0.11.1-1 +- [spec] Fix ldconfig for rhel <= 7 +- Fix "CR_DELTA_RPM_SUPPORT" redefined warnings +- Set to build against Python 3 by default +- Update README +- Add mergerepo_c --repo-prefix-search and --repo-prefix-replace. +- Fix missing packages in mergerepo_c in case multiple VR exists for single pkg in repo. + * Wed Jul 25 2018 Igor Gnatenko - 0.11.0-4 - Backport patch for multiple packages with same name for mergerepo_c diff --git a/sources b/sources index eb86d1e..0338e6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (createrepo_c-0.11.0.tar.gz) = b03b218695a0b3e204f601698be6f61f476a790f5602da52e73de89ab0d7754814b8627fd298b66474474bd47e14bbaf3f2cab4c6546dd9966ea6e1f9afd191c +SHA512 (createrepo_c-0.11.1.tar.gz) = b07b656a625c4637f521b6bcff1d4eb22df930b9033824dd7ccbd6e7eea66aa4df4c52cc84bc32391d20013bb3c06c02afcb8801c676af5ad860992197681e7a