Auto sync2gitlab import of subscription-manager-1.28.28-1.el8.src.rpm

sources

@@ -1,2 +1,2 @@
-SHA512 (subscription-manager-1.28.31.tar.gz) = 6c9d1728d38582845385f48e9c2eb6b96739982a63c754b0a6a25dfe5f11b2b0705271de17bb06de483d49133ee8c64dc1ba11b07437dc0bd3481bbd9b55638f
+SHA512 (subscription-manager-1.28.28.tar.gz) = 7ab9fdd129687e21fa9da69f45059dc61c7d49e717bf84916a2db47172173e79f4b305abc585e9375559a0722aeb1d530679a5d6fd3ce3e34affb80e71e8d2a5
-SHA512 (subscription-manager-cockpit-1.28.31.tar.gz) = 7682cab515a848f5510cb64b28639e17e84b454aeb32b79b41111f32c044f1416f1adaa6e2ee4bb08d0a979cff407bfbfd25cc0827eaafd1c81723d59b6c3d9d
+SHA512 (subscription-manager-cockpit-1.28.28.tar.gz) = bdd49b85fdd701ea6f8f642f9d1ac6271fdcc96fdbc5f910203d93abc546b52a3fc5ddec613a604b869d0d165d8ef35c4fe835900329a572a423044d1966cbab

subscription-manager.spec

@@ -123,6 +123,8 @@
 %global rhsm_package_name subscription-manager-rhsm
 %endif
 
+%global include_syspurpose 1
+
 %global _hardened_build 1
 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now}
 
@@ -200,6 +202,8 @@
 %global with_cockpit WITH_COCKPIT=false
 %endif
 
+%global subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}"
+
 # Build a list of python package to exclude from the build.
 # This is necessary because we have multiple rpms which may or may not
 # need to be built depending on the distro which are all in one source tree.
@@ -244,7 +248,7 @@
 %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk}
 
 Name: subscription-manager
-Version: 1.28.31
+Version: 1.28.28
 Release: 1%{?dist}
 Summary: Tools and libraries for subscription and repository management
 %if 0%{?suse_version}
@@ -635,7 +639,7 @@ Requires: %{py_package_prefix}-dateutil
 Requires: %{py_package_prefix}-iniparse
 # rpm-python is an old name for python2-rpm but RHEL6 uses the old name
 Requires: %{py_package_prefix}-six
-Requires: subscription-manager-rhsm-certificates
+Requires: subscription-manager-rhsm-certificates = %{version}-%{release}
 # Required by Fedora packaging guidelines
 %{?python_provide:%python_provide %{py_package_prefix}-rhsm}
 %if %{with python3}
@@ -675,7 +679,7 @@ Requires: %{py2_package_prefix}-dateutil
 Requires: %{py2_package_prefix}-iniparse
 # rpm-python is an old name for python2-rpm but RHEL6 uses the old name
 Requires: %{py2_package_prefix}-six
-Requires: subscription-manager-rhsm-certificates
+Requires: subscription-manager-rhsm-certificates = %{version}-%{release}
 # Required by Fedora packaging guidelines
 %{?python_provide:%python_provide %{py2_package_prefix}-rhsm}
 Requires: rpm-python
@@ -761,7 +765,7 @@ cloud metadata and signatures.
 %build
 make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
     LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \
-    %{?gtk_version} \
+    %{?gtk_version} %{?subpackages} %{?include_syspurpose:INCLUDE_SYSPURPOSE="1"} \
     %{exclude_packages} %{?with_subman_gui} %{?with_subman_migration}
 
 %if %{with python2_rhsm}
@@ -793,6 +797,8 @@ make -f Makefile install VERSION=%{version}-%{release} \
     %{?with_subman_gui} \
     %{?with_subman_migration} \
     %{?with_cockpit} \
+    %{?subpackages} \
+    %{?include_syspurpose:INCLUDE_SYSPURPOSE="1"} \
     %{?exclude_packages}
 
 %if (%{use_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8))
@@ -832,7 +838,9 @@ desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-c
 %endif
 
 %find_lang rhsm
+%if 0%{?include_syspurpose}
 %find_lang syspurpose
+%endif
 
 # fake out the redhat.repo file
 %if %{use_yum} || %{use_dnf}
@@ -1483,60 +1491,6 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
-* Tue Jun 28 2022 Christopher Snyder <csnyder@redhat.com> 1.28.31-1
-- Translated using Weblate (Korean) (simmon@nplob.com)
-- Update translation files (noreply@weblate.org)
-- Translated using Weblate (Chinese (Simplified) (zh_CN)) (suanand@redhat.com)
-- New extraction for translatable strings (ptoscano@redhat.com)
-- 2043331: Do not delete installed SCA cert during registration
-  (jhnidek@redhat.com)
-- Translated using Weblate (Korean) (simmon@nplob.com)
-- build: fix extraction of cockpit messages (ptoscano@redhat.com)
-- cockpit: Fix continuation lines for gettext strings (ptoscano@redhat.com)
-- 1822242: cockpit: fix/simplify the loading/error view checks
-  (ptoscano@redhat.com)
-- 2076522: enable sslverifystatus on repos if advertized by CP
-  (ptoscano@redhat.com)
-- RepoUpdateActionCommand: lazy load the consumer auth (ptoscano@redhat.com)
-- 2071622: Updated redhat-uep.pem to not use SHA-1 algorithm
-  (jhnidek@redhat.com)
-- cockpit: insights: properly show error message in Insights dialog
-  (ptoscano@redhat.com)
-- cockpit: insights: fix formatting of multiline insights-client output
-  (ptoscano@redhat.com)
-- cockpit: insights: improve handling of registration/unregistration errors
-  (ptoscano@redhat.com)
-- cockpit: insights: merge insights-client stderr with stdout
-  (ptoscano@redhat.com)
-- cockpit: Remove extra toString() call (ptoscano@redhat.com)
-
-* Mon May 16 2022 Christopher Snyder <csnyder@redhat.com> 1.28.30-1
-- Add 8.7 tito releaser (csnyder@redhat.com)
-- spec: relax subscription-manager-rhsm-certificates requires
-  (ptoscano@redhat.com)
-- 2073347: [1.28] Print correct status, when access mode has changed
-  (jhnidek@redhat.com)
-- 2056896: Handle all exceptions of gathering data properly
-  (jhnidek@redhat.com)
-- Improve azure determination method (suttner@atix.de)
-- ENT-4939: [1.28] Drop old dbus_interface.py (mhorky@redhat.com)
-- cockpit: Read files in /var/lib/insights as superuser (mvollmer@redhat.com)
-- refresh: clear also the release status (ptoscano@redhat.com)
-- 2074111: clear the release cache on release change (ptoscano@redhat.com)
-- 1.28 Add gcp_license_codes to system facts. (jhnidek@redhat.com)
-- build: always build & ship syspurpose bits (ptoscano@redhat.com)
-- 2057732: [1.28] Fix inaccurate module status in combined profile
-  (jhnidek@redhat.com)
-- 2064002: fix named argument for registerConsumer() (ptoscano@redhat.com)
-- 2057053: Improve API of detection of cloud-what (jhnidek@redhat.com)
-- 2057053: Facts: do no use heuristics detection of cloud (jhnidek@redhat.com)
-- 2018215: Cockpit use "Organization ID" in label (jhnidek@redhat.com)
-- 1822242: Cockpit: another improvement of curtain view (jhnidek@redhat.com)
-- 1822242: cockpit: improve handling of main curtain view (ptoscano@redhat.com)
-
-* Fri Mar 11 2022 Christopher Snyder <csnyder@redhat.com> 1.28.29-1
-- Update translation files (noreply@weblate.org)
-
 * Tue Feb 15 2022 Christopher Snyder <csnyder@redhat.com> 1.28.28-1
 - Revert "1887600: Use updated cert with SHA-256 algorithm"
   (csnyder@redhat.com)