Update to 2.7.0
Drop libmodulemd1 subpackage which is now packaged separately Add support for 'buildroot' and 'srpm-buildroot' arguments to components Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher
parent
478cf914f5
commit
d99905d75c
1
.gitignore
vendored
1
.gitignore
vendored
@ -36,3 +36,4 @@
|
||||
/modulemd-2.4.0.tar.xz
|
||||
/modulemd-2.5.0.tar.xz
|
||||
/modulemd-2.6.0.tar.xz
|
||||
/modulemd-2.7.0.tar.xz
|
||||
|
||||
104
libmodulemd.spec
104
libmodulemd.spec
@ -1,6 +1,3 @@
|
||||
%global libmodulemd_version 2.6.0
|
||||
%global libmodulemd_v1_version 1.8.13
|
||||
|
||||
# Python 2 is dead on F31+
|
||||
%if ( 0%{?fedora} && 0%{?fedora} <= 30 ) || ( 0%{?rhel} && 0%{?rhel} <= 7)
|
||||
%global meson_override_flags -Dwith_py3_overrides=true -Dwith_py2_overrides=true
|
||||
@ -11,8 +8,8 @@
|
||||
%endif
|
||||
|
||||
Name: libmodulemd
|
||||
Version: %{libmodulemd_version}
|
||||
Release: 2%{?dist}
|
||||
Version: 2.7.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Module metadata manipulation library
|
||||
|
||||
License: MIT
|
||||
@ -37,10 +34,6 @@ BuildRequires: python3-gobject-base
|
||||
BuildRequires: valgrind
|
||||
%endif
|
||||
|
||||
# Make sure we upgrade libmodulemd1 to match
|
||||
Conflicts: libmodulemd1 < %{libmodulemd_v1_version}-%{release}
|
||||
|
||||
|
||||
# Patches
|
||||
|
||||
|
||||
@ -83,66 +76,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Development files for libmodulemd.
|
||||
|
||||
|
||||
%package -n libmodulemd1
|
||||
Summary: Compatibility package for libmodulemd 1.x
|
||||
Version: %{libmodulemd_v1_version}
|
||||
Obsoletes: libmodulemd < 2
|
||||
Provides: libmodulemd = %{libmodulemd_v1_version}-%{release}
|
||||
Provides: libmodulemd%{?_isa} = %{libmodulemd_v1_version}-%{release}
|
||||
|
||||
%description -n libmodulemd1
|
||||
Compatibility library for libmodulemd 1.x
|
||||
|
||||
|
||||
%package -n libmodulemd1-devel
|
||||
Summary: Compatibility development package for libmodulemd 1.x
|
||||
Version: %{libmodulemd_v1_version}
|
||||
Requires: libmodulemd1%{?_isa} = %{libmodulemd_v1_version}-%{release}
|
||||
Conflicts: %{name}-devel
|
||||
Obsoletes: libmodulemd-devel < 2
|
||||
Provides: libmodulemd-devel = %{libmodulemd_v1_version}-%{release}
|
||||
RemovePathPostfixes: .compat
|
||||
|
||||
|
||||
%description -n libmodulemd1-devel
|
||||
Development files for libmodulemd 1.x
|
||||
|
||||
|
||||
%if %{build_python2}
|
||||
%package -n python2-libmodulemd1
|
||||
Summary: Python 2 bindings for %{name}1
|
||||
Version: %{libmodulemd_v1_version}
|
||||
Requires: libmodulemd1 = %{libmodulemd_v1_version}-%{release}
|
||||
Requires: python-gobject-base
|
||||
|
||||
Obsoletes: python2-libmodulemd < 2
|
||||
Provides: python2-libmodulemd = %{libmodulemd_v1_version}-%{release}
|
||||
|
||||
|
||||
%description -n python2-libmodulemd1
|
||||
Python 2 bindings for libmodulemd1
|
||||
%endif
|
||||
|
||||
|
||||
%package -n python3-libmodulemd1
|
||||
Summary: Python 3 bindings for %{name}1
|
||||
Version: %{libmodulemd_v1_version}
|
||||
Requires: libmodulemd1 = %{libmodulemd_v1_version}-%{release}
|
||||
Requires: python3-gobject-base
|
||||
|
||||
Obsoletes: python3-libmodulemd < 2
|
||||
Provides: python3-libmodulemd = %{libmodulemd_v1_version}-%{release}
|
||||
|
||||
%description -n python3-libmodulemd1
|
||||
Python 3 bindings for libmodulemd1
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n modulemd-%{libmodulemd_version}
|
||||
%autosetup -p1 -n modulemd-%{version}
|
||||
|
||||
|
||||
%build
|
||||
%meson -Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true %{meson_override_flags}
|
||||
%meson -Ddeveloper_build=false %{meson_override_flags}
|
||||
%meson_build
|
||||
|
||||
|
||||
@ -169,9 +108,6 @@ export MMD_SKIP_VALGRIND=1
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
ln -s libmodulemd.so.%{libmodulemd_v1_version} \
|
||||
%{buildroot}%{_libdir}/%{name}.so.compat
|
||||
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
@ -203,34 +139,12 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \
|
||||
%{python3_sitearch}/gi/overrides/
|
||||
|
||||
|
||||
%if %{build_python2}
|
||||
%files -n python2-libmodulemd1
|
||||
%endif
|
||||
|
||||
|
||||
%files -n python3-libmodulemd1
|
||||
|
||||
|
||||
%files -n libmodulemd1
|
||||
%license COPYING
|
||||
%doc README.md
|
||||
%{_bindir}/modulemd-validator-v1
|
||||
%{_libdir}/%{name}.so.1*
|
||||
%dir %{_libdir}/girepository-1.0
|
||||
%{_libdir}/girepository-1.0/Modulemd-1.0.typelib
|
||||
|
||||
|
||||
%files -n libmodulemd1-devel
|
||||
%{_libdir}/%{name}.so.compat
|
||||
%{_libdir}/pkgconfig/modulemd.pc
|
||||
%{_includedir}/modulemd/
|
||||
%dir %{_datadir}/gir-1.0
|
||||
%{_datadir}/gir-1.0/Modulemd-1.0.gir
|
||||
%dir %{_datadir}/gtk-doc
|
||||
%dir %{_datadir}/gtk-doc/html
|
||||
%{_datadir}/gtk-doc/html/modulemd-1.0/
|
||||
|
||||
%changelog
|
||||
* Thu Aug 15 2019 Stephen Gallagher <sgallagh@redhat.com> - 2.7.0-1
|
||||
- Update to 2.7.0
|
||||
- Drop libmodulemd1 subpackage which is now packaged separately
|
||||
- Add support for 'buildroot' and 'srpm-buildroot' arguments to components
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (modulemd-2.6.0.tar.xz) = 70ff6cb8c4f4ee8619cae96fc62280460f32872b166bf4db87d80827149825cdb1aa9d9bdc85ef68d2caddb1f9569003e218523d0d1e7f59367e53046628e7fb
|
||||
SHA512 (modulemd-2.7.0.tar.xz) = 5872a7ca70e046a95f779e54cd6d78d994c7227561349fd6ec909dc5cae16eb0ae4aa59707398427aeeeb28d9d86d5977e54580ef2af8e64114cf6455643fd5a
|
||||
|
||||
Loading…
Reference in New Issue
Block a user