From 2a96109bb3f01c7f25a2db60c00a24af4cbf33e1 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 3 May 2019 08:53:00 -0400 Subject: [PATCH] Maintain both specfile names for merges --- libmodulemd.spec | 134 +++++++++++++++++++++++++++++++++++++++++++++ libmodulemd1.spec | 135 +--------------------------------------------- 2 files changed, 135 insertions(+), 134 deletions(-) create mode 100644 libmodulemd.spec mode change 100644 => 120000 libmodulemd1.spec diff --git a/libmodulemd.spec b/libmodulemd.spec new file mode 100644 index 0000000..74eb594 --- /dev/null +++ b/libmodulemd.spec @@ -0,0 +1,134 @@ +%global libmodulemd_version 2.2.2 +%global libmodulemd_v1_version 1.8.5 + +Name: libmodulemd1 +Version: %{libmodulemd_v1_version} +Release: 1%{?dist} +Summary: Module metadata manipulation library + +License: MIT +URL: https://github.com/fedora-modularity/libmodulemd +Source0: %{url}/releases/download/libmodulemd-%{libmodulemd_version}/modulemd-%{libmodulemd_version}.tar.xz + +BuildRequires: meson >= 0.47 +BuildRequires: pkgconfig +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(yaml-0.1) +BuildRequires: pkgconfig(gtk-doc) +BuildRequires: python36-devel +BuildRequires: python36-gobject-base +%ifarch %{valgrind_arches} +BuildRequires: valgrind +%endif + +Obsoletes: libmodulemd < 2 +Provides: libmodulemd = %{version}-%{release} +Provides: libmodulemd%{?_isa} = %{version}-%{release} + +# Patches + +%description +C Library for manipulating module metadata files. +See https://github.com/fedora-modularity/libmodulemd/blob/master/README.md for +more details. + + +%package -n python2-%{name} +Summary: Python 2 bindings for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python-gobject-base +Obsoletes: python2-modulemd < 1.3.4 + +%description -n python2-%{name} +Python 2 bindings for %{name} + + +%package -n python36-%{name} +Summary: Python 3.6 bindings for %{name} +BuildArch: noarch +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python36-gobject-base +Obsoletes: python3-modulemd < 1.3.4 + +%description -n python36-%{name} +Python 3.6 bindings for %{name} + + +%package devel +Summary: Development files for libmodulemd +Requires: %{name}%{?_isa} = %{version}-%{release} +Conflicts: libmodulemd-devel + +%description devel +Development files for libmodulemd. + + +%prep +%autosetup -p1 -n modulemd-%{libmodulemd_version} + + +%build +%meson -Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=false -Dwith_py2_overrides=false -Dwith_py3_overrides=false +%meson_build + + +%check + +export LC_CTYPE=C.utf8 + +%ifarch %{power64} s390x +# Valgrind is broken on ppc64[le] with GCC7: +# https://bugs.kde.org/show_bug.cgi?id=386945 +export MMD_SKIP_VALGRIND=1 +%endif +%ifnarch %{valgrind_arches} +export MMD_SKIP_VALGRIND=1 +%endif + +# Don't run tests on armv7 for now. There are problems with +# performance on the builders and often these time out. +%ifnarch %{arm} +%meson_test +%endif + + +%install +%meson_install + + +%files +%license COPYING +%doc README.md +%{_bindir}/modulemd-validator-v1 +%{_libdir}/libmodulemd.so.1* +%dir %{_libdir}/girepository-1.0 +%{_libdir}/girepository-1.0/Modulemd-1.0.typelib + + +%files devel +%{_libdir}/libmodulemd.so +%{_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/ + + +%files -n python36-%{name} + + +%files -n python2-%{name} + + +%changelog +* Wed Mar 27 2019 Stephen Gallagher - 1.8.5-1 +- Update to libmodulemd 1.8.5 with proper python 2 support + +* Wed Mar 27 2019 Stephen Gallagher - 1.8.4-1 +- Release libmodulemd1 1.8.4 for COPR on EPEL 7 + diff --git a/libmodulemd1.spec b/libmodulemd1.spec deleted file mode 100644 index 74eb594..0000000 --- a/libmodulemd1.spec +++ /dev/null @@ -1,134 +0,0 @@ -%global libmodulemd_version 2.2.2 -%global libmodulemd_v1_version 1.8.5 - -Name: libmodulemd1 -Version: %{libmodulemd_v1_version} -Release: 1%{?dist} -Summary: Module metadata manipulation library - -License: MIT -URL: https://github.com/fedora-modularity/libmodulemd -Source0: %{url}/releases/download/libmodulemd-%{libmodulemd_version}/modulemd-%{libmodulemd_version}.tar.xz - -BuildRequires: meson >= 0.47 -BuildRequires: pkgconfig -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(yaml-0.1) -BuildRequires: pkgconfig(gtk-doc) -BuildRequires: python36-devel -BuildRequires: python36-gobject-base -%ifarch %{valgrind_arches} -BuildRequires: valgrind -%endif - -Obsoletes: libmodulemd < 2 -Provides: libmodulemd = %{version}-%{release} -Provides: libmodulemd%{?_isa} = %{version}-%{release} - -# Patches - -%description -C Library for manipulating module metadata files. -See https://github.com/fedora-modularity/libmodulemd/blob/master/README.md for -more details. - - -%package -n python2-%{name} -Summary: Python 2 bindings for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python-gobject-base -Obsoletes: python2-modulemd < 1.3.4 - -%description -n python2-%{name} -Python 2 bindings for %{name} - - -%package -n python36-%{name} -Summary: Python 3.6 bindings for %{name} -BuildArch: noarch -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python36-gobject-base -Obsoletes: python3-modulemd < 1.3.4 - -%description -n python36-%{name} -Python 3.6 bindings for %{name} - - -%package devel -Summary: Development files for libmodulemd -Requires: %{name}%{?_isa} = %{version}-%{release} -Conflicts: libmodulemd-devel - -%description devel -Development files for libmodulemd. - - -%prep -%autosetup -p1 -n modulemd-%{libmodulemd_version} - - -%build -%meson -Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=false -Dwith_py2_overrides=false -Dwith_py3_overrides=false -%meson_build - - -%check - -export LC_CTYPE=C.utf8 - -%ifarch %{power64} s390x -# Valgrind is broken on ppc64[le] with GCC7: -# https://bugs.kde.org/show_bug.cgi?id=386945 -export MMD_SKIP_VALGRIND=1 -%endif -%ifnarch %{valgrind_arches} -export MMD_SKIP_VALGRIND=1 -%endif - -# Don't run tests on armv7 for now. There are problems with -# performance on the builders and often these time out. -%ifnarch %{arm} -%meson_test -%endif - - -%install -%meson_install - - -%files -%license COPYING -%doc README.md -%{_bindir}/modulemd-validator-v1 -%{_libdir}/libmodulemd.so.1* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/Modulemd-1.0.typelib - - -%files devel -%{_libdir}/libmodulemd.so -%{_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/ - - -%files -n python36-%{name} - - -%files -n python2-%{name} - - -%changelog -* Wed Mar 27 2019 Stephen Gallagher - 1.8.5-1 -- Update to libmodulemd 1.8.5 with proper python 2 support - -* Wed Mar 27 2019 Stephen Gallagher - 1.8.4-1 -- Release libmodulemd1 1.8.4 for COPR on EPEL 7 - diff --git a/libmodulemd1.spec b/libmodulemd1.spec new file mode 120000 index 0000000..7f4a763 --- /dev/null +++ b/libmodulemd1.spec @@ -0,0 +1 @@ +libmodulemd.spec \ No newline at end of file