From c05932c440475db88444e5478efb35b33f96c389 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Nov 16 2016 11:08:58 +0000 Subject: Various fixups for specs * Remove unnecessary Qt4 Requires * Making Requires fully qualified * Making Provides fully qualified * Fixing my own email address in the changelogs --- diff --git a/libyui-bindings/libyui-bindings.spec b/libyui-bindings/libyui-bindings.spec index da8a395..b558ac4 100644 --- a/libyui-bindings/libyui-bindings.spec +++ b/libyui-bindings/libyui-bindings.spec @@ -20,7 +20,7 @@ Name: %{libname}-bindings Version: 1.1.1 -Release: 6%{?libyui_mga:.2.libyui_mga}%{?dist} +Release: 6%{?libyui_mga:.3.libyui_mga}%{?dist} Summary: Language bindings for %{libname} License: LGPLv2 or LGPLv3 @@ -58,7 +58,8 @@ BuildRequires: mono-devel >= 4.0.0 BuildRequires: mono-devel %endif # 0%%{?fedora} >= 23 -%{?libyui_mga:Provides: mono-yui-mga} +%{?libyui_mga:Provides: mono-yui-mga = %{version}-%{release}} +%{?libyui_mga:Provides: mono-yui-mga%{?_isa} = %{version}-%{release}} %description -n mono-%{libsuffix} This package provides Mono / CSharp language bindings to access @@ -76,7 +77,8 @@ BuildRequires: perl-devel BuildRequires: perl-generators Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -%{?libyui_mga:Provides: perl-yui-mga} +%{?libyui_mga:Provides: perl-yui-mga = %{version}-%{release}} +%{?libyui_mga:Provides: perl-yui-mga%{?_isa} = %{version}-%{release}} %description -n perl-%{libsuffix} This package provides Perl language bindings to access @@ -95,7 +97,10 @@ Provides: python-%{libsuffix}%{?_isa} == %{version}-%{release} Obsoletes: python-%{libsuffix} <= 1.1.1-2 Obsoletes: python-%{libsuffix}%{?_isa} <= 1.1.1-2 -%{?libyui_mga:Provides: python2-yui-mga python-yui-mga} +%{?libyui_mga:Provides: python2-yui-mga = %{version}-%{release}} +%{?libyui_mga:Provides: python2-yui-mga%{?_isa} = %{version}-%{release}} +%{?libyui_mga:Provides: python-yui-mga = %{version}-%{release}} +%{?libyui_mga:Provides: python-yui-mga%{?_isa} = %{version}-%{release}} %description -n python2-%{libsuffix} This package provides Python language bindings to access @@ -110,7 +115,8 @@ interfaces (ncurses). Summary: Python3 bindings for %{libname} BuildRequires: python3-devel -%{?libyui_mga:Provides: python3-yui-mga} +%{?libyui_mga:Provides: python3-yui-mga = %{version}-%{release}} +%{?libyui_mga:Provides: python3-yui-mga%{?_isa} = %{version}-%{release}} %description -n python3-%{libsuffix} This package provides Python3 language bindings to access @@ -136,7 +142,8 @@ Requires: ruby(abi) == 1.9.1 %endif #(0%{?fedora} && 0%{?fedora} <= 16) || (0%{?rhel} >= 4 && 0%{?rhel} <= 6) %endif #0%{?fedora} >= 19 || 0%{?rhel} >= 7 -%{?libyui_mga:Provides: ruby-yui-mga} +%{?libyui_mga:Provides: ruby-yui-mga = %{version}-%{release}} +%{?libyui_mga:Provides: ruby-yui-mga%{?_isa} = %{version}-%{release}} %description -n ruby-%{libsuffix} This package provides Ruby language bindings to access @@ -203,7 +210,7 @@ pushd py3-%{_cmake_build_subdir} -DWITH_RUBY=OFF \ .. -%{__make} %{?_smp_mflags} +%make_build popd popd %endif #0%{?with_py3} @@ -257,6 +264,9 @@ popd %changelog +* Wed Nov 16 2016 Neal Gompa - 1.1.1-6.3.libyui-mga +- Make the -yui-mga Provides fully qualified (full VRA) + * Tue Nov 15 2016 Kevin Kofler - 1.1.1-6.2.libyui-mga - add -yui-mga Provides so that packages can Require the mga-enabled bindings diff --git a/libyui-mga-gtk/libyui-mga-gtk.spec b/libyui-mga-gtk/libyui-mga-gtk.spec index c5b9235..bc633bf 100644 --- a/libyui-mga-gtk/libyui-mga-gtk.spec +++ b/libyui-mga-gtk/libyui-mga-gtk.spec @@ -86,5 +86,5 @@ find "%{buildroot}" -name "*.la" -delete - Use %%global instead of %%define - Get tarball from Bitbucket -* Thu Apr 7 2016 Neal Gompa - 1.0.2-0.1 +* Thu Apr 7 2016 Neal Gompa - 1.0.2-0.1 - Initial package based on Mageia package diff --git a/libyui-mga-ncurses/libyui-mga-ncurses.spec b/libyui-mga-ncurses/libyui-mga-ncurses.spec index d2a386d..7761abc 100644 --- a/libyui-mga-ncurses/libyui-mga-ncurses.spec +++ b/libyui-mga-ncurses/libyui-mga-ncurses.spec @@ -93,6 +93,6 @@ find "%{buildroot}" -name "*.la" -delete - Use %%global instead of %%define - Get tarball from Bitbucket -* Thu Apr 7 2016 Neal Gompa 1.0.2-0.1 +* Thu Apr 7 2016 Neal Gompa - 1.0.2-0.1 - Initial package based on Mageia package diff --git a/libyui-mga-qt/libyui-mga-qt.spec b/libyui-mga-qt/libyui-mga-qt.spec index c147a74..f6d9fc7 100644 --- a/libyui-mga-qt/libyui-mga-qt.spec +++ b/libyui-mga-qt/libyui-mga-qt.spec @@ -5,7 +5,7 @@ Name: libyui-mga-qt Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: UI abstraction library - Qt plugin License: LGPLv2+ @@ -46,7 +46,7 @@ dynamically linked with libyui-mga-qt. %package devel Summary: %{summary} header files Requires: libyui-devel -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -85,6 +85,9 @@ find "%{buildroot}" -name "*.la" -delete %changelog +* Wed Nov 16 2016 Neal Gompa - 1.0.3-2 +- Make Requires archful on devel subpackage + * Tue Nov 15 2016 Kevin Kofler - 1.0.3-1 - Update URL (remove .git suffix) - Use %%global instead of %%define diff --git a/libyui-mga/libyui-mga.spec b/libyui-mga/libyui-mga.spec index a412e6d..370b46e 100644 --- a/libyui-mga/libyui-mga.spec +++ b/libyui-mga/libyui-mga.spec @@ -7,7 +7,7 @@ Name: libyui-mga Version: 1.0.7 -Release: 1.%{snapdate}git%(echo %{githash} | cut -c -13)%{?dist} +Release: 2.%{snapdate}git%(echo %{githash} | cut -c -13)%{?dist} Summary: UI abstraction library - Mageia extension widget base plugin License: LGPLv2+ @@ -16,14 +16,12 @@ Source0: %{url}/get/%{githash}.tar.bz2 BuildRequires: libpng-devel BuildRequires: libyui-devel -BuildRequires: qt4-devel BuildRequires: cmake BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: ghostscript BuildRequires: graphviz -Requires: libyui%{?_isa} -Requires: python-qt4 +Requires: libyui%{?_isa} >= %{libyui_ver} %description This package contains the library needed to run programs @@ -42,8 +40,8 @@ dynamically linked with libyui-mga. %package devel Summary: %{summary} header files -Requires: libyui-devel >= %{libyui_ver} -Requires: %{name} = %{version}-%{release} +Requires: libyui-devel%{?_isa} >= %{libyui_ver} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -83,10 +81,15 @@ find "%{buildroot}" -name "*.la" -delete %changelog +* Wed Nov 16 2016 Neal Gompa - 1.0.7-2.20160313gita6a160e6e2387 +- Remove unnecessary Qt4 dependencies +- Strengthen Requires for devel subpackage to include arch information +- Versioned the libyui Requires + * Tue Nov 15 2016 Kevin Kofler - 1.0.7-1.20160313gita6a160e6e2387 - Change URL to Bitbucket - Use %%global instead of %%define - Update to post-1.0.7 snapshot a6a160e6e2387e63735228dee818e4b448e2a933 -* Wed Apr 06 2016 Neal Gompa - 1.0.7-0.1 +* Wed Apr 06 2016 Neal Gompa - 1.0.7-0.1 - Build for Fedora based on Mageia package