Skip to content

Commit d218215

Browse files
committed
createrepo_c: bump version after rpm upgrade
Change-Id: I5670de37140a6aab509022d5035127262148eb72 Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com> Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/22332 Tested-by: gerrit-photon <photon-checkins@vmware.com>
1 parent 6a356b6 commit d218215

1 file changed

Lines changed: 30 additions & 19 deletions

File tree

SPECS/createrepo_c/createrepo_c.spec

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
Summary: Creates a common metadata repository
22
Name: createrepo_c
33
Version: 0.20.1
4-
Release: 6%{?dist}
4+
Release: 7%{?dist}
55
License: GPLv2+
66
Group: System Environment/Base
77
Vendor: VMware, Inc.
88
Distribution: Photon
99
URL: https://github.com/rpm-software-management/createrepo_c
1010

11-
Source0: https://github.com/rpm-software-management/createrepo_c/archive/refs/tags/%{name}-%{version}.tar.gz
12-
%define sha512 %{name}=54a2cc7c7cd3f3b9a0c23cd8c136ae1331e7fa7cc995189088e7e6f2276c78b2b84e21c2a2b93f4528b5e9e4018dd6525262c8aaba3bc8a1412a51dfafd101f7
11+
Source0: https://github.com/rpm-software-management/createrepo_c/archive/refs/tags/%{name}-%{version}.tar.gz
12+
%define sha512 %{name}=54a2cc7c7cd3f3b9a0c23cd8c136ae1331e7fa7cc995189088e7e6f2276c78b2b84e21c2a2b93f4528b5e9e4018dd6525262c8aaba3bc8a1412a51dfafd101f7
1313

1414
BuildRequires: bzip2-devel
1515
BuildRequires: cmake
1616
BuildRequires: curl-devel
17-
BuildRequires: expat-devel
1817
BuildRequires: file-devel
1918
BuildRequires: glib-devel
2019
BuildRequires: libffi-devel
@@ -25,12 +24,23 @@ BuildRequires: sqlite-devel
2524
BuildRequires: python3-devel
2625
BuildRequires: drpm-devel
2726
BuildRequires: zchunk-devel
28-
%if 0%{?with_check}
29-
BuildRequires: libxml2
30-
%endif
27+
BuildRequires: rpm-devel
28+
BuildRequires: zlib-devel
3129

30+
Requires: zlib
3231
Requires: drpm
3332
Requires: zchunk-libs
33+
Requires: rpm-libs
34+
Requires: curl-libs
35+
Requires: openssl-libs
36+
Requires: xz-libs
37+
Requires: file-libs
38+
Requires: sqlite-libs
39+
Requires: zchunk-libs
40+
Requires: bzip2-libs
41+
Requires: glib
42+
Requires: popt
43+
Requires: libxml2
3444

3545
Obsoletes: createrepo
3646

@@ -48,30 +58,29 @@ Requires: glib-devel
4858
Requires: sqlite-devel
4959
Requires: libxml2-devel
5060

61+
Provides: createrepo-devel
62+
5163
%description devel
5264
headers and libraries for createrepo_c
5365

5466
%prep
5567
%autosetup -p1
56-
sed -e '/find_package(GTHREAD2/ s/^#*/#/' -i CMakeLists.txt
57-
sed -i 's|g_thread_init|//g_thread_init|' src/createrepo_c.c
58-
sed -i 's|g_thread_init|//g_thread_init|' src/mergerepo_c.c
59-
sed -i 's|g_thread_init|//g_thread_init|' src/modifyrepo_c.c
60-
sed -i 's|g_thread_init|//g_thread_init|' src/sqliterepo_c.c
6168

6269
%build
63-
%cmake \
70+
%{cmake} \
6471
-DWITH_LIBMODULEMD=OFF \
6572
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
66-
-DCMAKE_BUILD_TYPE=Debug
73+
-DCMAKE_BUILD_TYPE=RelWithDebInfo
6774

68-
%cmake_build
75+
%{cmake_build}
6976

7077
%install
71-
%cmake_install
72-
ln -sfv createrepo_c %{buildroot}%{_bindir}/createrepo
73-
ln -sfv mergerepo_c %{buildroot}%{_bindir}/mergerepo
74-
ln -sfv modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
78+
%{cmake_install}
79+
pushd %{buildroot}%{_bindir}
80+
for b in createrepo mergerepo modifyrepo; do
81+
test -e ${b}_c && ln -srv ${b}_c ${b} || exit 1
82+
done
83+
popd
7584

7685
%clean
7786
rm -rf %{buildroot}
@@ -90,6 +99,8 @@ rm -rf %{buildroot}
9099
%{_libdir}/pkgconfig/%{name}.pc
91100

92101
%changelog
102+
* Thu Nov 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.20.1-7
103+
- Bump version as a part of rpm upgrade
93104
* Mon Sep 04 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.20.1-6
94105
- Fix devel package requires
95106
* Wed Apr 19 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 0.20.1-5

0 commit comments

Comments
 (0)