diff --git a/.gitignore b/.gitignore index ccc15eb..bd0b26e 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /subscription-manager-1.16.2.tar.gz /subscription-manager-1.16.3.tar.gz /subscription-manager-1.16.4.tar.gz +/subscription-manager-1.16.6.tar.gz diff --git a/sources b/sources index 270f50f..ed45311 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a54894d40648889c2768cdafc6cb740 subscription-manager-1.16.4.tar.gz +e31ab3b4f0ddad1452b771377eb3f7e2 subscription-manager-1.16.6.tar.gz diff --git a/subscription-manager.spec b/subscription-manager.spec index 6d3a8c8..bd0cc69 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -20,6 +20,9 @@ %global use_firstboot 1 %endif +%global use_dnf (0%{?fedora} && 0%{?fedora} >= 22) + + %global _hardened_build 1 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now} @@ -47,8 +50,18 @@ %define post_boot_tool INSTALL_INITIAL_SETUP=false INSTALL_FIRSTBOOT=true %endif +# makefile defaults to INSTALL_YUM_PLUGIN=true +%define install_yum_plugins INSTALL_YUM_PLUGINS=true + +# makefile defaults to INSTALL_DNF_PLUGIN=false +%if %{use_dnf} +%define install_dnf_plugins INSTALL_DNF_PLUGINS=true +%else +%define install_dnf_plugins INSTALL_DNF_PLUGINS=false +%endif + Name: subscription-manager -Version: 1.16.4 +Version: 1.16.6 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -232,15 +245,31 @@ Requires: subscription-manager-migration-data This package contains scripts that aid in moving to certificate based subscriptions +%if %use_dnf +%package -n dnf-plugin-subscription-manager +Summary: Subscription Manager plugins for DNF +Group: System Environment/Base +Requires: %{name} = %{version}-%{release} +Requires: dnf >= 1.0.0 + +%description -n dnf-plugin-subscription-manager +Subscription Manager plugins for DNF, contains subscription-manager and product-id plugins. +%endif + %prep %setup -q %build -make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" %{?gtk_version} +make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ + LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" %{?gtk_version} %install rm -rf %{buildroot} -make -f Makefile install VERSION=%{version}-%{release} PREFIX=%{buildroot} MANPATH=%{_mandir} OS_VERSION=%{?fedora}%{?rhel} OS_DIST=%{dist} %{?gtk_version} %{?install_ostree} %{?post_boot_tool} +make -f Makefile install VERSION=%{version}-%{release} \ + PREFIX=%{buildroot} MANPATH=%{_mandir} PYTHON_SITELIB=%{python_sitelib} \ + OS_VERSION=%{?fedora}%{?rhel} OS_DIST=%{dist} \ + %{?install_ostree} %{?post_boot_tool} %{?gtk_version} \ + %{?install_yum_plugins} %{?install_dnf_plugins} desktop-file-validate \ %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop @@ -503,6 +532,12 @@ rm -rf %{buildroot} %doc README.Fedora %endif +%if %use_dnf +%files -n dnf-plugin-subscription-manager +%defattr(-,root,root,-) +%{python_sitelib}/dnf-plugins/* +%endif + %post %if %use_systemd /bin/systemctl enable rhsmcertd.service >/dev/null 2>&1 || : @@ -542,6 +577,17 @@ fi %endif %changelog +* Fri Dec 04 2015 Alex Wood 1.16.6-1 +- 1285004: Adds check for access to the required manager capabilty + (csnyder@redhat.com) +- 1278472: Change default registration url to subscription.rhsm.redhat.com + (wpoteat@redhat.com) +- 1275179: Do not allow quantity with auto attach (wpoteat@redhat.com) +- 976859: Only check server version if asked. (alikins@redhat.com) +- 1195003: Subscription manager man page mention of wild cards for repo enable + (wpoteat@redhat.com) +- Use the stock 'close' button for close button. (alikins@redhat.com) + * Thu Oct 15 2015 Alex Wood 1.16.4-1 - 1264964: Ignore uuid=None on package sync (alikins@redhat.com) - Set register-status in RegisterInfo init. (alikins@redhat.com)