diff --git a/branding/spacewalk-branding.changes.releng.bump b/branding/spacewalk-branding.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/branding/spacewalk-branding.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 64eae72f0dcf..4f1cbd42a5aa 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -18,44 +18,41 @@ %global debug_package %{nil} - %global susemanager_shared_path %{_datadir}/susemanager %global wwwroot %{susemanager_shared_path}/www %global tomcat_path %{wwwroot}/tomcat %global wwwdocroot %{wwwroot}/htdocs - Name: spacewalk-branding -Version: 5.0.2 +Version: 5.1.0 Release: 0 Summary: Spacewalk branding data License: GPL-2.0-only AND OFL-1.1 +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet - URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -#BuildArch: noarch -%if 0%{?suse_version} -BuildRequires: apache2 -%endif BuildRequires: java-devel >= 11 - Requires: httpd -Requires(pre): tomcat Requires: susemanager-advanced-topics_en-pdf Requires: susemanager-best-practices_en-pdf Requires: susemanager-docs_en +Requires: susemanager-frontend-libs Requires: susemanager-getting-started_en-pdf Requires: susemanager-reference_en-pdf -Requires: susemanager-frontend-libs +Requires(pre): tomcat +#BuildArch: noarch +%if 0%{?suse_version} +BuildRequires: apache2 +%endif %description Spacewalk specific branding, CSS, and images. %package devel -Requires: %{name} = %{version}-%{release} Summary: Spacewalk LESS source files for development use +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet +Requires: %{name} = %{version}-%{release} %description devel This package contains LESS source files corresponding to Spacewalk's @@ -93,7 +90,7 @@ ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{tomcat_path}/webapps/r %attr(775,tomcat,tomcat) %dir %{tomcat_path}/webapps/rhn %attr(775,tomcat,tomcat) %dir %{tomcat_path}/webapps/rhn/WEB-INF %attr(775,tomcat,tomcat) %dir %{tomcat_path}/webapps/rhn/WEB-INF/lib/ -%dir %{_prefix}/share/rhn -%dir %{_prefix}/share/rhn/lib +%dir %{_datadir}/rhn +%dir %{_datadir}/rhn/lib %changelog diff --git a/client/rhel/spacewalk-client-tools/spacewalk-client-tools.changes.releng.bump b/client/rhel/spacewalk-client-tools/spacewalk-client-tools.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/client/rhel/spacewalk-client-tools/spacewalk-client-tools.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/client/rhel/spacewalk-client-tools/spacewalk-client-tools.spec b/client/rhel/spacewalk-client-tools/spacewalk-client-tools.spec index 33ad66d9f6cc..14f8585c705e 100644 --- a/client/rhel/spacewalk-client-tools/spacewalk-client-tools.spec +++ b/client/rhel/spacewalk-client-tools/spacewalk-client-tools.spec @@ -33,9 +33,9 @@ %global _buildshell /bin/bash %endif -%{!?__python2:%global __python2 /usr/bin/python2} -%{!?__python3:%global __python3 /usr/bin/python3} +%{!?__python2:%global __python2 %{_bindir}/python2} +%{!?__python3:%global __python3 %{_bindir}/python3} %if %{undefined python2_version} %global python2_version %(%{__python2} -Esc "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))") %endif @@ -65,20 +65,20 @@ %bcond_with test Name: spacewalk-client-tools +Version: 5.1.0 +Release: 0 Summary: Support programs and libraries for Spacewalk License: GPL-2.0-only +URL: https://github.com/uyuni-project/uyuni +Source0: %{name}-%{version}.tar.gz +Source1: https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-0/client/rhel/%{name}/%{name}-rpmlintrc %if "%{_vendor}" == "debbuild" Packager: Uyuni Project Group: admin %else +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: System Environment/Base %endif -Version: 5.0.7 -Source0: %{name}-%{version}.tar.gz -Source1: https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-0/client/rhel/%{name}/%{name}-rpmlintrc -URL: https://github.com/uyuni-project/uyuni -Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} >= 1210 || 0%{?mageia} >= 6 BuildArch: noarch %endif @@ -159,6 +159,7 @@ Summary: Support programs and libraries for Spacewalk %if "%{_vendor}" == "debbuild" Group: python %else +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: System Environment/Base %endif Provides: python-%{name} = %{version}-%{release} @@ -209,19 +210,19 @@ BuildRequires: rpm-python %endif # if {_vendor} != "debbuild" %if "%{_vendor}" == "debbuild" -Requires: python-dmidecode -Requires: python-ethtool >= 0.4 -Requires: python-rpm -BuildRequires: python-dev -Requires: python2-hwdata BuildRequires: python-coverage +BuildRequires: python-dev BuildRequires: python-rpm Requires: gir1.2-gudev-1.0 Requires: python-dbus +Requires: python-dmidecode +Requires: python-ethtool >= 0.4 Requires: python-gi Requires: python-pyudev -Requires(preun):python-minimal +Requires: python-rpm +Requires: python2-hwdata Requires(post): python-minimal +Requires(preun): python-minimal %endif %description -n python2-%{name} @@ -234,6 +235,7 @@ Summary: Support programs and libraries for Spacewalk %if "%{_vendor}" == "debbuild" Group: python %else +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: System Environment/Base %endif Provides: python3-rhn-client-tools = %{version}-%{release} @@ -272,8 +274,8 @@ Requires: gir1.2-gudev-1.0 Requires: python3-dbus Requires: python3-gi Requires: python3-pyudev -Requires(preun):python3-minimal Requires(post): python3-minimal +Requires(preun): python3-minimal %endif %if %{with test} && 0%{?rhel} != 6 @@ -296,25 +298,25 @@ make -f Makefile.rhn-client-tools %{?is_deb:PLATFORM=deb} %if 0%{?build_py2} make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} \ PYTHONPATH=%{python_sitelib} PYTHONVERSION=%{python_version} \ - PREFIX=$RPM_BUILD_ROOT %{?is_deb:PLATFORM=deb} + PREFIX=%{buildroot} %{?is_deb:PLATFORM=deb} %endif %if 0%{?build_py3} -sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|' test/*.py +sed -i 's|#!%{_bindir}/python|#!%{_bindir}/python3|' test/*.py make -f Makefile.rhn-client-tools %{?is_deb:PLATFORM=deb} make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} \ PYTHONPATH=%{python3_sitelib} PYTHONVERSION=%{python3_version} \ - PREFIX=$RPM_BUILD_ROOT %{?is_deb:PLATFORM=deb} + PREFIX=%{buildroot} %{?is_deb:PLATFORM=deb} %endif -mkdir -p $RPM_BUILD_ROOT/var/lib/up2date -mkdir -pm700 $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date -touch $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date/loginAuth.pkl +mkdir -p %{buildroot}%{_localstatedir}/lib/up2date +mkdir -pm700 %{buildroot}%{_localstatedir}/spool/up2date +touch %{buildroot}%{_localstatedir}/spool/up2date/loginAuth.pkl %if 0%{?fedora} || 0%{?mageia} || 0%{?debian} >= 8 || 0%{?ubuntu} >= 1504 || 0%{?sle_version} >= 120000 || 0%{?rhel} >= 7 -mkdir -p $RPM_BUILD_ROOT/%{_presetdir} +mkdir -p %{buildroot}/%{_presetdir} %endif # remove all unsupported translations -cd $RPM_BUILD_ROOT +cd %{buildroot} for d in usr/share/locale/*; do if [ ! -d "/$d" ]; then rm -rfv "./$d" @@ -326,8 +328,8 @@ cd - %find_lang rhn-client-tools %endif -rm -rf $RPM_BUILD_ROOT/etc/pam.d -rm -rf $RPM_BUILD_ROOT/etc/security/console.apps +rm -rf %{buildroot}%{_sysconfdir}/pam.d +rm -rf %{buildroot}%{_sysconfdir}/security/console.apps %if 0%{?suse_version} %if 0%{?build_py2} @@ -351,9 +353,8 @@ make -f Makefile.rhn-client-tools test %files # No find_lang on Debian systems %{_datadir}/locale/ -/var/lib/up2date/ +%{_localstatedir}/lib/up2date/ %else - %files -f rhn-client-tools.lang %endif %defattr(-,root,root,-) @@ -422,7 +423,6 @@ pycompile -p python2-%{name} -V -3.0 %preun -n python2-%{name} # Ensure all *.py[co] files are deleted, per debian policy pyclean -p python2-%{name} - %endif %if 0%{?build_py3} @@ -433,7 +433,6 @@ py3compile -p python3-%{name} -V -4.0 %preun -n python3-%{name} # Ensure all *.py[co] files are deleted, per debian policy py3clean -p python3-%{name} - %endif %endif diff --git a/client/tools/mgr-push/mgr-push.changes.releng.bump b/client/tools/mgr-push/mgr-push.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/client/tools/mgr-push/mgr-push.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/client/tools/mgr-push/mgr-push.spec b/client/tools/mgr-push/mgr-push.spec index c23637a78488..c188fd827f59 100644 --- a/client/tools/mgr-push/mgr-push.spec +++ b/client/tools/mgr-push/mgr-push.spec @@ -20,7 +20,7 @@ # Old name and version+1 before renaming to mgr-push %define oldname rhnpush %define oldversion 5.5.114 -%global __python /usr/bin/python2 +%global __python %{_bindir}/python2 %if 0%{?fedora} || 0%{?suse_version} > 1320 || 0%{?rhel} >= 8 %global build_py3 1 @@ -32,26 +32,25 @@ %endif %define pythonX %{?default_py3: python3}%{!?default_py3: python2} - Name: mgr-push +Version: 5.1.0 +Release: 0 Summary: Package uploader for the Spacewalk License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System URL: https://github.com/uyuni-project/uyuni -Version: 5.0.2 -Release: 0 -Provides: %{oldname} = %{oldversion} -Obsoletes: %{oldname} < %{oldversion} Source0: https://github.com/uyuni-project/uyuni/archive/%{name}-%{version}-0.tar.gz Source1: https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-0/client/tools/mgr-push/%{name}-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} >= 1210 -BuildArch: noarch -%endif -Requires: %{pythonX}-%{name} = %{version}-%{release} BuildRequires: docbook-utils BuildRequires: gettext BuildRequires: make +Requires: %{pythonX}-%{name} = %{version}-%{release} +Provides: %{oldname} = %{oldversion} +Obsoletes: %{oldname} < %{oldversion} +%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} >= 1210 +BuildArch: noarch +%endif %description rhnpush uploads package headers to the Spacewalk @@ -62,22 +61,23 @@ per channel. %if 0%{?build_py2} %package -n python2-%{name} Summary: Package uploader for the Spacewalk or Red Hat Satellite Server +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System +BuildRequires: python2-rhn-client-tools +BuildRequires: python2-uyuni-common-libs +Requires: %{name} = %{version}-%{release} +Requires: python2-rhn-client-tools +Requires: python2-uyuni-common-libs +Requires: rhnlib >= 2.8.3 Provides: python2-%{oldname} = %{oldversion} Obsoletes: python2-%{oldname} < %{oldversion} -Requires: %{name} = %{version}-%{release} %if 0%{?fedora} >= 28 -Requires: python2-rpm BuildRequires: python2-devel +Requires: python2-rpm %else -Requires: rpm-python BuildRequires: python-devel +Requires: rpm-python %endif -Requires: python2-rhn-client-tools -Requires: python2-uyuni-common-libs -Requires: rhnlib >= 2.8.3 -BuildRequires: python2-rhn-client-tools -BuildRequires: python2-uyuni-common-libs %description -n python2-%{name} Python 2 specific files for rhnpush. @@ -86,22 +86,23 @@ Python 2 specific files for rhnpush. %if 0%{?build_py3} %package -n python3-%{name} Summary: Package uploader for the Spacewalk or Red Hat Satellite Server +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System +BuildRequires: python3-devel +BuildRequires: python3-rhn-client-tools +BuildRequires: python3-rpm-macros +BuildRequires: python3-uyuni-common-libs +Requires: %{name} = %{version}-%{release} +Requires: python3-rhn-client-tools +Requires: python3-rhnlib >= 2.8.3 +Requires: python3-uyuni-common-libs Provides: python3-%{oldname} = %{oldversion} Obsoletes: python3-%{oldname} < %{oldversion} -Requires: %{name} = %{version}-%{release} %if 0%{?suse_version} Requires: python3-rpm %else Requires: rpm-python3 %endif -Requires: python3-rhn-client-tools -Requires: python3-rhnlib >= 2.8.3 -Requires: python3-uyuni-common-libs -BuildRequires: python3-devel -BuildRequires: python3-rhn-client-tools -BuildRequires: python3-rpm-macros -BuildRequires: python3-uyuni-common-libs %description -n python3-%{name} Python 3 specific files for rhnpush. @@ -114,23 +115,23 @@ Python 3 specific files for rhnpush. make -f Makefile.rhnpush all %install -install -d $RPM_BUILD_ROOT/%{python_sitelib} +install -d %{buildroot}/%{python_sitelib} %if 0%{?build_py2} -make -f Makefile.rhnpush install PREFIX=$RPM_BUILD_ROOT ROOT=%{python_sitelib} \ +make -f Makefile.rhnpush install PREFIX=%{buildroot} ROOT=%{python_sitelib} \ MANDIR=%{_mandir} PYTHON_VERSION=%{python_version} %endif %if 0%{?build_py3} sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|' rhnpush -install -d $RPM_BUILD_ROOT/%{python3_sitelib} -make -f Makefile.rhnpush install PREFIX=$RPM_BUILD_ROOT ROOT=%{python3_sitelib} \ +install -d %{buildroot}/%{python3_sitelib} +make -f Makefile.rhnpush install PREFIX=%{buildroot} ROOT=%{python3_sitelib} \ MANDIR=%{_mandir} PYTHON_VERSION=%{python3_version} %endif %define default_suffix %{?default_py3:-%{python3_version}}%{!?default_py3:-%{python_version}} -ln -s rhnpush%{default_suffix} $RPM_BUILD_ROOT%{_bindir}/rhnpush +ln -s rhnpush%{default_suffix} %{buildroot}%{_bindir}/rhnpush %if 0%{?suse_version} -ln -s rhnpush $RPM_BUILD_ROOT/%{_bindir}/mgrpush +ln -s rhnpush %{buildroot}/%{_bindir}/mgrpush %endif %files @@ -142,8 +143,8 @@ ln -s rhnpush $RPM_BUILD_ROOT/%{_bindir}/mgrpush %{_bindir}/mgrpush %endif %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/rhn/rhnpushrc -%{_mandir}/man8/rhnpush.8* -%doc COPYING +%{_mandir}/man8/rhnpush.8%{?ext_man} +%license COPYING %if 0%{?build_py2} %files -n python2-%{name} diff --git a/containers/init-image/Dockerfile b/containers/init-image/Dockerfile index 9ae7aa210249..b56d7259783f 100644 --- a/containers/init-image/Dockerfile +++ b/containers/init-image/Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT #!BuildTag: uyuni/init:latest -ARG INIT_BASE=opensuse/leap:15.5 +ARG INIT_BASE=opensuse/leap:15.6 FROM $INIT_BASE # Create stable static UID and GID for salt, tomcat, apache (wwwrun), postgres, ... @@ -52,7 +52,7 @@ LABEL org.opencontainers.image.description="This image initialize users, groups LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="${VENDOR}" LABEL org.opencontainers.image.url="${URL}" -LABEL org.opencontainers.image.version=5.0.8 +LABEL org.opencontainers.image.version=5.1.0 LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="${REFERENCE_PREFIX}/init:${PRODUCT_VERSION}.%RELEASE%" # endlabelprefix diff --git a/containers/init-image/init-image.changes.releng.bump b/containers/init-image/init-image.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/init-image/init-image.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/proxy-helm/Chart.yaml b/containers/proxy-helm/Chart.yaml index 3291699aa139..5725faff15bf 100644 --- a/containers/proxy-helm/Chart.yaml +++ b/containers/proxy-helm/Chart.yaml @@ -6,4 +6,4 @@ description: Uyuni proxy containers. type: application home: https://www.uyuni-project.org/ icon: https://www.uyuni-project.org/img/uyuni-logo.svg -version: 5.0.8 +version: 5.1.0 diff --git a/containers/proxy-helm/proxy-helm.changes.releng.bump b/containers/proxy-helm/proxy-helm.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/proxy-helm/proxy-helm.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/proxy-httpd-image/Dockerfile b/containers/proxy-httpd-image/Dockerfile index 3f9c1fcd035c..f2f5c7ad7b5f 100644 --- a/containers/proxy-httpd-image/Dockerfile +++ b/containers/proxy-httpd-image/Dockerfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT #!BuildTag: uyuni/proxy-httpd:latest -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE AS base @@ -32,7 +32,7 @@ COPY uyuni-configure.py /usr/bin/uyuni-configure.py RUN chmod +x /usr/bin/uyuni-configure.py # Define slim image -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE AS slim ARG PRODUCT=Uyuni @@ -50,7 +50,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="${VENDOR}" LABEL org.opencontainers.image.url="${URL}" LABEL org.opencontainers.image.name=proxy-httpd-image -LABEL org.opencontainers.image.version=5.0.7 +LABEL org.opencontainers.image.version=5.1.0 LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-httpd:${PRODUCT_VERSION}.%RELEASE%" # endlabelprefix diff --git a/containers/proxy-httpd-image/proxy-httpd-image.changes.releng.bump b/containers/proxy-httpd-image/proxy-httpd-image.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/proxy-httpd-image/proxy-httpd-image.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/proxy-salt-broker-image/Dockerfile b/containers/proxy-salt-broker-image/Dockerfile index b30e410b01f0..adf2bfa28dd2 100644 --- a/containers/proxy-salt-broker-image/Dockerfile +++ b/containers/proxy-salt-broker-image/Dockerfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT #!BuildTag: uyuni/proxy-salt-broker:latest -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE AS fat ARG PRODUCT_REPO @@ -22,7 +22,7 @@ COPY prepare_target.sh . RUN sh prepare_target.sh # Define slim image -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE AS slim ARG PRODUCT=Uyuni @@ -41,7 +41,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="${VENDOR}" LABEL org.opencontainers.image.url="${URL}" LABEL org.opencontainers.image.name=proxy-salt-broker-image -LABEL org.opencontainers.image.version=5.0.7 +LABEL org.opencontainers.image.version=5.1.0 LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-salt-broker:${PRODUCT_VERSION}.%RELEASE%" # endlabelprefix diff --git a/containers/proxy-salt-broker-image/proxy-salt-broker-image.changes.releng.bump b/containers/proxy-salt-broker-image/proxy-salt-broker-image.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/proxy-salt-broker-image/proxy-salt-broker-image.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/proxy-squid-image/Dockerfile b/containers/proxy-squid-image/Dockerfile index 3426299dd644..0b7ab1abfb71 100644 --- a/containers/proxy-squid-image/Dockerfile +++ b/containers/proxy-squid-image/Dockerfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT #!BuildTag: uyuni/proxy-squid:latest -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE AS base ARG PRODUCT_REPO @@ -38,7 +38,7 @@ RUN chown squid:squid /var/cache/squid RUN chmod a+x /var/log # Define slim image -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE AS slim USER squid @@ -58,7 +58,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="${VENDOR}" LABEL org.opencontainers.image.url="${URL}" LABEL org.opencontainers.image.name=proxy-squid-image -LABEL org.opencontainers.image.version=5.0.7 +LABEL org.opencontainers.image.version=5.1.0 LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-squid:${PRODUCT_VERSION}.%RELEASE%" # endlabelprefix diff --git a/containers/proxy-squid-image/proxy-squid-image.changes.releng.bump b/containers/proxy-squid-image/proxy-squid-image.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/proxy-squid-image/proxy-squid-image.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/proxy-ssh-image/Dockerfile b/containers/proxy-ssh-image/Dockerfile index ff72e62675cf..307564f29079 100644 --- a/containers/proxy-ssh-image/Dockerfile +++ b/containers/proxy-ssh-image/Dockerfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT #!BuildTag: uyuni/proxy-ssh:latest -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE AS base ARG PRODUCT_REPO @@ -28,7 +28,7 @@ COPY uyuni-configure.py /usr/bin/uyuni-configure.py RUN chmod +x /usr/bin/uyuni-configure.py # Define slim image -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE AS slim ARG PRODUCT=Uyuni @@ -46,7 +46,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="${VENDOR}" LABEL org.opencontainers.image.url="${URL}" LABEL org.opencontainers.image.name=proxy-ssh-image -LABEL org.opencontainers.image.version=5.0.7 +LABEL org.opencontainers.image.version=5.1.0 LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-ssh:${PRODUCT_VERSION}.%RELEASE%" # endlabelprefix diff --git a/containers/proxy-ssh-image/proxy-ssh-image.changes.releng.bump b/containers/proxy-ssh-image/proxy-ssh-image.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/proxy-ssh-image/proxy-ssh-image.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/proxy-systemd-services/uyuni-proxy-systemd-services.changes.releng.bump b/containers/proxy-systemd-services/uyuni-proxy-systemd-services.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/proxy-systemd-services/uyuni-proxy-systemd-services.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/proxy-systemd-services/uyuni-proxy-systemd-services.spec b/containers/proxy-systemd-services/uyuni-proxy-systemd-services.spec index a24e24d2dc74..4cd118f88d08 100644 --- a/containers/proxy-systemd-services/uyuni-proxy-systemd-services.spec +++ b/containers/proxy-systemd-services/uyuni-proxy-systemd-services.spec @@ -22,8 +22,8 @@ Name: uyuni-proxy-systemd-services Summary: Uyuni proxy server systemd services containers License: GPL-2.0-only Group: Applications/Internet -Version: 5.0.1 -Release: 1 +Version: 5.1.0 +Release: 0 URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}-1.tar.gz Source1: https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-1/containers/proxy-systemd-services/%{name}-rpmlintrc diff --git a/containers/proxy-tftpd-image/Dockerfile b/containers/proxy-tftpd-image/Dockerfile index f5dd0f13bf4b..163f35fd4a67 100644 --- a/containers/proxy-tftpd-image/Dockerfile +++ b/containers/proxy-tftpd-image/Dockerfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT #!BuildTag: uyuni/proxy-tftpd:latest -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE AS base ARG PRODUCT_REPO @@ -27,7 +27,7 @@ COPY tftp_wrapper.py /usr/bin/tftp_wrapper.py RUN chmod +x /usr/bin/tftp_wrapper.py # Define slim image -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE AS slim ARG PRODUCT=Uyuni @@ -45,7 +45,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="${VENDOR}" LABEL org.opencontainers.image.url="${URL}" LABEL org.opencontainers.image.name=proxy-tftpd-image -LABEL org.opencontainers.image.version=5.0.7 +LABEL org.opencontainers.image.version=5.1.0 LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-tftpd:${PRODUCT_VERSION}.%RELEASE%" # endlabelprefix diff --git a/containers/proxy-tftpd-image/proxy-tftpd-image.changes.releng.bump b/containers/proxy-tftpd-image/proxy-tftpd-image.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/proxy-tftpd-image/proxy-tftpd-image.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/server-attestation-image/Dockerfile b/containers/server-attestation-image/Dockerfile index 245591092eb5..f551f0813e8b 100644 --- a/containers/server-attestation-image/Dockerfile +++ b/containers/server-attestation-image/Dockerfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT #!BuildTag: uyuni/server-attestation:latest -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE # Architecture specific attestation modules are specified via project configuration @@ -28,7 +28,7 @@ LABEL org.opencontainers.image.description="${PRODUCT} Confidential Computing at LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="${VENDOR}" LABEL org.opencontainers.image.url="${URL}" -LABEL org.opencontainers.image.version=5.0.5 +LABEL org.opencontainers.image.version=5.1.0 LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server-attestation:${PRODUCT_VERSION}.%RELEASE%" # endlabelprefix diff --git a/containers/server-attestation-image/server-attestation-image.changes.releng.bump b/containers/server-attestation-image/server-attestation-image.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/server-attestation-image/server-attestation-image.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/server-helm/Chart.yaml b/containers/server-helm/Chart.yaml index e8c4d9927b2e..b5a1e9f85c53 100644 --- a/containers/server-helm/Chart.yaml +++ b/containers/server-helm/Chart.yaml @@ -6,4 +6,4 @@ description: Uyuni server containers. type: application home: https://www.uyuni-project.org/ icon: https://www.uyuni-project.org/img/uyuni-logo.svg -version: 5.0.7 +version: 5.1.0 diff --git a/containers/server-helm/server-helm.changes.releng.bump b/containers/server-helm/server-helm.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/server-helm/server-helm.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/server-hub-xmlrpc-api-image/Dockerfile b/containers/server-hub-xmlrpc-api-image/Dockerfile index b4393e28ef56..ea6da3f43b84 100644 --- a/containers/server-hub-xmlrpc-api-image/Dockerfile +++ b/containers/server-hub-xmlrpc-api-image/Dockerfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT #!BuildTag: uyuni/server-hub-xmlrpc-api:latest -ARG BASE=registry.suse.com/bci/bci-base:15.5 +ARG BASE=registry.suse.com/bci/bci-base:15.6 FROM $BASE RUN zypper --gpg-auto-import-keys --non-interactive install hub-xmlrpc-api @@ -20,7 +20,7 @@ LABEL org.opencontainers.image.description="${PRODUCT} Hub XML-RPC API image" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="${VENDOR}" LABEL org.opencontainers.image.url="${URL}" -LABEL org.opencontainers.image.version=5.0.7 +LABEL org.opencontainers.image.version=5.1.0 LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server-hub-xmlrpc-api:${PRODUCT_VERSION}.%RELEASE%" # endlabelprefix diff --git a/containers/server-hub-xmlrpc-api-image/server-hub-xmlrpc-api-image.changes.releng.bump b/containers/server-hub-xmlrpc-api-image/server-hub-xmlrpc-api-image.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/server-hub-xmlrpc-api-image/server-hub-xmlrpc-api-image.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/server-image/Dockerfile b/containers/server-image/Dockerfile index c33a81d956e0..1f5b8bab85f0 100644 --- a/containers/server-image/Dockerfile +++ b/containers/server-image/Dockerfile @@ -132,7 +132,7 @@ LABEL org.opencontainers.image.description="All-in-one ${PRODUCT} server image" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="${VENDOR}" LABEL org.opencontainers.image.url="${URL}" -LABEL org.opencontainers.image.version=5.0.8 +LABEL org.opencontainers.image.version=5.1.0 LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server:${PRODUCT_VERSION}.%RELEASE%" # endlabelprefix diff --git a/containers/server-image/server-image.changes.releng.bump b/containers/server-image/server-image.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/server-image/server-image.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/containers/server-migration-14-16-image/Dockerfile b/containers/server-migration-14-16-image/Dockerfile index f21c7a94685e..edc7b61933e4 100644 --- a/containers/server-migration-14-16-image/Dockerfile +++ b/containers/server-migration-14-16-image/Dockerfile @@ -26,7 +26,7 @@ LABEL org.opencontainers.image.description="${PRODUCT} server migration image" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="${VENDOR}" LABEL org.opencontainers.image.url="${URL}" -LABEL org.opencontainers.image.version=5.0.8 +LABEL org.opencontainers.image.version=5.1.0 LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server-migration-14-16:${PRODUCT_VERSION}.%RELEASE%" # endlabelprefix diff --git a/containers/server-migration-14-16-image/server-migration-14-16-image.changes.releng.bump b/containers/server-migration-14-16-image/server-migration-14-16-image.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/containers/server-migration-14-16-image/server-migration-14-16-image.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/java/spacewalk-java.changes.releng.bump b/java/spacewalk-java.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/java/spacewalk-java.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 4d0baf7af89c..6faec2269b8f 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -16,7 +16,6 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - #!BuildIgnore: udev-mini libudev-mini1 %define cobblerdir %{_localstatedir}/lib/cobbler @@ -58,15 +57,15 @@ %endif Name: spacewalk-java +Version: 5.1.0 +Release: 0 Summary: Java web application files for Spacewalk License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet -Version: 5.0.12 -Release: 0 URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz Source1: https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-0/java/%{name}-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ExcludeArch: ia64 @@ -269,10 +268,11 @@ This package contains the code for the Java version of the Spacewalk Web Site. %package config Summary: Configuration files for Spacewalk Java +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Requires(post): %{apache2} -Requires(post): tomcat Requires(post): salt-master +Requires(post): tomcat %description config This package contains the configuration files for the Spacewalk Java web @@ -280,6 +280,7 @@ application and taskomatic process. %package lib Summary: Jar files for Spacewalk Java +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Requires: /usr/bin/sudo @@ -289,6 +290,7 @@ and taskomatic process. %package postgresql Summary: PostgreSQL database backend support files for Spacewalk Java +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Requires: postgresql-jdbc Requires: tomcat >= 7 @@ -297,10 +299,10 @@ Provides: spacewalk-java-jdbc = %{version}-%{release} %description postgresql This package contains PostgreSQL database backend files for the Spacewalk Java. - %if ! 0%{?omit_tests} > 0 %package tests Summary: Test Classes for testing spacewalk-java +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet BuildRequires: jmock < 2.0 @@ -321,6 +323,7 @@ This package contains testing files of spacewalk-java. %package apidoc-sources Summary: Autogenerated apidoc sources for spacewalk-java +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet BuildRequires: (docbook-dtds or docbook_4) @@ -338,6 +341,7 @@ This package contains apidoc sources of spacewalk-java. %package -n spacewalk-taskomatic Summary: Java version of taskomatic +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet BuildRequires: systemd @@ -435,7 +439,7 @@ export JAVA_HOME=/usr/lib/jvm/java-%{java_version}-openjdk/ %endif # compile only java sources (no packing here) -ant -Dprefix=$RPM_BUILD_ROOT -Dproduct.name="'$PRODUCT_NAME'" init-install compile +ant -Dprefix=%{buildroot} -Dproduct.name="'$PRODUCT_NAME'" init-install compile %if 0%{?run_checkstyle} echo "Running checkstyle on java main sources" @@ -477,13 +481,13 @@ find . -type f -name '*.xml' | xargs perl -CSAD -lne ' END { exit $exit }' echo "Building apidoc docbook sources" -ant -Dproduct.name="'$PRODUCT_NAME'" -Dprefix=$RPM_BUILD_ROOT init-install apidoc-docbook +ant -Dproduct.name="'$PRODUCT_NAME'" -Dprefix=%{buildroot} init-install apidoc-docbook pushd build/reports/apidocs/docbook -/usr/bin/xmllint --xinclude --postvalid book.xml > susemanager_api_doc.xml +%{_bindir}/xmllint --xinclude --postvalid book.xml > susemanager_api_doc.xml popd echo "Building apidoc asciidoc sources" -ant -Dproduct.name="'$PRODUCT_NAME'" -Dprefix=$RPM_BUILD_ROOT init-install apidoc-asciidoc +ant -Dproduct.name="'$PRODUCT_NAME'" -Dprefix=%{buildroot} init-install apidoc-asciidoc # Don't use Java module com.sun.xml.bind if it isn't available. (only SUSE has it) if [[ ! `java --list-modules | grep com.sun.xml.bind` ]]; then @@ -502,91 +506,91 @@ export JAVA_HOME=/usr/lib/jvm/java-%{java_version}-openjdk/ export NO_BRP_STALE_LINK_ERROR=yes -mkdir -p $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib +mkdir -p %{buildroot}%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib %if 0%{?suse_version} -ant -Dproduct.name="'$PRODUCT_NAME'" -Dprefix=$RPM_BUILD_ROOT -Dtomcat="tomcat9" install-tomcat9-suse -install -d -m 755 $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/META-INF/ -install -m 755 conf/rhn-tomcat9.xml $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/META-INF/context.xml +ant -Dproduct.name="'$PRODUCT_NAME'" -Dprefix=%{buildroot} -Dtomcat="tomcat9" install-tomcat9-suse +install -d -m 755 %{buildroot}%{serverdir}/tomcat/webapps/rhn/META-INF/ +install -m 755 conf/rhn-tomcat9.xml %{buildroot}%{serverdir}/tomcat/webapps/rhn/META-INF/context.xml %else -ant -Dproduct.name="'$PRODUCT_NAME'" -Dprefix=$RPM_BUILD_ROOT install-tomcat -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat/Catalina/localhost/ -install -m 644 conf/rhn-tomcat9.xml $RPM_BUILD_ROOT%{_sysconfdir}/tomcat/Catalina/localhost/rhn.xml +ant -Dproduct.name="'$PRODUCT_NAME'" -Dprefix=%{buildroot} install-tomcat +install -d -m 755 %{buildroot}%{_sysconfdir}/tomcat/Catalina/localhost/ +install -m 644 conf/rhn-tomcat9.xml %{buildroot}%{_sysconfdir}/tomcat/Catalina/localhost/rhn.xml %endif # check spelling errors in all resources for English if aspell installed [ -x "$(which aspell)" ] && scripts/spelling/check_java.sh .. en_US -install -d -m 755 $RPM_BUILD_ROOT%{_sbindir} -install -d -m 755 $RPM_BUILD_ROOT%{_unitdir} -install -d -m 755 $RPM_BUILD_ROOT%{_bindir} -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rhn -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/unit-tests -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/lib -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/classes -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/spacewalk/taskomatic -install -d -m 755 $RPM_BUILD_ROOT%{cobprofdir} -install -d -m 755 $RPM_BUILD_ROOT%{cobprofdirup} -install -d -m 755 $RPM_BUILD_ROOT%{cobprofdirwiz} -install -d -m 755 $RPM_BUILD_ROOT%{cobdirsnippets} -install -d -m 755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/spacewalk/scc -install -d -m 755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/spacewalk/subscription-matcher - -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -install -d $RPM_BUILD_ROOT%{userserverdir}/susemanager/salt -install -d $RPM_BUILD_ROOT%{userserverdir}/susemanager/salt/salt_ssh -install -d $RPM_BUILD_ROOT%{userserverdir}/susemanager/tmp - -install -m 644 conf/default/rhn_hibernate.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_hibernate.conf -install -m 644 conf/default/rhn_reporting_hibernate.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_reporting_hibernate.conf -install -m 644 conf/default/rhn_taskomatic_daemon.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_taskomatic_daemon.conf -install -m 644 conf/default/taskomatic.conf $RPM_BUILD_ROOT%{_sysconfdir}/rhn/taskomatic.conf -install -m 644 conf/default/rhn_org_quartz.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_org_quartz.conf -install -m 644 conf/rhn_java.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults -install -m 644 conf/rhn_java_sso.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults +install -d -m 755 %{buildroot}%{_sbindir} +install -d -m 755 %{buildroot}%{_unitdir} +install -d -m 755 %{buildroot}%{_bindir} +install -d -m 755 %{buildroot}%{_sysconfdir}/rhn +install -d -m 755 %{buildroot}%{_datadir}/rhn +install -d -m 755 %{buildroot}%{_datadir}/rhn/unit-tests +install -d -m 755 %{buildroot}%{_datadir}/rhn/lib +install -d -m 755 %{buildroot}%{_datadir}/rhn/classes +install -d -m 755 %{buildroot}%{_datadir}/rhn/config-defaults +install -d -m 755 %{buildroot}%{_datadir}/rhn/search +install -d -m 755 %{buildroot}%{_datadir}/rhn/search/lib +install -d -m 755 %{buildroot}%{_datadir}/spacewalk/taskomatic +install -d -m 755 %{buildroot}%{cobprofdir} +install -d -m 755 %{buildroot}%{cobprofdirup} +install -d -m 755 %{buildroot}%{cobprofdirwiz} +install -d -m 755 %{buildroot}%{cobdirsnippets} +install -d -m 755 %{buildroot}%{_localstatedir}/lib/spacewalk/scc +install -d -m 755 %{buildroot}%{_localstatedir}/lib/spacewalk/subscription-matcher + +install -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d +install -d %{buildroot}%{userserverdir}/susemanager/salt +install -d %{buildroot}%{userserverdir}/susemanager/salt/salt_ssh +install -d %{buildroot}%{userserverdir}/susemanager/tmp + +install -m 644 conf/default/rhn_hibernate.conf %{buildroot}%{_datadir}/rhn/config-defaults/rhn_hibernate.conf +install -m 644 conf/default/rhn_reporting_hibernate.conf %{buildroot}%{_datadir}/rhn/config-defaults/rhn_reporting_hibernate.conf +install -m 644 conf/default/rhn_taskomatic_daemon.conf %{buildroot}%{_datadir}/rhn/config-defaults/rhn_taskomatic_daemon.conf +install -m 644 conf/default/taskomatic.conf %{buildroot}%{_sysconfdir}/rhn/taskomatic.conf +install -m 644 conf/default/rhn_org_quartz.conf %{buildroot}%{_datadir}/rhn/config-defaults/rhn_org_quartz.conf +install -m 644 conf/rhn_java.conf %{buildroot}%{_datadir}/rhn/config-defaults +install -m 644 conf/rhn_java_sso.conf %{buildroot}%{_datadir}/rhn/config-defaults # Adjust product tree tag %if 0%{?is_opensuse} -sed -i -e 's/^java.product_tree_tag =.*$/java.product_tree_tag = Uyuni/' $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_java.conf +sed -i -e 's/^java.product_tree_tag =.*$/java.product_tree_tag = Uyuni/' %{buildroot}%{_datadir}/rhn/config-defaults/rhn_java.conf %endif # Adjust languages -sed -i -e '/# NOTE: for the RPMs this is defined at the SPEC!/d' $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_java.conf -sed -i -e 's/^java.supported_locales=.*$/java.supported_locales=%{supported_locales}/' $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_java.conf -install -m 644 conf/logrotate/rhn_web_api $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn_web_api -install -m 644 conf/logrotate/gatherer $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/gatherer +sed -i -e '/# NOTE: for the RPMs this is defined at the SPEC!/d' %{buildroot}%{_datadir}/rhn/config-defaults/rhn_java.conf +sed -i -e 's/^java.supported_locales=.*$/java.supported_locales=%{supported_locales}/' %{buildroot}%{_datadir}/rhn/config-defaults/rhn_java.conf +install -m 644 conf/logrotate/rhn_web_api %{buildroot}%{_sysconfdir}/logrotate.d/rhn_web_api +install -m 644 conf/logrotate/gatherer %{buildroot}%{_sysconfdir}/logrotate.d/gatherer # LOGROTATE >= 3.8 requires extra permission config -sed -i 's/#LOGROTATE-3.8#//' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn_web_api -install -m 755 scripts/taskomatic $RPM_BUILD_ROOT%{_sbindir} -install -m 644 scripts/taskomatic.service $RPM_BUILD_ROOT%{_unitdir} +sed -i 's/#LOGROTATE-3.8#//' %{buildroot}%{_sysconfdir}/logrotate.d/rhn_web_api +install -m 755 scripts/taskomatic %{buildroot}%{_sbindir} +install -m 644 scripts/taskomatic.service %{buildroot}%{_unitdir} # add rc link -ln -sf service $RPM_BUILD_ROOT/%{_sbindir}/rctaskomatic +ln -sf service %{buildroot}%{_sbindir}/rctaskomatic -install -m 644 scripts/unittest.xml $RPM_BUILD_ROOT/%{_datadir}/rhn/ -install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar $RPM_BUILD_ROOT%{_datadir}/rhn/lib +install -m 644 scripts/unittest.xml %{buildroot}%{_datadir}/rhn/ +install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar %{buildroot}%{_datadir}/rhn/lib %if ! 0%{?omit_tests} > 0 -install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn-test.jar $RPM_BUILD_ROOT%{_datadir}/rhn/lib -cp -a build/classes/com/redhat/rhn/common/conf/test/conf $RPM_BUILD_ROOT%{_datadir}/rhn/unit-tests/ +install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn-test.jar %{buildroot}%{_datadir}/rhn/lib +cp -a build/classes/com/redhat/rhn/common/conf/test/conf %{buildroot}%{_datadir}/rhn/unit-tests/ %endif -install -m 644 conf/log4j2.xml.taskomatic $RPM_BUILD_ROOT%{_datadir}/rhn/classes/log4j2.xml -install -m 644 code/src/ehcache.xml $RPM_BUILD_ROOT%{_datadir}/rhn/classes/ehcache.xml +install -m 644 conf/log4j2.xml.taskomatic %{buildroot}%{_datadir}/rhn/classes/log4j2.xml +install -m 644 code/src/ehcache.xml %{buildroot}%{_datadir}/rhn/classes/ehcache.xml -install -d -m 755 $RPM_BUILD_ROOT%{spacewalksnippetsdir} -install -m 644 conf/cobbler/snippets/default_motd $RPM_BUILD_ROOT%{spacewalksnippetsdir}/default_motd -install -m 644 conf/cobbler/snippets/keep_system_id $RPM_BUILD_ROOT%{spacewalksnippetsdir}/keep_system_id -install -m 644 conf/cobbler/snippets/post_reactivation_key $RPM_BUILD_ROOT%{spacewalksnippetsdir}/post_reactivation_key -install -m 644 conf/cobbler/snippets/post_delete_system $RPM_BUILD_ROOT%{spacewalksnippetsdir}/post_delete_system -install -m 644 conf/cobbler/snippets/redhat_register_using_salt $RPM_BUILD_ROOT%{spacewalksnippetsdir}/redhat_register_using_salt -install -m 644 conf/cobbler/snippets/minion_script $RPM_BUILD_ROOT%{spacewalksnippetsdir}/minion_script -install -m 644 conf/cobbler/snippets/sles_no_signature_checks $RPM_BUILD_ROOT%{spacewalksnippetsdir}/sles_no_signature_checks -install -m 644 conf/cobbler/snippets/wait_for_networkmanager_script $RPM_BUILD_ROOT%{spacewalksnippetsdir}/wait_for_networkmanager_script +install -d -m 755 %{buildroot}%{spacewalksnippetsdir} +install -m 644 conf/cobbler/snippets/default_motd %{buildroot}%{spacewalksnippetsdir}/default_motd +install -m 644 conf/cobbler/snippets/keep_system_id %{buildroot}%{spacewalksnippetsdir}/keep_system_id +install -m 644 conf/cobbler/snippets/post_reactivation_key %{buildroot}%{spacewalksnippetsdir}/post_reactivation_key +install -m 644 conf/cobbler/snippets/post_delete_system %{buildroot}%{spacewalksnippetsdir}/post_delete_system +install -m 644 conf/cobbler/snippets/redhat_register_using_salt %{buildroot}%{spacewalksnippetsdir}/redhat_register_using_salt +install -m 644 conf/cobbler/snippets/minion_script %{buildroot}%{spacewalksnippetsdir}/minion_script +install -m 644 conf/cobbler/snippets/sles_no_signature_checks %{buildroot}%{spacewalksnippetsdir}/sles_no_signature_checks +install -m 644 conf/cobbler/snippets/wait_for_networkmanager_script %{buildroot}%{spacewalksnippetsdir}/wait_for_networkmanager_script -ln -s -f %{_javadir}/dwr.jar $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/dwr.jar +ln -s -f %{_javadir}/dwr.jar %{buildroot}%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/dwr.jar # special links for rhn-search -RHN_SEARCH_BUILD_DIR=%{_prefix}/share/rhn/search/lib +RHN_SEARCH_BUILD_DIR=%{_datadir}/rhn/search/lib ln -s -f %{_javadir}/postgresql-jdbc.jar $RPM_BUILD_ROOT$RHN_SEARCH_BUILD_DIR/postgresql-jdbc.jar ln -s -f %{_javadir}/ongres-scram/client.jar $RPM_BUILD_ROOT$RHN_SEARCH_BUILD_DIR/ongres-scram_client.jar ln -s -f %{_javadir}/ongres-scram/common.jar $RPM_BUILD_ROOT$RHN_SEARCH_BUILD_DIR/ongres-scram_common.jar @@ -600,49 +604,49 @@ if [ -e %{_javadir}/ongres-stringprep/stringprep.jar ]; then %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-scram_common.jar %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-stringprep_stringprep.jar %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-stringprep_saslprep.jar -%{_prefix}/share/rhn/search/lib/ongres-scram_client.jar -%{_prefix}/share/rhn/search/lib/ongres-scram_common.jar -%{_prefix}/share/rhn/search/lib/ongres-stringprep_stringprep.jar -%{_prefix}/share/rhn/search/lib/ongres-stringprep_saslprep.jar +%{_datadir}/rhn/search/lib/ongres-scram_client.jar +%{_datadir}/rhn/search/lib/ongres-scram_common.jar +%{_datadir}/rhn/search/lib/ongres-stringprep_stringprep.jar +%{_datadir}/rhn/search/lib/ongres-stringprep_saslprep.jar " > .mfiles-postgresql else echo " %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-scram_client.jar %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-scram_common.jar -%{_prefix}/share/rhn/search/lib/ongres-scram_client.jar -%{_prefix}/share/rhn/search/lib/ongres-scram_common.jar +%{_datadir}/rhn/search/lib/ongres-scram_client.jar +%{_datadir}/rhn/search/lib/ongres-scram_common.jar " > .mfiles-postgresql fi # install apidoc sources -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/xml -install -m 644 build/reports/apidocs/docbook/susemanager_api_doc.xml $RPM_BUILD_ROOT%{_docdir}/%{name}/xml/susemanager_api_doc.xml -cp -R build/reports/apidocs/asciidoc/ $RPM_BUILD_ROOT%{_docdir}/%{name}/asciidoc/ +mkdir -p %{buildroot}%{_docdir}/%{name}/xml +install -m 644 build/reports/apidocs/docbook/susemanager_api_doc.xml %{buildroot}%{_docdir}/%{name}/xml/susemanager_api_doc.xml +cp -R build/reports/apidocs/asciidoc/ %{buildroot}%{_docdir}/%{name}/asciidoc/ # delete JARs which must not be deployed -rm -rf $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jspapi.jar -rm -rf $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jasper5-compiler.jar -rm -rf $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jasper5-runtime.jar -rm -rf $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/tomcat*.jar +rm -rf %{buildroot}%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jspapi.jar +rm -rf %{buildroot}%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jasper5-compiler.jar +rm -rf %{buildroot}%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jasper5-runtime.jar +rm -rf %{buildroot}%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/tomcat*.jar %if 0%{?omit_tests} > 0 -rm -rf $RPM_BUILD_ROOT%{_datadir}/rhn/lib/rhn-test.jar -rm -rf $RPM_BUILD_ROOT/classes/com/redhat/rhn/common/conf/test/conf -rm -rf $RPM_BUILD_ROOT%{_datadir}/rhn/unittest.xml +rm -rf %{buildroot}%{_datadir}/rhn/lib/rhn-test.jar +rm -rf %{buildroot}/classes/com/redhat/rhn/common/conf/test/conf +rm -rf %{buildroot}%{_datadir}/rhn/unittest.xml %endif # create log dir -mkdir -p $RPM_BUILD_ROOT%{_var}/log/rhn +mkdir -p %{buildroot}%{_var}/log/rhn # Prettifying symlinks -mv $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jboss-loggingjboss-logging.jar $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jboss-logging.jar +mv %{buildroot}%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jboss-loggingjboss-logging.jar %{buildroot}%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jboss-logging.jar # Removing unused symlinks. %if 0%{?rhel} -rm -rf $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/javamailmail.jar +rm -rf %{buildroot}%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/javamailmail.jar %endif # show all JAR symlinks echo "#### SYMLINKS START ####" -find $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib -name *.jar +find %{buildroot}%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib -name *.jar echo "#### SYMLINKS END ####" %pre -n spacewalk-taskomatic @@ -658,7 +662,7 @@ systemctl start rngd ||: %post -n spacewalk-taskomatic %if 0%{?rhel} -%systemd_post taskomatic.service +%{systemd_post} taskomatic.service %else %service_add_post taskomatic.service %endif @@ -672,32 +676,32 @@ systemctl start rngd ||: %postun -n spacewalk-taskomatic %if 0%{?rhel} -%systemd_postun taskomatic.service +%{systemd_postun} taskomatic.service %else %service_del_postun taskomatic.service %endif %post config -if [ ! -e /var/log/rhn/rhn_web_api.log ]; then - touch /var/log/rhn/rhn_web_api.log +if [ ! -e %{_localstatedir}/log/rhn/rhn_web_api.log ]; then + touch %{_localstatedir}/log/rhn/rhn_web_api.log fi -chown tomcat:%{apache_group} /var/log/rhn/rhn_web_api.log +chown tomcat:%{apache_group} %{_localstatedir}/log/rhn/rhn_web_api.log -if [ ! -e /var/log/rhn/gatherer.log ]; then - touch /var/log/rhn/gatherer.log +if [ ! -e %{_localstatedir}/log/rhn/gatherer.log ]; then + touch %{_localstatedir}/log/rhn/gatherer.log fi -chown tomcat:%{apache_group} /var/log/rhn/gatherer.log +chown tomcat:%{apache_group} %{_localstatedir}/log/rhn/gatherer.log -if [ ! -d /var/lib/salt/.ssh ]; then - mkdir -p /var/lib/salt/.ssh - chown %{salt_user_group}:%{salt_user_group} -R /var/lib/salt/.ssh - chmod 700 /var/lib/salt/.ssh +if [ ! -d %{_localstatedir}/lib/salt/.ssh ]; then + mkdir -p %{_localstatedir}/lib/salt/.ssh + chown %{salt_user_group}:%{salt_user_group} -R %{_localstatedir}/lib/salt/.ssh + chmod 700 %{_localstatedir}/lib/salt/.ssh fi if [ -e /srv/susemanager/salt/salt_ssh/mgr_ssh_id ]; then - mv /srv/susemanager/salt/salt_ssh/mgr_ssh_id /var/lib/salt/.ssh/mgr_ssh_id - cp /srv/susemanager/salt/salt_ssh/mgr_ssh_id.pub /var/lib/salt/.ssh/mgr_ssh_id.pub - chown %{salt_user_group}:%{salt_user_group} /var/lib/salt/.ssh/mgr_ssh_id.pub + mv /srv/susemanager/salt/salt_ssh/mgr_ssh_id %{_localstatedir}/lib/salt/.ssh/mgr_ssh_id + cp /srv/susemanager/salt/salt_ssh/mgr_ssh_id.pub %{_localstatedir}/lib/salt/.ssh/mgr_ssh_id.pub + chown %{salt_user_group}:%{salt_user_group} %{_localstatedir}/lib/salt/.ssh/mgr_ssh_id.pub fi %files @@ -728,7 +732,6 @@ fi %{serverdir}/tomcat/webapps/rhn/WEB-INF/pages %{serverdir}/tomcat/webapps/rhn/WEB-INF/*.xml - # all jars in WEB-INF/lib/ %dir %{serverdir}/tomcat %dir %{serverdir}/tomcat/webapps @@ -771,13 +774,13 @@ fi %files config %defattr(644,root,root,755) -%{_prefix}/share/rhn/config-defaults/rhn_hibernate.conf -%{_prefix}/share/rhn/config-defaults/rhn_reporting_hibernate.conf -%{_prefix}/share/rhn/config-defaults/rhn_taskomatic_daemon.conf +%{_datadir}/rhn/config-defaults/rhn_hibernate.conf +%{_datadir}/rhn/config-defaults/rhn_reporting_hibernate.conf +%{_datadir}/rhn/config-defaults/rhn_taskomatic_daemon.conf %config(noreplace) %{_sysconfdir}/rhn/taskomatic.conf -%{_prefix}/share/rhn/config-defaults/rhn_org_quartz.conf -%{_prefix}/share/rhn/config-defaults/rhn_java.conf -%{_prefix}/share/rhn/config-defaults/rhn_java_sso.conf +%{_datadir}/rhn/config-defaults/rhn_org_quartz.conf +%{_datadir}/rhn/config-defaults/rhn_java.conf +%{_datadir}/rhn/config-defaults/rhn_java_sso.conf %config %{_sysconfdir}/logrotate.d/rhn_web_api %config %{_sysconfdir}/logrotate.d/gatherer %dir %{_datadir}/spacewalk @@ -798,12 +801,12 @@ fi %files postgresql -f .mfiles-postgresql %defattr(644,root,root,755) -%dir %{_prefix}/share/rhn/search -%dir %{_prefix}/share/rhn/search/lib +%dir %{_datadir}/rhn/search +%dir %{_datadir}/rhn/search/lib %dir %{serverdir} %dir %{susemanagershareddir} %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/postgresql-jdbc.jar -%{_prefix}/share/rhn/search/lib/postgresql-jdbc.jar +%{_datadir}/rhn/search/lib/postgresql-jdbc.jar %defattr(644,tomcat,tomcat,775) %dir %{serverdir}/tomcat %dir %{serverdir}/tomcat/webapps diff --git a/microservices/coco-attestation/uyuni-coco-attestation.changes.releng.bump b/microservices/coco-attestation/uyuni-coco-attestation.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/microservices/coco-attestation/uyuni-coco-attestation.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/microservices/coco-attestation/uyuni-coco-attestation.spec b/microservices/coco-attestation/uyuni-coco-attestation.spec index 3e8a3875fbbd..a15a00f86c9f 100644 --- a/microservices/coco-attestation/uyuni-coco-attestation.spec +++ b/microservices/coco-attestation/uyuni-coco-attestation.spec @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: uyuni-coco-attestation -Version: 5.0.5 +Version: 5.1.0 Release: 0 Summary: Uyuni utility for Confidential Computing Attestation License: GPL-2.0-only @@ -26,16 +27,16 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: fdupes BuildRequires: java-devel >= 11 BuildRequires: maven-local -BuildRequires: mvn(org.uyuni-project:uyuni-java-parent:pom:) -BuildRequires: mvn(org.uyuni-project:uyuni-java-common) +BuildRequires: mvn(com.mchange:c3p0) +BuildRequires: mvn(com.mchange:mchange-commons-java) BuildRequires: mvn(org.apache.commons:commons-ognl) BuildRequires: mvn(org.apache.logging.log4j:log4j-api) BuildRequires: mvn(org.apache.logging.log4j:log4j-core) -BuildRequires: mvn(org.postgresql:postgresql) BuildRequires: mvn(org.javassist:javassist) BuildRequires: mvn(org.mybatis:mybatis) -BuildRequires: mvn(com.mchange:mchange-commons-java) -BuildRequires: mvn(com.mchange:c3p0) +BuildRequires: mvn(org.postgresql:postgresql) +BuildRequires: mvn(org.uyuni-project:uyuni-java-common) +BuildRequires: mvn(org.uyuni-project:uyuni-java-parent:pom:) %description System daemon used by Uyuni to validate the results of confidential computing attestation. @@ -62,7 +63,6 @@ Summary: Confidential computing SecureBoot attestation module for Uyuni %description module-secureboot Module for the Uyuni Confidential Computing Attestation for SecureBoot uses the output of mokutil. - %package javadoc Summary: API documentation for %{name} BuildArch: noarch @@ -92,63 +92,62 @@ Package containing the Javadoc API documentation for %{name}. %{mvn_build} -f %install -%mvn_install +%{mvn_install} # Install required directories -install -d -m 755 $RPM_BUILD_ROOT%{_sbindir} -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/coco-attestation/ -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/coco-attestation/classes -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/coco-attestation/conf -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/coco-attestation/lib +install -d -m 755 %{buildroot}%{_sbindir} +install -d -m 755 %{buildroot}%{_datadir}/coco-attestation/ +install -d -m 755 %{buildroot}%{_datadir}/coco-attestation/classes +install -d -m 755 %{buildroot}%{_datadir}/coco-attestation/conf +install -d -m 755 %{buildroot}%{_datadir}/coco-attestation/lib # Required files -install -p -m 755 attestation-core/src/package/coco-attestation.sh $RPM_BUILD_ROOT%{_sbindir}/coco-attestation -install -p -m 644 attestation-core/src/package/daemon.conf $RPM_BUILD_ROOT%{_prefix}/share/coco-attestation/conf -install -p -m 644 attestation-core/src/package/log4j2.xml $RPM_BUILD_ROOT%{_prefix}/share/coco-attestation/classes +install -p -m 755 attestation-core/src/package/coco-attestation.sh %{buildroot}%{_sbindir}/coco-attestation +install -p -m 644 attestation-core/src/package/daemon.conf %{buildroot}%{_datadir}/coco-attestation/conf +install -p -m 644 attestation-core/src/package/log4j2.xml %{buildroot}%{_datadir}/coco-attestation/classes # Create links for the jars -build-jar-repository -s -p $RPM_BUILD_ROOT%{_prefix}/share/coco-attestation/lib uyuni-java-common/uyuni-common log4j/log4j-api log4j/log4j-core ongres-scram ongres-stringprep postgresql-jdbc apache-commons-ognl javassist mybatis mchange-commons c3p0 +build-jar-repository -s -p %{buildroot}%{_datadir}/coco-attestation/lib uyuni-java-common/uyuni-common log4j/log4j-api log4j/log4j-core ongres-scram ongres-stringprep postgresql-jdbc apache-commons-ognl javassist mybatis mchange-commons c3p0 # Link all the attestation jars built and installed by maven -ln -s -f -r $RPM_BUILD_ROOT%{_javadir}/uyuni-coco-attestation/*.jar $RPM_BUILD_ROOT%{_prefix}/share/coco-attestation/lib +ln -s -f -r %{buildroot}%{_javadir}/uyuni-coco-attestation/*.jar %{buildroot}%{_datadir}/coco-attestation/lib %ifarch x86_64 # Install snpguest certificates cd attestation-module-snpguest/src/package/certs/ for FILE in $(find -name *.pem -type f -printf '%%P\n'); do echo $FILE - install -D -p -m 644 $FILE $RPM_BUILD_ROOT%{_prefix}/share/coco-attestation/certs/$FILE + install -D -p -m 644 $FILE %{buildroot}%{_datadir}/coco-attestation/certs/$FILE done cd - %endif %files core -f .mfiles %defattr(-,root,root) -%dir /usr/share/coco-attestation/ -%dir /usr/share/coco-attestation/conf/ -%dir /usr/share/coco-attestation/lib/ -%dir /usr/share/coco-attestation/classes/ -%{_prefix}/share/coco-attestation/lib/* +%dir %{_datadir}/coco-attestation/ +%dir %{_datadir}/coco-attestation/conf/ +%dir %{_datadir}/coco-attestation/lib/ +%dir %{_datadir}/coco-attestation/classes/ +%{_datadir}/coco-attestation/lib/* %attr(755, root, root) %{_sbindir}/coco-attestation -%{_prefix}/share/coco-attestation/conf/daemon.conf -%{_prefix}/share/coco-attestation/classes/log4j2.xml +%{_datadir}/coco-attestation/conf/daemon.conf +%{_datadir}/coco-attestation/classes/log4j2.xml %license LICENSE # Exclude all modules jars, will be part of their specific packages -%exclude %{_prefix}/share/coco-attestation/lib/attestation-module-* +%exclude %{_datadir}/coco-attestation/lib/attestation-module-* %ifarch x86_64 %files module-snpguest -f .mfiles-module-snpguest %defattr(-,root,root) -%dir /usr/share/coco-attestation/certs/ -%{_prefix}/share/coco-attestation/lib/attestation-module-snpguest.jar -%{_prefix}/share/coco-attestation/certs/* +%dir %{_datadir}/coco-attestation/certs/ +%{_datadir}/coco-attestation/lib/attestation-module-snpguest.jar +%{_datadir}/coco-attestation/certs/* %license LICENSE %endif %files module-secureboot -f .mfiles-module-secureboot -%defattr(-,root,root) -%{_prefix}/share/coco-attestation/lib/attestation-module-secureboot.jar +%{_datadir}/coco-attestation/lib/attestation-module-secureboot.jar %license LICENSE %files javadoc -f .mfiles-javadoc diff --git a/microservices/uyuni-java-common/uyuni-java-common.changes.releng.bump b/microservices/uyuni-java-common/uyuni-java-common.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/microservices/uyuni-java-common/uyuni-java-common.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/microservices/uyuni-java-common/uyuni-java-common.spec b/microservices/uyuni-java-common/uyuni-java-common.spec index ced0a4fc200e..36f1472375ad 100644 --- a/microservices/uyuni-java-common/uyuni-java-common.spec +++ b/microservices/uyuni-java-common/uyuni-java-common.spec @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: uyuni-java-common -Version: 5.0.5 +Version: 5.1.0 Release: 0 Summary: Common Java library for Uyuni Java components License: GPL-2.0-only @@ -26,11 +27,10 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: fdupes BuildRequires: java-devel >= 11 BuildRequires: maven-local -BuildRequires: mvn(org.uyuni-project:uyuni-java-parent:pom:) +BuildRequires: mvn(com.mchange:c3p0) BuildRequires: mvn(org.apache.logging.log4j:log4j-api) BuildRequires: mvn(org.mybatis:mybatis) -BuildRequires: mvn(com.mchange:c3p0) - +BuildRequires: mvn(org.uyuni-project:uyuni-java-parent:pom:) BuildArch: noarch %description @@ -49,7 +49,7 @@ Summary: API documentation for %{name} %{mvn_build} -f %install -%mvn_install +%{mvn_install} %files -f .mfiles %defattr(-,root,root) diff --git a/microservices/uyuni-java-parent/uyuni-java-parent.changes.releng.bump b/microservices/uyuni-java-parent/uyuni-java-parent.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/microservices/uyuni-java-parent/uyuni-java-parent.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/microservices/uyuni-java-parent/uyuni-java-parent.spec b/microservices/uyuni-java-parent/uyuni-java-parent.spec index f77d94388f66..3e79511245a0 100644 --- a/microservices/uyuni-java-parent/uyuni-java-parent.spec +++ b/microservices/uyuni-java-parent/uyuni-java-parent.spec @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: uyuni-java-parent -Version: 5.0.5 +Version: 5.1.0 Release: 0 Summary: Parent POM for all Uyuni Maven components License: GPL-2.0-only @@ -42,7 +43,7 @@ Package that contains the parent POM used by all Uyuni Maven components. %{mvn_build} -j %install -%mvn_install +%{mvn_install} %files -f .mfiles %defattr(-,root,root) diff --git a/projects/perl-Satcon/perl-Satcon.changes.releng.bump b/projects/perl-Satcon/perl-Satcon.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/projects/perl-Satcon/perl-Satcon.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/projects/perl-Satcon/perl-Satcon.spec b/projects/perl-Satcon/perl-Satcon.spec index caee3d6ad17d..1ddea311691e 100644 --- a/projects/perl-Satcon/perl-Satcon.spec +++ b/projects/perl-Satcon/perl-Satcon.spec @@ -20,13 +20,13 @@ %{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}} Name: perl-Satcon +Version: 5.1.0 +Release: 0 Summary: Framework for configuration files License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System -Version: 5.0.1 -Release: 1 URL: https://github.com/uyuni-project/uyuni -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz @@ -64,15 +64,15 @@ make %{?_smp_mflags} %install -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=%{buildroot} -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; +find %{buildroot} -type f -name .packlist -exec rm -f {} \; +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; -%{_fixperms} $RPM_BUILD_ROOT/* +%{_fixperms} %{buildroot}/* %check -make test +%make_build test %files %doc README diff --git a/projects/ssl-cert-check/spacewalk-ssl-cert-check.changes.releng.bump b/projects/ssl-cert-check/spacewalk-ssl-cert-check.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/projects/ssl-cert-check/spacewalk-ssl-cert-check.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec b/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec index b53294cd28d0..3b44b8536248 100644 --- a/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec +++ b/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec @@ -22,15 +22,15 @@ %endif Name: spacewalk-ssl-cert-check -Version: 5.0.1 -Release: 1 +Version: 5.1.0 +Release: 0 Summary: Check ssl certs for impending expiration License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz Source1: https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-1/projects/ssl-cert-check/%{name}-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Obsoletes: rhn-ssl-cert-check < %{version} Provides: rhn-ssl-cert-check = %{version} @@ -59,15 +59,15 @@ sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!/usr/bin/python3=' ssl-ce %install -install -d $RPM_BUILD_ROOT/etc/sysconfig/rhn -install -d $RPM_BUILD_ROOT/%{_bindir} -install -d $RPM_BUILD_ROOT%{_mandir}/man8/ +install -d %{buildroot}%{_sysconfdir}/sysconfig/rhn +install -d %{buildroot}%{_bindir} +install -d %{buildroot}%{_mandir}/man8/ install -D -m 0644 %{name}.service %{buildroot}%{_unitdir}/%{name}.service install -D -m 0644 %{name}.timer %{buildroot}%{_unitdir}/%{name}.timer -install -m644 sysconfig.ssl-cert-check $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rhn/ssl-cert-check -install -m755 timerscript.ssl-cert-check $RPM_BUILD_ROOT/%{_bindir}/ssl-cert-check-timerscript -install -m755 ssl-cert-check $RPM_BUILD_ROOT/%{_bindir}/ssl-cert-check -install -m644 ssl-cert-check.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +install -m644 sysconfig.ssl-cert-check %{buildroot}%{_sysconfdir}/sysconfig/rhn/ssl-cert-check +install -m755 timerscript.ssl-cert-check %{buildroot}%{_bindir}/ssl-cert-check-timerscript +install -m755 ssl-cert-check %{buildroot}%{_bindir}/ssl-cert-check +install -m644 ssl-cert-check.8 %{buildroot}%{_mandir}/man8/ %pre %if !0%{?rhel} @@ -76,7 +76,7 @@ install -m644 ssl-cert-check.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %post %if 0%{?rhel} -%systemd_post %{name}.timer +%{systemd_post} %{name}.timer %else %service_add_post %{name}.timer %endif diff --git a/proxy/installer/spacewalk-proxy-installer.changes.releng.bump b/proxy/installer/spacewalk-proxy-installer.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/proxy/installer/spacewalk-proxy-installer.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec index d34702a5eef7..2b5221e1c25f 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -28,14 +28,14 @@ %define pythondir %{rhnroot}/proxy-installer Name: spacewalk-proxy-installer +Version: 5.1.0 +Release: 0 Summary: Spacewalk Proxy Server Installer License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet -Version: 5.0.1 -Release: 1 URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires: firewalld @@ -87,39 +87,39 @@ Run configure-proxy.sh after installation to configure proxy. /usr/bin/gzip configure-proxy.sh.8 %install -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 -mkdir -p $RPM_BUILD_ROOT/%{_usr}/sbin -mkdir -p $RPM_BUILD_ROOT%{pythondir} -mkdir -p %{buildroot}/%{_prefix}/lib/firewalld/services - -install -m 755 -d $RPM_BUILD_ROOT%{defaultdir} -install -m 644 squid.conf $RPM_BUILD_ROOT%{defaultdir} -install -m 644 rhn.conf $RPM_BUILD_ROOT%{defaultdir} -install -m 644 cobbler-proxy.conf $RPM_BUILD_ROOT%{defaultdir} -install -m 644 insights-proxy.conf $RPM_BUILD_ROOT%{defaultdir} -install -m 755 configure-proxy.sh $RPM_BUILD_ROOT/%{_usr}/sbin -install -m 644 fetch-certificate.py $RPM_BUILD_ROOT%{pythondir} -install -m 755 spacewalk-setup-httpd $RPM_BUILD_ROOT/%{_bindir} -install -m 644 get_system_id.xslt $RPM_BUILD_ROOT%{_usr}/share/rhn/ -install -m 644 rhn-proxy-activate.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/ -install -m 644 configure-proxy.sh.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/ -install -m 0644 suse-manager-proxy.xml %{buildroot}/%{_prefix}/lib/firewalld/services +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_mandir}/man8 +mkdir -p %{buildroot}%{_usr}/sbin +mkdir -p %{buildroot}%{pythondir} +mkdir -p %{buildroot}%{_prefix}/lib/firewalld/services + +install -m 755 -d %{buildroot}%{defaultdir} +install -m 644 squid.conf %{buildroot}%{defaultdir} +install -m 644 rhn.conf %{buildroot}%{defaultdir} +install -m 644 cobbler-proxy.conf %{buildroot}%{defaultdir} +install -m 644 insights-proxy.conf %{buildroot}%{defaultdir} +install -m 755 configure-proxy.sh %{buildroot}%{_usr}/sbin +install -m 644 fetch-certificate.py %{buildroot}%{pythondir} +install -m 755 spacewalk-setup-httpd %{buildroot}%{_bindir} +install -m 644 get_system_id.xslt %{buildroot}%{_usr}/share/rhn/ +install -m 644 rhn-proxy-activate.8.gz %{buildroot}%{_mandir}/man8/ +install -m 644 configure-proxy.sh.8.gz %{buildroot}%{_mandir}/man8/ +install -m 0644 suse-manager-proxy.xml %{buildroot}%{_prefix}/lib/firewalld/services # Fixing shebang for Python 3 for i in $(find . -type f); do sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!/usr/bin/python3=' $i; done -install -m 755 rhn-proxy-activate.py $RPM_BUILD_ROOT/%{_usr}/sbin/rhn-proxy-activate +install -m 755 rhn-proxy-activate.py %{buildroot}%{_usr}/sbin/rhn-proxy-activate %check %post %if 0%{?suse_version} -if [ -f /etc/sysconfig/apache2 ]; then - sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES proxy_http - sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES headers +if [ -f %{_sysconfdir}/sysconfig/apache2 ]; then + sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES proxy_http + sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES headers fi %endif diff --git a/proxy/proxy-docs/spacewalk-proxy-docs.changes.releng.bump b/proxy/proxy-docs/spacewalk-proxy-docs.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/proxy/proxy-docs/spacewalk-proxy-docs.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/proxy/proxy-docs/spacewalk-proxy-docs.spec b/proxy/proxy-docs/spacewalk-proxy-docs.spec index 0e42c22e9ead..82d64fb9ed24 100644 --- a/proxy/proxy-docs/spacewalk-proxy-docs.spec +++ b/proxy/proxy-docs/spacewalk-proxy-docs.spec @@ -18,20 +18,20 @@ Name: spacewalk-proxy-docs +Version: 5.1.0 +Release: 0 Summary: Spacewalk Proxy Server Documentation License: OPL-1.0 +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet -Version: 5.0.1 -Release: 1 URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch BuildRequires: susemanager-advanced-topics_en-pdf BuildRequires: susemanager-reference_en-pdf BuildRequires: xerces-j2 Obsoletes: rhns-proxy-docs < 5.3.0 Provides: rhns-proxy-docs = 5.3.0 +BuildArch: noarch %description This package includes the SUSE Manager Proxy Quick Start guide @@ -45,22 +45,22 @@ User Reference guides. #nothing to do here %install -install -m 755 -d $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%_defaultdocdir/%{name} +install -m 755 -d %{buildroot} +mkdir -p %{buildroot}/%{_defaultdocdir}/%{name} for book in reference advanced-topics; do pdf="%{_datadir}/doc/manual/susemanager-${book}_en-pdf/susemanager-${book}_en.pdf" test -f $pdf && \ - cp -av $pdf $RPM_BUILD_ROOT/%_defaultdocdir/%{name}/ + cp -av $pdf %{buildroot}/%{_defaultdocdir}/%{name}/ done -install -m 644 LICENSE $RPM_BUILD_ROOT/%_defaultdocdir/%{name}/ -install -m 644 squid.conf.sample $RPM_BUILD_ROOT/%_defaultdocdir/%{name}/ +install -m 644 LICENSE %{buildroot}/%{_defaultdocdir}/%{name}/ +install -m 644 squid.conf.sample %{buildroot}/%{_defaultdocdir}/%{name}/ %files %defattr(-,root,root) -%docdir %_defaultdocdir/%{name} -%dir %_defaultdocdir/%{name} -%_defaultdocdir/%{name}/* +%docdir %{_defaultdocdir}/%{name} +%dir %{_defaultdocdir}/%{name} +%{_defaultdocdir}/%{name}/* %changelog diff --git a/proxy/proxy-html/spacewalk-proxy-html.changes.releng.bump b/proxy/proxy-html/spacewalk-proxy-html.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/proxy/proxy-html/spacewalk-proxy-html.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/proxy/proxy-html/spacewalk-proxy-html.spec b/proxy/proxy-html/spacewalk-proxy-html.spec index 96922e900930..06302313fe96 100644 --- a/proxy/proxy-html/spacewalk-proxy-html.spec +++ b/proxy/proxy-html/spacewalk-proxy-html.spec @@ -24,14 +24,14 @@ %endif Name: spacewalk-proxy-html +Version: 5.1.0 +Release: 0 Summary: The HTML component for Spacewalk Proxy License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet -Version: 5.0.1 -Release: 1 URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Obsoletes: rhns-proxy-html < 5.3.0 Provides: rhns-proxy-html = 5.3.0 @@ -41,7 +41,6 @@ Requires: httpd This package contains placeholder html pages, which the Spacewalk Server displays, if you navigate to it using your browser. - %if 0%{?sle_version} && !0%{?is_opensuse} %define proxy_dir_name suse_proxy %else @@ -55,15 +54,15 @@ displays, if you navigate to it using your browser. #nothing to do here %install -install -m 755 -d $RPM_BUILD_ROOT%{htmldir} -install -d -m 755 $RPM_BUILD_ROOT%{htmldir}/sources -install -d -m 755 %{proxy_dir_name}/sources/css $RPM_BUILD_ROOT%{htmldir}/sources/css -install -d -m 755 %{proxy_dir_name}/sources/fonts $RPM_BUILD_ROOT%{htmldir}/sources/fonts -install -d -m 755 %{proxy_dir_name}/sources/img $RPM_BUILD_ROOT%{htmldir}/sources/img -cp -pR %{proxy_dir_name}/sources/css/* $RPM_BUILD_ROOT%{htmldir}/sources/css/ -cp -pR %{proxy_dir_name}/sources/fonts/* $RPM_BUILD_ROOT%{htmldir}/sources/fonts/ -cp -pR %{proxy_dir_name}/sources/img/* $RPM_BUILD_ROOT%{htmldir}/sources/img/ -cp -pR %{proxy_dir_name}/*.html $RPM_BUILD_ROOT%{htmldir}/ +install -m 755 -d %{buildroot}%{htmldir} +install -d -m 755 %{buildroot}%{htmldir}/sources +install -d -m 755 %{proxy_dir_name}/sources/css %{buildroot}%{htmldir}/sources/css +install -d -m 755 %{proxy_dir_name}/sources/fonts %{buildroot}%{htmldir}/sources/fonts +install -d -m 755 %{proxy_dir_name}/sources/img %{buildroot}%{htmldir}/sources/img +cp -pR %{proxy_dir_name}/sources/css/* %{buildroot}%{htmldir}/sources/css/ +cp -pR %{proxy_dir_name}/sources/fonts/* %{buildroot}%{htmldir}/sources/fonts/ +cp -pR %{proxy_dir_name}/sources/img/* %{buildroot}%{htmldir}/sources/img/ +cp -pR %{proxy_dir_name}/*.html %{buildroot}%{htmldir}/ %files %defattr(-,root,root) diff --git a/proxy/proxy/spacewalk-proxy.changes.releng.bump b/proxy/proxy/spacewalk-proxy.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/proxy/proxy/spacewalk-proxy.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index 702cb730b10e..f019c9269f25 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -20,16 +20,15 @@ %{!?python3_sitelib: %global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} Name: spacewalk-proxy +Version: 5.1.0 +Release: 0 Summary: Spacewalk Proxy Server License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet -Version: 5.0.3 -Release: 0 URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3 -BuildArch: noarch Requires: httpd Requires: python3-uyuni-common-libs Requires: spacewalk-certs-tools @@ -52,12 +51,14 @@ BuildRequires: spacewalk-backend >= 1.7.24 %define apache_user apache %define apache_group apache %endif +BuildArch: noarch %description This package is never built. %package management Summary: Packages required by the Spacewalk Management Proxy +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet %if 0%{?suse_version} Requires: http_proxy @@ -74,7 +75,7 @@ Requires: httpd Requires: spacewalk-backend >= 1.7.24 %if 0%{?fedora} || 0%{?rhel} Requires: sos -Requires(preun):initscripts +Requires(preun): initscripts %endif BuildRequires: /usr/bin/docbook2man @@ -83,6 +84,7 @@ This package require all needed packages for Spacewalk Proxy Server. %package broker Summary: The Broker component for the Spacewalk Proxy Server +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Requires: httpd Requires: spacewalk-proxy-package-manager @@ -109,6 +111,7 @@ server. %package redirect Summary: The SSL Redirect component for the Spacewalk Proxy Server +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Requires: httpd Requires: spacewalk-proxy-broker = %{version}-%{release} @@ -125,6 +128,7 @@ between an Spacewalk Proxy Server and parent Spacewalk server. %package common Summary: Modules shared by Spacewalk Proxy components +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Requires(pre): uyuni-base-common BuildRequires: uyuni-base-common @@ -159,6 +163,7 @@ Spacewalk Proxy components. %package package-manager Summary: Custom Channel Package Manager for the Spacewalk Proxy Server +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Requires: mgr-push >= 4.0.0 Requires: python3 @@ -180,6 +185,7 @@ an Spacewalk Proxy Server\'s custom channel. %package salt Summary: A ZeroMQ Proxy for Salt Minions +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Requires: systemd Requires(pre): salt @@ -208,27 +214,27 @@ done install -d -m 755 %{buildroot}/%{_sysconfdir}/pki/tls/certs install -d -m 755 %{buildroot}/%{_sysconfdir}/pki/tls/private -make -f Makefile.proxy install PREFIX=$RPM_BUILD_ROOT -install -d -m 750 $RPM_BUILD_ROOT/%{_var}/cache/rhn/proxy-auth +make -f Makefile.proxy install PREFIX=%{buildroot} +install -d -m 750 %{buildroot}/%{_var}/cache/rhn/proxy-auth mkdir -p %{buildroot}/%{_sysconfdir}/slp.reg.d install -m 0644 etc/slp.reg.d/susemanagerproxy.reg %{buildroot}/%{_sysconfdir}/slp.reg.d -mkdir -p $RPM_BUILD_ROOT/%{_var}/spool/rhn-proxy/list +mkdir -p %{buildroot}/%{_var}/spool/rhn-proxy/list %if 0%{?suse_version} -mkdir -p $RPM_BUILD_ROOT/etc/apache2 -mv $RPM_BUILD_ROOT/etc/httpd/conf.d $RPM_BUILD_ROOT/%{httpdconf} -rm -rf $RPM_BUILD_ROOT/etc/httpd +mkdir -p %{buildroot}%{_sysconfdir}/apache2 +mv %{buildroot}%{_sysconfdir}/httpd/conf.d %{buildroot}/%{httpdconf} +rm -rf %{buildroot}%{_sysconfdir}/httpd %endif -touch $RPM_BUILD_ROOT/%{httpdconf}/cobbler-proxy.conf +touch %{buildroot}/%{httpdconf}/cobbler-proxy.conf -ln -sf rhn-proxy $RPM_BUILD_ROOT%{_sbindir}/spacewalk-proxy +ln -sf rhn-proxy %{buildroot}%{_sbindir}/spacewalk-proxy pushd %{buildroot} %if 0%{?suse_version} %py3_compile -O %{buildroot} %else -%py_byte_compile %{python3} %{buildroot} +%{py_byte_compile} %{python3} %{buildroot} %endif popd @@ -236,13 +242,13 @@ install -m 0750 salt-broker/salt-broker %{buildroot}/%{_bindir}/ mkdir -p %{buildroot}/%{_sysconfdir}/salt/ install -m 0644 salt-broker/broker %{buildroot}/%{_sysconfdir}/salt/ install -d -m 755 %{buildroot}/%{_unitdir}/ -%__install -D -m 444 salt-broker/salt-broker.service %{buildroot}/%{_unitdir}/salt-broker.service +install -D -m 444 salt-broker/salt-broker.service %{buildroot}/%{_unitdir}/salt-broker.service ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcsalt-broker -install -m 0755 mgr-proxy-ssh-push-init $RPM_BUILD_ROOT/%{_sbindir}/mgr-proxy-ssh-push-init -install -m 0755 mgr-proxy-ssh-force-cmd $RPM_BUILD_ROOT/%{_sbindir}/mgr-proxy-ssh-force-cmd -install -d -m 0755 $RPM_BUILD_ROOT/%{_var}/lib/spacewalk +install -m 0755 mgr-proxy-ssh-push-init %{buildroot}/%{_sbindir}/mgr-proxy-ssh-push-init +install -m 0755 mgr-proxy-ssh-force-cmd %{buildroot}/%{_sbindir}/mgr-proxy-ssh-force-cmd +install -d -m 0755 %{buildroot}/%{_var}/lib/spacewalk %check @@ -281,11 +287,11 @@ exit 0 %post common %if 0%{?suse_version} -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES wsgi -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES proxy -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES rewrite -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES version -sysconf_addword /etc/sysconfig/apache2 APACHE_SERVER_FLAGS SSL +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES wsgi +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES proxy +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES rewrite +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES version +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_SERVER_FLAGS SSL %endif %post redirect @@ -304,7 +310,7 @@ exit 0 %post salt %if 0%{?rhel} -%systemd_post salt-broker.service +%{systemd_post} salt-broker.service %else %service_add_post salt-broker.service %endif @@ -320,7 +326,7 @@ systemctl start salt-broker.service > /dev/null 2>&1 || : %postun salt %if 0%{?rhel} -%systemd_postun salt-broker.service +%{systemd_postun} salt-broker.service %else %service_del_postun salt-broker.service %endif @@ -342,9 +348,9 @@ fi %posttrans common if [ -n "$1" ] ; then # anything but uninstall - mkdir /var/cache/rhn/proxy-auth 2>/dev/null - chown %{apache_user}:root /var/cache/rhn/proxy-auth - restorecon /var/cache/rhn/proxy-auth + mkdir %{_localstatedir}/cache/rhn/proxy-auth 2>/dev/null + chown %{apache_user}:root %{_localstatedir}/cache/rhn/proxy-auth + restorecon %{_localstatedir}/cache/rhn/proxy-auth fi %files salt @@ -369,7 +375,7 @@ fi %endif %config(noreplace) %{_sysconfdir}/logrotate.d/rhn-proxy-broker # config files -%attr(644,root,%{apache_group}) %{_prefix}/share/rhn/config-defaults/rhn_proxy_broker.conf +%attr(644,root,%{apache_group}) %{_datadir}/rhn/config-defaults/rhn_proxy_broker.conf %dir %{destdir}/broker/__pycache__/ %{destdir}/broker/__pycache__/* @@ -385,7 +391,7 @@ fi %endif %config(noreplace) %{_sysconfdir}/logrotate.d/rhn-proxy-redirect # config files -%attr(644,root,%{apache_group}) %{_prefix}/share/rhn/config-defaults/rhn_proxy_redirect.conf +%attr(644,root,%{apache_group}) %{_datadir}/rhn/config-defaults/rhn_proxy_redirect.conf %dir %{destdir}/redirect %dir %{destdir}/redirect/__pycache__/ %{destdir}/redirect/__pycache__/* @@ -411,7 +417,7 @@ fi %endif # config files %attr(640,root,%{apache_group}) %config(noreplace) %{rhnconf}/rhn.conf -%attr(644,root,%{apache_group}) %{_prefix}/share/rhn/config-defaults/rhn_proxy.conf +%attr(644,root,%{apache_group}) %{_datadir}/rhn/config-defaults/rhn_proxy.conf %attr(644,root,%{apache_group}) %config %{httpdconf}/spacewalk-proxy.conf # this file is created by either cli or webui installer %ghost %config %{httpdconf}/cobbler-proxy.conf @@ -438,11 +444,11 @@ fi %files package-manager %defattr(-,root,root) # config files -%attr(644,root,%{apache_group}) %{_prefix}/share/rhn/config-defaults/rhn_proxy_package_manager.conf +%attr(644,root,%{apache_group}) %{_datadir}/rhn/config-defaults/rhn_proxy_package_manager.conf %{_bindir}/rhn_package_manager %{rhnroot}/PackageManager/rhn_package_manager.py* %{rhnroot}/PackageManager/__init__.py* -%{_mandir}/man8/rhn_package_manager.8.gz +%{_mandir}/man8/rhn_package_manager.8%{?ext_man} %dir %{rhnroot}/PackageManager %dir %{rhnroot}/PackageManager/__pycache__/ %{rhnroot}/PackageManager/__pycache__/* @@ -456,7 +462,7 @@ fi %{_sbindir}/spacewalk-proxy # mans %{_mandir}/man8/rhn-proxy.8* -%dir /usr/share/rhn +%dir %{_datadir}/rhn %dir %{_sysconfdir}/slp.reg.d %config %{_sysconfdir}/slp.reg.d/susemanagerproxy.reg diff --git a/python/billingdataservice/billing-data-service.changes.releng.bump b/python/billingdataservice/billing-data-service.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/python/billingdataservice/billing-data-service.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/python/billingdataservice/billing-data-service.spec b/python/billingdataservice/billing-data-service.spec index 2dbb50ef4c5e..00b9adcf8476 100644 --- a/python/billingdataservice/billing-data-service.spec +++ b/python/billingdataservice/billing-data-service.spec @@ -17,21 +17,20 @@ Name: billing-data-service -Version: 5.0.3 +Version: 5.1.0 Release: 0 Summary: Server to request billing information License: GPL-2.0-only Group: System/Daemons URL: https://github.com/uyuni-project/uyuni Source: %{name}-%{version}.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: apache2 -Recommends: csp-billing-adapter-service Requires: python3-Flask Requires: spacewalk-backend-sql Requires: spacewalk-taskomatic Requires: tomcat +Recommends: csp-billing-adapter-service +BuildArch: noarch %description Server to provide PAYG billing information in public clouds @@ -76,7 +75,7 @@ done %posttrans if [ -f %{_unitdir}/billing-data-service.service ]; then - /usr/bin/systemctl --quiet enable billing-data-service.service 2>&1 ||: + %{_bindir}/systemctl --quiet enable billing-data-service.service 2>&1 ||: fi %files diff --git a/python/rhn/rhnlib.changes.releng.bump b/python/rhn/rhnlib.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/python/rhn/rhnlib.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/python/rhn/rhnlib.spec b/python/rhn/rhnlib.spec index e9eec4efdd8f..1cb8421f5e3f 100644 --- a/python/rhn/rhnlib.spec +++ b/python/rhn/rhnlib.spec @@ -39,22 +39,20 @@ %global is_deb 1 %endif -Summary: Python libraries for the Spacewalk project -License: GPL-2.0-only Name: rhnlib -Version: 5.0.4 +Version: 5.1.0 Release: 0 +Summary: Python libraries for the Spacewalk project +License: GPL-2.0-only +URL: https://github.com/uyuni-project/uyuni +Source0: %{name}-%{version}.tar.gz %if "%{_vendor}" == "debbuild" Group: python Packager: Uyuni Project %else +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Development/Libraries %endif -URL: https://github.com/uyuni-project/uyuni -Source0: %{name}-%{version}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} >= 1210 BuildArch: noarch %endif @@ -66,6 +64,7 @@ rhnlib is a collection of python modules used by the Spacewalk (http://spacewalk %if 0%{?build_py2} %package -n python2-rhnlib Summary: Python libraries for the Spacewalk project +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Development/Libraries %if "%{_vendor}" != "debbuild" @@ -116,6 +115,7 @@ rhnlib is a collection of python modules used by the Spacewalk software. %if 0%{?build_py3} %package -n python3-rhnlib Summary: Python libraries for the Spacewalk project +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: python %if "%{_vendor}" != "debbuild" @@ -129,7 +129,7 @@ Requires: python3-pyOpenSSL %if "%{_vendor}" == "debbuild" BuildRequires: python3-dev BuildRequires: rpm -Requires(preun):python3-minimal +Requires(preun): python3-minimal Requires(post): python3-minimal Requires: python3-openssl %endif @@ -176,22 +176,24 @@ make -f Makefile.rhnlib PYTHON=%{__python3} %install %if 0%{?build_py2} -%{__python2} setup.py install %{!?is_deb:-O1}%{?is_deb:--no-compile -O0} --skip-build --root $RPM_BUILD_ROOT %{?is_deb:--install-layout=deb} --prefix=%{_prefix} +%{__python2} setup.py install %{!?is_deb:-O1}%{?is_deb:--no-compile -O0} --skip-build --root %{buildroot} %{?is_deb:--install-layout=deb} --prefix=%{_prefix} %endif %if 0%{?build_py3} -%{__python3} setup.py install %{!?is_deb:-O1}%{?is_deb:--no-compile -O0} --skip-build --root $RPM_BUILD_ROOT %{?is_deb:--install-layout=deb} --prefix=%{_prefix} +%{__python3} setup.py install %{!?is_deb:-O1}%{?is_deb:--no-compile -O0} --skip-build --root %{buildroot} %{?is_deb:--install-layout=deb} --prefix=%{_prefix} %endif %if 0%{?build_py2} %files -n python2-rhnlib %defattr(-,root,root) -%doc ChangeLog COPYING README TODO +%license COPYING +%doc ChangeLog README TODO %{python2_sitelib}/* %endif %if 0%{?build_py3} %files -n python3-rhnlib -%doc ChangeLog COPYING README TODO +%license COPYING +%doc ChangeLog README TODO %{python3_sitelib}/* %endif diff --git a/python/spacewalk/spacewalk-backend.changes.releng.bump b/python/spacewalk/spacewalk-backend.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/python/spacewalk/spacewalk-backend.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/python/spacewalk/spacewalk-backend.spec b/python/spacewalk/spacewalk-backend.spec index 7e79cd86c48a..662e84a8e960 100644 --- a/python/spacewalk/spacewalk-backend.spec +++ b/python/spacewalk/spacewalk-backend.spec @@ -20,7 +20,7 @@ %{!?_unitdir: %global _unitdir /lib/systemd/system} %{!?python3_sitelib: %global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%global rhnroot %{_prefix}/share/rhn +%global rhnroot %{_datadir}/rhn %global rhnconfigdefaults %{rhnroot}/config-defaults %global rhnconf %{_sysconfdir}/rhn %global m2crypto m2crypto @@ -47,14 +47,13 @@ %endif Name: spacewalk-backend +Version: 5.1.0 +Release: 0 Summary: Common programs needed to be installed on the Spacewalk servers/proxies License: GPL-2.0-only Group: System/Management -Version: 5.0.9 -Release: 0 URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if !0%{?suse_version} || 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -249,69 +248,69 @@ sed -i 's/PRODUCT_NAME = "Uyuni"/PRODUCT_NAME = "SUSE Manager"/' common/rhnConfi %endif %install -install -d $RPM_BUILD_ROOT%{rhnroot} -install -d $RPM_BUILD_ROOT%{python3rhnroot} -install -d $RPM_BUILD_ROOT%{python3rhnroot}/common -install -d $RPM_BUILD_ROOT%{rhnconf} -install -d $RPM_BUILD_ROOT/%{_unitdir} -install -d $RPM_BUILD_ROOT/%{_prefix}/lib/susemanager/bin/ - -make -f Makefile.backend install PREFIX=$RPM_BUILD_ROOT \ +install -d %{buildroot}%{rhnroot} +install -d %{buildroot}%{python3rhnroot} +install -d %{buildroot}%{python3rhnroot}/common +install -d %{buildroot}%{rhnconf} +install -d %{buildroot}/%{_unitdir} +install -d %{buildroot}%{_prefix}/lib/susemanager/bin/ + +make -f Makefile.backend install PREFIX=%{buildroot} \ MANDIR=%{_mandir} APACHECONFDIR=%{apacheconfd} PYTHON_BIN=python3 export PYTHON_MODULE_NAME=%{name} export PYTHON_MODULE_VERSION=%{version} # remove all unsupported translations -cd $RPM_BUILD_ROOT +cd %{buildroot} for d in usr/share/locale/*; do if [ ! -d "/$d" ]; then rm -rfv "./$d" fi done cd - -ln -s satellite-sync $RPM_BUILD_ROOT/usr/bin/mgr-inter-sync -ln -s satellite-sync.8.gz $RPM_BUILD_ROOT/usr/share/man/man8/mgr-inter-sync.8.gz -ln -s rhn-satellite-exporter $RPM_BUILD_ROOT/usr/bin/mgr-exporter +ln -s satellite-sync %{buildroot}%{_bindir}/mgr-inter-sync +ln -s satellite-sync.8.gz %{buildroot}%{_mandir}/man8/mgr-inter-sync.8.gz +ln -s rhn-satellite-exporter %{buildroot}%{_bindir}/mgr-exporter -install -m 644 rhn-conf/signing.cnf $RPM_BUILD_ROOT%{rhnconf}/signing.conf +install -m 644 rhn-conf/signing.cnf %{buildroot}%{rhnconf}/signing.conf -install -m 644 satellite_tools/spacewalk-diskcheck.service $RPM_BUILD_ROOT/%{_unitdir} -install -m 644 satellite_tools/spacewalk-diskcheck.timer $RPM_BUILD_ROOT/%{_unitdir} +install -m 644 satellite_tools/spacewalk-diskcheck.service %{buildroot}/%{_unitdir} +install -m 644 satellite_tools/spacewalk-diskcheck.timer %{buildroot}/%{_unitdir} -install -m 644 satellite_tools/ulnauth.py $RPM_BUILD_ROOT/%{python3rhnroot}/satellite_tools +install -m 644 satellite_tools/ulnauth.py %{buildroot}/%{python3rhnroot}/satellite_tools %find_lang %{name}-server %if 0%{?is_opensuse} || 0%{?fedora} || 0%{?rhel} -sed -i 's/^product_name.*/product_name = Uyuni/' $RPM_BUILD_ROOT%{rhnconfigdefaults}/rhn.conf +sed -i 's/^product_name.*/product_name = Uyuni/' %{buildroot}%{rhnconfigdefaults}/rhn.conf %endif -sed -i 's|#DOCUMENTROOT#|%{documentroot}|' $RPM_BUILD_ROOT%{rhnconfigdefaults}/rhn.conf -sed -i 's|#HTTPD_CONFIG_DIR#|%{apacheconfd}|' $RPM_BUILD_ROOT%{rhnconfigdefaults}/rhn.conf -sed -i 's|#HTTPD_GROUP#|%{apache_group}|' $RPM_BUILD_ROOT%{rhnconfigdefaults}/rhn.conf -sed -i 's|#HTTPD_USER#|%{apache_user}|' $RPM_BUILD_ROOT%{rhnconfigdefaults}/rhn.conf -sed -i 's|#REPORT_DB_SSLROOTCERT#|%{sslrootcert}RHN-ORG-TRUSTED-SSL-CERT|' $RPM_BUILD_ROOT%{rhnconfigdefaults}/rhn.conf +sed -i 's|#DOCUMENTROOT#|%{documentroot}|' %{buildroot}%{rhnconfigdefaults}/rhn.conf +sed -i 's|#HTTPD_CONFIG_DIR#|%{apacheconfd}|' %{buildroot}%{rhnconfigdefaults}/rhn.conf +sed -i 's|#HTTPD_GROUP#|%{apache_group}|' %{buildroot}%{rhnconfigdefaults}/rhn.conf +sed -i 's|#HTTPD_USER#|%{apache_user}|' %{buildroot}%{rhnconfigdefaults}/rhn.conf +sed -i 's|#REPORT_DB_SSLROOTCERT#|%{sslrootcert}RHN-ORG-TRUSTED-SSL-CERT|' %{buildroot}%{rhnconfigdefaults}/rhn.conf -sed -i 's/#LOGROTATE-3.8#//' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/spacewalk-backend-* -sed -i 's/@HTTPD_GROUP@/%{apache_group}/' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/spacewalk-backend-* -sed -i 's/@HTTPD_USER@/%{apache_user}/' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/spacewalk-backend-* +sed -i 's/#LOGROTATE-3.8#//' %{buildroot}%{_sysconfdir}/logrotate.d/spacewalk-backend-* +sed -i 's/@HTTPD_GROUP@/%{apache_group}/' %{buildroot}%{_sysconfdir}/logrotate.d/spacewalk-backend-* +sed -i 's/@HTTPD_USER@/%{apache_user}/' %{buildroot}%{_sysconfdir}/logrotate.d/spacewalk-backend-* %if 0%{?suse_version} %py3_compile -O %{buildroot}/%{python3rhnroot} %fdupes %{buildroot}/%{python3rhnroot} %endif -install -m 755 satellite_tools/mgr-update-pkg-extra-tags $RPM_BUILD_ROOT%{_prefix}/lib/susemanager/bin/ +install -m 755 satellite_tools/mgr-update-pkg-extra-tags %{buildroot}%{_prefix}/lib/susemanager/bin/ ## Install Zypper plugins only on SUSE machines -install -Dd -m 0750 % $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/urlresolver -%{__install} satellite_tools/spacewalk-uln-resolver $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/urlresolver/spacewalk-uln-resolver -%{__install} satellite_tools/spacewalk-extra-http-headers $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/urlresolver/spacewalk-extra-http-headers +install -Dd -m 0750 % %{buildroot}%{_prefix}/lib/zypp/plugins/urlresolver +install satellite_tools/spacewalk-uln-resolver %{buildroot}%{_prefix}/lib/zypp/plugins/urlresolver/spacewalk-uln-resolver +install satellite_tools/spacewalk-extra-http-headers %{buildroot}%{_prefix}/lib/zypp/plugins/urlresolver/spacewalk-extra-http-headers %post server %if 0%{?suse_version} -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES wsgi +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES wsgi %endif if [ ! -e %{rhnconf}/rhn.conf ]; then exit 0 @@ -324,13 +323,13 @@ fi %post tools %if 0%{?rhel} -%systemd_post spacewalk-diskcheck.service -%systemd_post spacewalk-diskcheck.timer +%{systemd_post} spacewalk-diskcheck.service +%{systemd_post} spacewalk-diskcheck.timer %else %service_add_post spacewalk-diskcheck.service spacewalk-diskcheck.timer %endif -if test -f /var/log/rhn/rhn_server_satellite.log; then - chown -f %{apache_user}:%{apache_group} /var/log/rhn/rhn_server_satellite.log +if test -f %{_localstatedir}/log/rhn/rhn_server_satellite.log; then + chown -f %{apache_user}:%{apache_group} %{_localstatedir}/log/rhn/rhn_server_satellite.log fi %preun tools @@ -343,8 +342,8 @@ fi %postun tools %if 0%{?rhel} -%systemd_postun spacewalk-diskcheck.service -%systemd_postun spacewalk-diskcheck.timer +%{systemd_postun} spacewalk-diskcheck.service +%{systemd_postun} spacewalk-diskcheck.timer %else %service_del_postun spacewalk-diskcheck.service spacewalk-diskcheck.timer %endif @@ -368,7 +367,7 @@ fi # config files %attr(644,root,%{apache_group}) %{rhnconfigdefaults}/rhn.conf %attr(755,root,root) %{_bindir}/spacewalk-cfg-get -%{_mandir}/man8/spacewalk-cfg-get.8.gz +%{_mandir}/man8/spacewalk-cfg-get.8%{?ext_man} # wsgi stuff %dir %{rhnroot}/wsgi %{rhnroot}/wsgi/__init__.py* diff --git a/python/uyuni/uyuni-common-libs.changes.releng.bump b/python/uyuni/uyuni-common-libs.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/python/uyuni/uyuni-common-libs.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/python/uyuni/uyuni-common-libs.spec b/python/uyuni/uyuni-common-libs.spec index 02ff59b1a7ad..e0f8f12c095b 100644 --- a/python/uyuni/uyuni-common-libs.spec +++ b/python/uyuni/uyuni-common-libs.spec @@ -17,7 +17,7 @@ %global debug_package %{nil} -%define __python /usr/bin/python2 +%define __python %{_bindir}/python2 %if 0%{?fedora} || 0%{?suse_version} >= 1500 || 0%{?rhel} >= 8 %{!?python3_sitelib: %global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} @@ -45,16 +45,15 @@ %global python2root %{python2_sitelib}/uyuni Name: uyuni-common-libs +Version: 5.1.0 +Release: 0 Summary: Uyuni server and client libs License: GPL-2.0-only Group: Development/Languages/Python -Version: 5.0.4 -Release: 0 URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz BuildRequires: fdupes BuildRequires: make -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Uyuni server and client libs @@ -106,18 +105,18 @@ Python 3 libraries required by both Uyuni server and client tools. %setup -q %build -make -f Makefile.common-libs all PYTHON_BIN=%{pythonX} +%make_build -f Makefile.common-libs all PYTHON_BIN=%{pythonX} %install -make -f Makefile.common-libs install PREFIX=$RPM_BUILD_ROOT \ +make -f Makefile.common-libs install PREFIX=%{buildroot} \ MANDIR=%{_mandir} PYTHON_BIN=%{pythonX} %if 0%{?build_py3} -install -d $RPM_BUILD_ROOT%{python2root}/common -cp $RPM_BUILD_ROOT%{python3root}/__init__.py \ - $RPM_BUILD_ROOT%{python2root}/ -cp $RPM_BUILD_ROOT%{python3root}/common/*.py \ - $RPM_BUILD_ROOT%{python2root}/common +install -d %{buildroot}%{python2root}/common +cp %{buildroot}%{python3root}/__init__.py \ + %{buildroot}%{python2root}/ +cp %{buildroot}%{python3root}/common/*.py \ + %{buildroot}%{python2root}/common %endif %if 0%{?suse_version} @@ -132,7 +131,7 @@ cp $RPM_BUILD_ROOT%{python3root}/common/*.py \ %endif %if !(0%{?build_py2}) -rm -Rf $RPM_BUILD_ROOT%{python2root} +rm -Rf %{buildroot}%{python2root} %endif %if 0%{?build_py2} diff --git a/rel-eng/container_push.sh b/rel-eng/container_push.sh index babf81e56af5..905a9d0632a4 100644 --- a/rel-eng/container_push.sh +++ b/rel-eng/container_push.sh @@ -30,7 +30,7 @@ PRODUCT_VERSION=$(echo ${PRODUCT_VERSION,,} | sed -r 's/ /-/g') EULA=sle-eula # Possible values: alpha, beta, released -RELEASE_STAGE=released +RELEASE_STAGE=beta if [ -f "${SRPM_PKG_DIR}/Dockerfile" ]; then NAME="${PKG_NAME%%-image}" diff --git a/reporting/spacewalk-reports.changes.releng.bump b/reporting/spacewalk-reports.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/reporting/spacewalk-reports.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec index 6b13a2e06fc1..5526ce358611 100644 --- a/reporting/spacewalk-reports.spec +++ b/reporting/spacewalk-reports.spec @@ -24,18 +24,18 @@ %define pythonX %{?build_py3:python3}%{!?build_py3:python2} Name: spacewalk-reports +Version: 5.1.0 +Release: 0 Summary: Script based reporting License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet -Version: 5.0.2 -Release: 0 URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch Requires: %{pythonX} Requires: spacewalk-branding BuildRequires: /usr/bin/docbook2man +BuildArch: noarch %description Script based reporting to retrieve data from Spacewalk server in CSV format. @@ -44,7 +44,7 @@ Script based reporting to retrieve data from Spacewalk server in CSV format. %setup -q %build -/usr/bin/docbook2man *.sgml +%{_bindir}/docbook2man *.sgml # Fixing shebang for Python 3 %if 0%{?build_py3} @@ -55,17 +55,17 @@ done %endif %install -install -d $RPM_BUILD_ROOT/%{_bindir} -install -d $RPM_BUILD_ROOT/%{_prefix}/share/spacewalk -install -d $RPM_BUILD_ROOT/%{_prefix}/share/spacewalk/reports/data -install -d $RPM_BUILD_ROOT/%{_prefix}/share/spacewalk/reports/legacy -install -d $RPM_BUILD_ROOT/%{_mandir}/man8 -install spacewalk-report $RPM_BUILD_ROOT/%{_bindir} -install reports.py $RPM_BUILD_ROOT/%{_prefix}/share/spacewalk -install -m 644 reports/data/* $RPM_BUILD_ROOT/%{_prefix}/share/spacewalk/reports/data -install -m 644 reports/legacy/* $RPM_BUILD_ROOT/%{_prefix}/share/spacewalk/reports/legacy -install *.8 $RPM_BUILD_ROOT/%{_mandir}/man8 -chmod -x $RPM_BUILD_ROOT/%{_mandir}/man8/spacewalk-report.8* +install -d %{buildroot}%{_bindir} +install -d %{buildroot}%{_datadir}/spacewalk +install -d %{buildroot}%{_datadir}/spacewalk/reports/data +install -d %{buildroot}%{_datadir}/spacewalk/reports/legacy +install -d %{buildroot}%{_mandir}/man8 +install spacewalk-report %{buildroot}%{_bindir} +install reports.py %{buildroot}%{_datadir}/spacewalk +install -m 644 reports/data/* %{buildroot}%{_datadir}/spacewalk/reports/data +install -m 644 reports/legacy/* %{buildroot}%{_datadir}/spacewalk/reports/legacy +install *.8 %{buildroot}%{_mandir}/man8 +chmod -x %{buildroot}%{_mandir}/man8/spacewalk-report.8* %files %defattr(-,root,root) @@ -74,7 +74,7 @@ chmod -x $RPM_BUILD_ROOT/%{_mandir}/man8/spacewalk-report.8* %{_datadir}/spacewalk/reports.py* %{_datadir}/spacewalk/reports %{_mandir}/man8/spacewalk-report.8* -%doc COPYING +%license COPYING %if 0%{?suse_version} %dir %{_datadir}/spacewalk %endif diff --git a/schema/reportdb/upgrade/uyuni-reportdb-schema-5.0.6-to-uyuni-reportdb-schema-5.1.0/.gitkeep b/schema/reportdb/upgrade/uyuni-reportdb-schema-5.0.6-to-uyuni-reportdb-schema-5.1.0/.gitkeep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/schema/reportdb/upgrade/uyuni-reportdb-schema-5.0.7-to-uyuni-reportdb-schema-5.1.0/.gitkeep b/schema/reportdb/upgrade/uyuni-reportdb-schema-5.0.7-to-uyuni-reportdb-schema-5.1.0/.gitkeep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/schema/reportdb/uyuni-reportdb-schema.changes.releng.bump b/schema/reportdb/uyuni-reportdb-schema.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/schema/reportdb/uyuni-reportdb-schema.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/schema/reportdb/uyuni-reportdb-schema.spec b/schema/reportdb/uyuni-reportdb-schema.spec index 997d7720f611..6af0c389d5ea 100644 --- a/schema/reportdb/uyuni-reportdb-schema.spec +++ b/schema/reportdb/uyuni-reportdb-schema.spec @@ -20,18 +20,16 @@ %{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}} Name: uyuni-reportdb-schema +Version: 5.1.0 +Release: 0 Summary: Report DB SQL schema for Spacewalk server License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet - -Version: 5.0.6 -Release: 0 +URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz Source1: https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-0/schema/reportdb/%{name}-rpmlintrc - -URL: https://github.com/uyuni-project/uyuni BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?rhel} BuildRequires: perl-File-Find @@ -60,17 +58,17 @@ uyuni-reportdb-schema is the SQL schema for the SUSE Manager server. make -f Makefile.schema SCHEMA=%{name} VERSION=%{version} RELEASE=%{release} %install -install -m 0755 -d $RPM_BUILD_ROOT%{rhnroot} -install -m 0755 -d $RPM_BUILD_ROOT%{postgres} -install -m 0644 postgres/main.sql $RPM_BUILD_ROOT%{postgres} -install -m 0644 postgres/end.sql $RPM_BUILD_ROOT%{postgres}/upgrade-end.sql +install -m 0755 -d %{buildroot}%{rhnroot} +install -m 0755 -d %{buildroot}%{postgres} +install -m 0644 postgres/main.sql %{buildroot}%{postgres} +install -m 0644 postgres/end.sql %{buildroot}%{postgres}/upgrade-end.sql -install -m 0755 -d $RPM_BUILD_ROOT%{rhnroot}/reportdb-schema-upgrade -( cd upgrade && tar cf - --exclude='*.sql' . | ( cd $RPM_BUILD_ROOT%{rhnroot}/reportdb-schema-upgrade && tar xf - ) ) +install -m 0755 -d %{buildroot}%{rhnroot}/reportdb-schema-upgrade +( cd upgrade && tar cf - --exclude='*.sql' . | ( cd %{buildroot}%{rhnroot}/reportdb-schema-upgrade && tar xf - ) ) %files %defattr(-,root,root) -%dir /usr/share/susemanager +%dir %{_datadir}/susemanager %dir %{rhnroot} %{postgres} %{rhnroot}/reportdb-schema-upgrade diff --git a/schema/spacewalk/susemanager-schema.changes.releng.bump b/schema/spacewalk/susemanager-schema.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/schema/spacewalk/susemanager-schema.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/schema/spacewalk/susemanager-schema.spec b/schema/spacewalk/susemanager-schema.spec index 930bf965681d..bd16a5f89739 100644 --- a/schema/spacewalk/susemanager-schema.spec +++ b/schema/spacewalk/susemanager-schema.spec @@ -20,19 +20,15 @@ %{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}} Name: susemanager-schema +Version: 5.1.0 +Release: 0 Summary: SQL schema for Spacewalk server License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet - -Version: 5.0.11 -Release: 0 +URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz Source1: https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-0/schema/spacewalk/%{name}-rpmlintrc - -URL: https://github.com/uyuni-project/uyuni -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: /usr/bin/pod2man BuildRequires: fdupes BuildRequires: make @@ -42,15 +38,14 @@ BuildRequires: perl(Digest::SHA) BuildRequires: perl(File::Find) Requires: %{name}-utility Requires: %{sbinpath}/restorecon - Provides: spacewalk-schema = %{version} Obsoletes: rhn-satellite-schema <= 5.1.0 - +BuildArch: noarch %if 0%{?suse_version} BuildRequires: fdupes %endif -%define rhnroot /usr/share/susemanager/db +%define rhnroot %{_datadir}/susemanager/db %define postgres %{rhnroot}/postgres %define spacewalk_folder Spacewalk %define schema_upgrade_folder %{spacewalk_folder}/SchemaUpgrade @@ -60,12 +55,13 @@ susemanager-schema is the SQL schema for the SUSE Manager server. %package sanity Summary: Schema source sanity check for Spacewalk database scripts +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet - Requires: perl(Digest::SHA) %package utility Summary: Utility used by any DB schema in Spacewalk +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet %description sanity @@ -84,39 +80,39 @@ pod2man spacewalk-schema-upgrade spacewalk-schema-upgrade.1 pod2man spacewalk-sql spacewalk-sql.1 %install -install -m 0755 -d $RPM_BUILD_ROOT%{rhnroot} -install -m 0755 -d $RPM_BUILD_ROOT%{postgres} -install -m 0644 postgres/main.sql $RPM_BUILD_ROOT%{postgres} -install -m 0644 postgres/end.sql $RPM_BUILD_ROOT%{postgres}/upgrade-end.sql -install -m 0755 -d $RPM_BUILD_ROOT%{_bindir} -install -m 0755 spacewalk-schema-upgrade $RPM_BUILD_ROOT%{_bindir} -install -m 0755 -d $RPM_BUILD_ROOT%{perl_vendorlib}/%{schema_upgrade_folder} -install -m 0755 lib/%{schema_upgrade_folder}/MainDb.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{schema_upgrade_folder} -install -m 0755 lib/%{schema_upgrade_folder}/ReportDb.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{schema_upgrade_folder} - -install -m 0755 spacewalk-sql $RPM_BUILD_ROOT%{_bindir} -install -m 0755 -d $RPM_BUILD_ROOT%{rhnroot}/schema-upgrade -( cd upgrade && tar cf - --exclude='*.sql' . | ( cd $RPM_BUILD_ROOT%{rhnroot}/schema-upgrade && tar xf - ) ) -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -cp -p spacewalk-schema-upgrade.1 $RPM_BUILD_ROOT%{_mandir}/man1 -cp -p spacewalk-sql.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0755 -d %{buildroot}%{rhnroot} +install -m 0755 -d %{buildroot}%{postgres} +install -m 0644 postgres/main.sql %{buildroot}%{postgres} +install -m 0644 postgres/end.sql %{buildroot}%{postgres}/upgrade-end.sql +install -m 0755 -d %{buildroot}%{_bindir} +install -m 0755 spacewalk-schema-upgrade %{buildroot}%{_bindir} +install -m 0755 -d %{buildroot}%{perl_vendorlib}/%{schema_upgrade_folder} +install -m 0755 lib/%{schema_upgrade_folder}/MainDb.pm %{buildroot}%{perl_vendorlib}/%{schema_upgrade_folder} +install -m 0755 lib/%{schema_upgrade_folder}/ReportDb.pm %{buildroot}%{perl_vendorlib}/%{schema_upgrade_folder} + +install -m 0755 spacewalk-sql %{buildroot}%{_bindir} +install -m 0755 -d %{buildroot}%{rhnroot}/schema-upgrade +( cd upgrade && tar cf - --exclude='*.sql' . | ( cd %{buildroot}%{rhnroot}/schema-upgrade && tar xf - ) ) +mkdir -p %{buildroot}%{_mandir}/man1 +cp -p spacewalk-schema-upgrade.1 %{buildroot}%{_mandir}/man1 +cp -p spacewalk-sql.1 %{buildroot}%{_mandir}/man1 %if 0%{?suse_version} -mkdir -p $RPM_BUILD_ROOT/usr/share/susemanager/ -install -m 0644 update-messages.txt $RPM_BUILD_ROOT/usr/share/susemanager/ +mkdir -p %{buildroot}%{_datadir}/susemanager/ +install -m 0644 update-messages.txt %{buildroot}%{_datadir}/susemanager/ %fdupes %{buildroot}/%{rhnroot} %endif -install -m 755 schema-source-sanity-check.pl $RPM_BUILD_ROOT%{_bindir}/schema-source-sanity-check.pl -install -m 755 blend $RPM_BUILD_ROOT%{_bindir}/blend +install -m 755 schema-source-sanity-check.pl %{buildroot}%{_bindir}/schema-source-sanity-check.pl +install -m 755 blend %{buildroot}%{_bindir}/blend %if 0%{?suse_version} %post if [ $1 -eq 2 ] ; then - cp /usr/share/susemanager/update-messages.txt /var/adm/update-messages/%{name}-%{version}-%{release} + cp %{_datadir}/susemanager/update-messages.txt %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} else # new install: empty messages are not shown - touch /var/adm/update-messages/%{name}-%{version}-%{release} + touch %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} fi %endif @@ -129,13 +125,13 @@ systemctl try-restart uyuni-check-database.service ||: %files %defattr(-,root,root) -%dir /usr/share/susemanager +%dir %{_datadir}/susemanager %dir %{rhnroot} %{postgres} %{rhnroot}/schema-upgrade %if 0%{?suse_version} -/usr/share/susemanager/update-messages.txt -%ghost /var/adm/update-messages/%{name}-%{version}-%{release} +%{_datadir}/susemanager/update-messages.txt +%ghost %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} %endif %files utility diff --git a/schema/spacewalk/upgrade/susemanager-schema-5.0.11-to-susemanager-schema-5.1.0/.gitkeep b/schema/spacewalk/upgrade/susemanager-schema-5.0.11-to-susemanager-schema-5.1.0/.gitkeep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/search-server/spacewalk-search/spacewalk-search.changes.releng.bump b/search-server/spacewalk-search/spacewalk-search.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/search-server/spacewalk-search/spacewalk-search.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 6a2f4e05f842..511743c701bf 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -1,7 +1,7 @@ # # spec file for package spacewalk-search # -# Copyright (c) 2022--2024 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2008-2018 Red Hat, Inc. # # All modifications and additions to the file contributed by third parties @@ -27,11 +27,12 @@ %define oro (oro or jakarta-oro) Name: spacewalk-search +Version: 5.1.0 +Release: 0 Summary: Spacewalk Full Text Search Server License: Apache-2.0 AND GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet -Version: 5.0.2 -Release: 0 # This src.rpm is cannonical upstream # You can obtain it using this set of commands # git clone https://github.com/spacewalkproject/spacewalk.git @@ -39,9 +40,6 @@ Release: 0 # make test-srpm URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - BuildRequires: %{oro} BuildRequires: ant BuildRequires: apache-commons-cli @@ -90,6 +88,7 @@ Requires: mvn(org.mybatis:mybatis) Obsoletes: rhn-search < 5.3.0 Requires: log4j BuildRequires: log4j +BuildArch: noarch %description This package contains the code for the Full Text Search Server for @@ -102,41 +101,40 @@ Spacewalk Server. %if 0%{?rhel} export JAVA_HOME=/usr/lib/jvm/java-%{java_version}-openjdk/ %endif -rm -fr ${RPM_BUILD_ROOT} ant -Djar.version=%{version} install -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/classes -install -d -m 755 $RPM_BUILD_ROOT%{_var}/lib/rhn/search -install -d -m 755 $RPM_BUILD_ROOT%{_var}/lib/rhn/search/indexes -install -d -m 755 $RPM_BUILD_ROOT%{_sbindir} -install -d -m 755 $RPM_BUILD_ROOT%{_unitdir} -install -d -m 755 $RPM_BUILD_ROOT%{_bindir} -install -d -m 755 $RPM_BUILD_ROOT%{_var}/log/rhn/search -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -install -p -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib/ +install -d -m 755 %{buildroot}%{_datadir}/rhn/config-defaults +install -d -m 755 %{buildroot}%{_datadir}/rhn/search +install -d -m 755 %{buildroot}%{_datadir}/rhn/search/lib +install -d -m 755 %{buildroot}%{_datadir}/rhn/search/classes +install -d -m 755 %{buildroot}%{_var}/lib/rhn/search +install -d -m 755 %{buildroot}%{_var}/lib/rhn/search/indexes +install -d -m 755 %{buildroot}%{_sbindir} +install -d -m 755 %{buildroot}%{_unitdir} +install -d -m 755 %{buildroot}%{_bindir} +install -d -m 755 %{buildroot}%{_var}/log/rhn/search +install -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d +install -p -m 644 dist/%{name}-%{version}.jar %{buildroot}%{_datadir}/rhn/search/lib/ # using install -m does not preserve the symlinks -cp -d lib/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/lib +cp -d lib/* %{buildroot}%{_datadir}/rhn/search/lib -install -p -m 644 src/config/etc/logrotate.d/rhn-search $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn-search -install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_sbindir} -install -p -m 644 src/config/rhn-search.service $RPM_BUILD_ROOT%{_unitdir} -install -p -m 644 src/config/search/rhn_search.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_search.conf -install -p -m 644 src/config/search/rhn_search_daemon.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_search_daemon.conf -install -p -m 644 src/config/log4j2.xml $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/classes/log4j2.xml -ln -s -f %{_prefix}/share/rhn/search/lib/spacewalk-search-%{version}.jar $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib/spacewalk-search.jar +install -p -m 644 src/config%{_sysconfdir}/logrotate.d/rhn-search %{buildroot}%{_sysconfdir}/logrotate.d/rhn-search +install -p -m 755 src/config/rhn-search %{buildroot}%{_sbindir} +install -p -m 644 src/config/rhn-search.service %{buildroot}%{_unitdir} +install -p -m 644 src/config/search/rhn_search.conf %{buildroot}%{_datadir}/rhn/config-defaults/rhn_search.conf +install -p -m 644 src/config/search/rhn_search_daemon.conf %{buildroot}%{_datadir}/rhn/config-defaults/rhn_search_daemon.conf +install -p -m 644 src/config/log4j2.xml %{buildroot}%{_datadir}/rhn/search/classes/log4j2.xml +ln -s -f %{_datadir}/rhn/search/lib/spacewalk-search-%{version}.jar %{buildroot}%{_datadir}/rhn/search/lib/spacewalk-search.jar # add rc link -mkdir -p $RPM_BUILD_ROOT/%{_sbindir}/ -ln -sf service $RPM_BUILD_ROOT/%{_sbindir}/rcrhn-search +mkdir -p %{buildroot}%{_sbindir}/ +ln -sf service %{buildroot}/%{_sbindir}/rcrhn-search # cleanup unwanted jar -rm -f $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib/junit.jar +rm -f %{buildroot}%{_datadir}/rhn/search/lib/junit.jar %post %if 0%{?rhel} -%systemd_post rhn-search.service +%{systemd_post} rhn-search.service %else %service_add_post rhn-search.service %endif @@ -163,20 +161,20 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib/junit.jar %files %defattr(644,root,root,755) %attr(755, root, root) %{_var}/log/rhn/search -%dir /usr/share/rhn/search/classes/ -%{_prefix}/share/rhn/search/lib/* +%dir %{_datadir}/rhn/search/classes/ +%{_datadir}/rhn/search/lib/* %attr(755, root, root) %{_sbindir}/rhn-search %attr(644, root, root) %{_unitdir}/rhn-search.service -%{_prefix}/share/rhn/config-defaults/rhn_search.conf -%{_prefix}/share/rhn/config-defaults/rhn_search_daemon.conf -%{_prefix}/share/rhn/search/classes/log4j2.xml +%{_datadir}/rhn/config-defaults/rhn_search.conf +%{_datadir}/rhn/config-defaults/rhn_search_daemon.conf +%{_datadir}/rhn/search/classes/log4j2.xml %{_sysconfdir}/logrotate.d/rhn-search %dir %attr(755, root, root) %{_var}/lib/rhn/search %dir %attr(755, root, root) %{_var}/lib/rhn/search/indexes %dir %attr(755, root, root) %{_var}/lib/rhn -%dir /usr/share/rhn -%dir /usr/share/rhn/search -%dir /usr/share/rhn/search/lib +%dir %{_datadir}/rhn +%dir %{_datadir}/rhn/search +%dir %{_datadir}/rhn/search/lib %if 0%{?rhel} %dir %{_var}/log/rhn %else diff --git a/spacecmd/spacecmd.changes.releng.bump b/spacecmd/spacecmd.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/spacecmd/spacecmd.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index a230d250c10f..76db02c1849f 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -40,19 +40,19 @@ %endif Name: spacecmd -Version: 5.0.9 +Version: 5.1.0 Release: 0 Summary: Command-line interface to Spacewalk and Red Hat Satellite servers License: GPL-3.0-or-later +URL: https://github.com/uyuni-project/uyuni +Source: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz %if "%{_vendor}" == "debbuild" Packager: Uyuni packagers Group: admin %else +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System %endif -URL: https://github.com/uyuni-project/uyuni -Source: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} >= 1210 || "%{_vendor}" == "debbuild" BuildArch: noarch %endif @@ -108,27 +108,27 @@ spacecmd is a command-line interface to Spacewalk and Red Hat Satellite servers # nothing to build %install -%{__mkdir_p} %{buildroot}/%{_bindir} +mkdir -p %{buildroot}%{_bindir} %if 0%{?build_py3} sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|' ./src/bin/spacecmd %endif -%{__install} -p -m0755 src/bin/spacecmd %{buildroot}/%{_bindir}/ +install -p -m0755 src/bin/spacecmd %{buildroot}%{_bindir}/ -%{__mkdir_p} %{buildroot}/%{_sysconfdir} -touch %{buildroot}/%{_sysconfdir}/spacecmd.conf +mkdir -p %{buildroot}%{_sysconfdir} +touch %{buildroot}%{_sysconfdir}/spacecmd.conf -%{__mkdir_p} %{buildroot}/%{_sysconfdir}/bash_completion.d -%{__install} -p -m0644 src/misc/spacecmd-bash-completion %{buildroot}/%{_sysconfdir}/bash_completion.d/spacecmd +mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d +install -p -m0644 src/misc/spacecmd-bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/spacecmd -%{__mkdir_p} %{buildroot}/%{python_sitelib}/spacecmd -%{__install} -p -m0644 src/spacecmd/*.py %{buildroot}/%{python_sitelib}/spacecmd/ +mkdir -p %{buildroot}%{python_sitelib}/spacecmd +install -p -m0644 src/spacecmd/*.py %{buildroot}%{python_sitelib}/spacecmd/ -%{__mkdir_p} %{buildroot}/%{_mandir}/man1 -%{__gzip} -c src/doc/spacecmd.1 > %{buildroot}/%{_mandir}/man1/spacecmd.1.gz +mkdir -p %{buildroot}%{_mandir}/man1 +gzip -c src/doc/spacecmd.1 > %{buildroot}%{_mandir}/man1/spacecmd.1.gz -touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py -%{__chmod} 0644 %{buildroot}/%{python_sitelib}/spacecmd/__init__.py +touch %{buildroot}%{python_sitelib}/spacecmd/__init__.py +chmod 0644 %{buildroot}%{python_sitelib}/spacecmd/__init__.py %if 0%{?suse_version} %if 0%{?build_py3} @@ -138,7 +138,7 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %endif %endif -make -C po install PREFIX=$RPM_BUILD_ROOT +make -C po install PREFIX=%{buildroot} %find_lang spacecmd %files -f spacecmd.lang @@ -148,7 +148,8 @@ make -C po install PREFIX=$RPM_BUILD_ROOT %ghost %config %{_sysconfdir}/spacecmd.conf %dir %{_sysconfdir}/bash_completion.d %{_sysconfdir}/bash_completion.d/spacecmd -%doc src/doc/README src/doc/COPYING -%doc %{_mandir}/man1/spacecmd.1.gz +%license src/doc/COPYING +%doc src/doc/README +%{_mandir}/man1/spacecmd.1%{?ext_man} %changelog diff --git a/spacewalk/admin/spacewalk-admin.changes.releng.bump b/spacewalk/admin/spacewalk-admin.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/spacewalk/admin/spacewalk-admin.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec index 5dd267d87182..74b5585c5d22 100644 --- a/spacewalk/admin/spacewalk-admin.spec +++ b/spacewalk/admin/spacewalk-admin.spec @@ -17,15 +17,15 @@ # +Name: spacewalk-admin +Version: 5.1.0 +Release: 0 Summary: Various utility scripts and data files for Spacewalk installations License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet -Name: spacewalk-admin URL: https://github.com/uyuni-project/uyuni -Version: 5.0.8 -Release: 0 Source0: https://github.com/uyuni-project/uyuni/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: lsof Requires: procps Requires: python3 @@ -35,12 +35,12 @@ Requires: perl(MIME::Base64) BuildRequires: /usr/bin/pod2man BuildRequires: make BuildRequires: systemd -BuildArch: noarch BuildRequires: spacewalk-config BuildRequires: uyuni-base-common Requires(pre): uyuni-base-common Requires: susemanager-schema-utility Requires: uyuni-setup-reportdb +BuildArch: noarch %description Various utility scripts and data files for Spacewalk installations. @@ -58,20 +58,20 @@ sed -i 's/apache2.service/httpd.service/g' spacewalk-wait-for-tomcat.service sed -i 's/apache2.service/httpd.service/g' uyuni-check-database.service %endif -make -f Makefile.admin install PREFIX=$RPM_BUILD_ROOT +make -f Makefile.admin install PREFIX=%{buildroot} -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/ -%{_bindir}/pod2man --section=8 rhn-config-schema.pl > $RPM_BUILD_ROOT%{_mandir}/man8/rhn-config-schema.pl.8 -%{_bindir}/pod2man --section=8 man/spacewalk-service.pod > $RPM_BUILD_ROOT%{_mandir}/man8/spacewalk-service.8 -%{_bindir}/pod2man --section=8 man/rhn-sat-restart-silent.pod > $RPM_BUILD_ROOT%{_mandir}/man8/rhn-sat-restart-silent.8 -%{_bindir}/pod2man --section=8 rhn-config-satellite.pl > $RPM_BUILD_ROOT%{_mandir}/man8/rhn-config-satellite.pl.8 -%{_bindir}/pod2man --section=8 man/rhn-deploy-ca-cert.pl.pod > $RPM_BUILD_ROOT%{_mandir}/man8/rhn-deploy-ca-cert.pl.8 -%{_bindir}/pod2man --section=8 man/rhn-install-ssl-cert.pl.pod > $RPM_BUILD_ROOT%{_mandir}/man8/rhn-install-ssl-cert.pl.8 -chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man8/*.8* +mkdir -p %{buildroot}%{_mandir}/man8/ +%{_bindir}/pod2man --section=8 rhn-config-schema.pl > %{buildroot}%{_mandir}/man8/rhn-config-schema.pl.8 +%{_bindir}/pod2man --section=8 man/spacewalk-service.pod > %{buildroot}%{_mandir}/man8/spacewalk-service.8 +%{_bindir}/pod2man --section=8 man/rhn-sat-restart-silent.pod > %{buildroot}%{_mandir}/man8/rhn-sat-restart-silent.8 +%{_bindir}/pod2man --section=8 rhn-config-satellite.pl > %{buildroot}%{_mandir}/man8/rhn-config-satellite.pl.8 +%{_bindir}/pod2man --section=8 man/rhn-deploy-ca-cert.pl.pod > %{buildroot}%{_mandir}/man8/rhn-deploy-ca-cert.pl.8 +%{_bindir}/pod2man --section=8 man/rhn-install-ssl-cert.pl.pod > %{buildroot}%{_mandir}/man8/rhn-install-ssl-cert.pl.8 +chmod 0644 %{buildroot}%{_mandir}/man8/*.8* %post -if [ -x /usr/bin/systemctl ]; then - /usr/bin/systemctl daemon-reload || : +if [ -x %{_bindir}/systemctl ]; then + %{_bindir}/systemctl daemon-reload || : fi %files diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.changes.releng.bump b/spacewalk/certs-tools/spacewalk-certs-tools.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/spacewalk/certs-tools/spacewalk-certs-tools.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec index 29a58241abf5..f9787056c4b4 100644 --- a/spacewalk/certs-tools/spacewalk-certs-tools.spec +++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec @@ -21,38 +21,38 @@ %if 0%{?suse_version} %global pub_dir /srv/www/htdocs/pub %else -%global pub_dir /var/www/html/pub +%global pub_dir %{_localstatedir}/www/html/pub %endif %global pub_bootstrap_dir %{pub_dir}/bootstrap %global rhnroot %{_datadir}/rhn -%global __python /usr/bin/python3 +%global __python %{_bindir}/python3 Name: spacewalk-certs-tools +Version: 5.1.0 +Release: 0 Summary: Spacewalk SSL Key/Cert Tool License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet -Version: 5.0.7 -Release: 0 URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/uyuni-project/uyuni/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -Requires(pre): python3-%{name} = %{version}-%{release} +BuildRequires: docbook-utils +BuildRequires: make Requires: openssl Requires: rpm-build Requires: spacewalk-base-minimal-config Requires: sudo Requires: tar -BuildRequires: docbook-utils -BuildRequires: make +Requires(post): python3-rhnlib +Requires(post): python3-rpm +Requires(post): python3-uyuni-common-libs +Requires(pre): python3-%{name} = %{version}-%{release} +BuildArch: noarch %if 0%{?suse_version} BuildRequires: filesystem Requires: susemanager-build-keys-web %endif -Requires(post): python3-uyuni-common-libs -Requires(post): python3-rhnlib -Requires(post): python3-rpm %description This package contains tools to generate the SSL certificates required by @@ -60,12 +60,13 @@ Spacewalk. %package -n python3-%{name} Summary: Spacewalk SSL Key/Cert Tool +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet +BuildRequires: python3 +BuildRequires: python3-rpm-macros Requires: %{name} = %{version}-%{release} Requires: python3-uyuni-common-libs Requires: spacewalk-backend -BuildRequires: python3 -BuildRequires: python3-rpm-macros %description -n python3-%{name} Python 3 specific files for %{name}. @@ -85,22 +86,22 @@ sed -i 's|etc/httpd/conf|etc/apache2|g' ssl-howto.txt %endif %install -install -d -m 755 $RPM_BUILD_ROOT/%{rhnroot}/certs +install -d -m 755 %{buildroot}%{rhnroot}/certs sed -i '1s|python\b|python3|' rhn-ssl-tool mgr-package-rpm-certificate-osimage rhn-bootstrap -make -f Makefile.certs install PREFIX=$RPM_BUILD_ROOT ROOT=%{rhnroot} \ +make -f Makefile.certs install PREFIX=%{buildroot} ROOT=%{rhnroot} \ PYTHONPATH=%{python3_sitelib} PYTHONVERSION=%{python3_version} \ MANDIR=%{_mandir} PUB_BOOTSTRAP_DIR=%{pub_bootstrap_dir} -ln -s rhn-ssl-tool-%{python3_version} $RPM_BUILD_ROOT%{_bindir}/rhn-ssl-tool -ln -s mgr-ssl-cert-setup-%{python3_version} $RPM_BUILD_ROOT%{_bindir}/mgr-ssl-cert-setup -ln -s rhn-bootstrap-%{python3_version} $RPM_BUILD_ROOT%{_bindir}/rhn-bootstrap -ln -s mgr-ssl-tool.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/rhn-ssl-tool.1.gz -ln -s mgr-bootstrap.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/rhn-bootstrap.1.gz +ln -s rhn-ssl-tool-%{python3_version} %{buildroot}%{_bindir}/rhn-ssl-tool +ln -s mgr-ssl-cert-setup-%{python3_version} %{buildroot}%{_bindir}/mgr-ssl-cert-setup +ln -s rhn-bootstrap-%{python3_version} %{buildroot}%{_bindir}/rhn-bootstrap +ln -s mgr-ssl-tool.1.gz %{buildroot}%{_mandir}/man1/rhn-ssl-tool.1.gz +ln -s mgr-bootstrap.1.gz %{buildroot}%{_mandir}/man1/rhn-bootstrap.1.gz -ln -s rhn-bootstrap $RPM_BUILD_ROOT/%{_bindir}/mgr-bootstrap -ln -s rhn-ssl-tool $RPM_BUILD_ROOT/%{_bindir}/mgr-ssl-tool -ln -s rhn-sudo-ssl-tool $RPM_BUILD_ROOT/%{_bindir}/mgr-sudo-ssl-tool +ln -s rhn-bootstrap %{buildroot}%{_bindir}/mgr-bootstrap +ln -s rhn-ssl-tool %{buildroot}%{_bindir}/mgr-ssl-tool +ln -s rhn-sudo-ssl-tool %{buildroot}%{_bindir}/mgr-sudo-ssl-tool %if 0%{?suse_version} %py3_compile -O %{buildroot}/%{python3_sitelib} diff --git a/spacewalk/config/spacewalk-config.changes.releng.bump b/spacewalk/config/spacewalk-config.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/spacewalk/config/spacewalk-config.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec index 61614394eb65..adf1a9ae6091 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -28,20 +28,20 @@ %endif Name: spacewalk-config +Version: 5.1.0 +Release: 0 Summary: Spacewalk Configuration License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System -Version: 5.0.4 -Release: 0 URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/uyuni-project/uyuni/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?rhel} || 0%{?fedora} Requires(post): chkconfig -Requires(preun):chkconfig +Requires(preun): chkconfig # This is for /sbin/service -Requires(preun):initscripts +Requires(preun): initscripts %endif # We need package httpd to be able to assign group apache in files section Requires(pre): %{apachepkg} @@ -67,27 +67,26 @@ echo "%{name} %{version}" > version %build %install -rm -Rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT -mv etc $RPM_BUILD_ROOT/ -mv var $RPM_BUILD_ROOT/ -mv usr $RPM_BUILD_ROOT/ +mkdir -p %{buildroot} +mv etc %{buildroot}/ +mv var %{buildroot}/ +mv usr %{buildroot}/ #TODO invert this logic: the default should be for suse, the if should contains directive for other distros %if 0%{?suse_version} export NO_BRP_STALE_LINK_ERROR=yes -mv $RPM_BUILD_ROOT/etc/httpd $RPM_BUILD_ROOT%{apacheconfdir} +mv %{buildroot}%{_sysconfdir}/httpd %{buildroot}%{apacheconfdir} %else -sed -i 's|srv/www/htdocs|var/www/html|g' $RPM_BUILD_ROOT%{apacheconfdir}/conf.d/z-public.conf -sed -i 's|/usr/share/apache2/|/usr/share/httpd/|g' $RPM_BUILD_ROOT%{apacheconfdir}/conf.d/zz-spacewalk-www.conf +sed -i 's|srv/www/htdocs|var/www/html|g' %{buildroot}%{apacheconfdir}/conf.d/z-public.conf +sed -i 's|/usr/share/apache2/|/usr/share/httpd/|g' %{buildroot}%{apacheconfdir}/conf.d/zz-spacewalk-www.conf %endif -touch $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/rhn.conf +touch %{buildroot}%{_sysconfdir}/rhn/rhn.conf -mkdir -p $RPM_BUILD_ROOT/etc/pki/tls/certs/ -mkdir -p $RPM_BUILD_ROOT/etc/pki/tls/private/ +mkdir -p %{buildroot}%{_sysconfdir}/pki/tls/certs/ +mkdir -p %{buildroot}%{_sysconfdir}/pki/tls/private/ %files %defattr(-,root,root,-) @@ -109,7 +108,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/pki/tls/private/ %attr(0750,root,%{apache_group}) %dir %{_var}/lib/rhn/rhn-satellite-prep/etc/rhn %attr(0640,root,%{apache_group}) %{_var}/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf %license LICENSE -%doc %{_mandir}/man5/rhn.conf.5* +%{_mandir}/man5/rhn.conf.5* %if 0%{?suse_version} %dir %{_sysconfdir}/pki %dir %{_sysconfdir}/pki/tls @@ -120,36 +119,24 @@ mkdir -p $RPM_BUILD_ROOT/etc/pki/tls/private/ %pre # Set the group to allow Apache to access the conf files ... -chgrp %{apache_group} /etc/rhn /etc/rhn/rhn.conf 2> /dev/null || : +chgrp %{apache_group} %{_sysconfdir}/rhn %{_sysconfdir}/rhn/rhn.conf 2> /dev/null || : # ... once we restrict access to some files that were too open in # the past. -chmod o-rwx /etc/rhn/rhn.conf* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || : +chmod o-rwx %{_sysconfdir}/rhn/rhn.conf* %{_sysconfdir}/sysconfig/rhn/backup-* %{_localstatedir}/lib/rhn/rhn-satellite-prep/* 2> /dev/null || : %post %if 0%{?suse_version} -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES version -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES proxy -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES proxy_ajp -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES proxy_wstunnel -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES rewrite -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES headers -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES xsendfile -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES filter -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES deflate -sysconf_addword /etc/sysconfig/apache2 APACHE_SERVER_FLAGS SSL -sysconf_addword /etc/sysconfig/apache2 APACHE_SERVER_FLAGS ISSUSE +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES version +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES proxy +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES proxy_ajp +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES proxy_wstunnel +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES rewrite +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES headers +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES xsendfile +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES filter +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES deflate +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_SERVER_FLAGS SSL +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_SERVER_FLAGS ISSUSE %endif -### TO-REMOVE AFTER: 2023-12-01 -if egrep -m1 "^taskomatic.com.redhat.rhn.taskomatic.task.SSHMinionActionExecutor.parallel_threads[[:space:]]*=" /etc/rhn/rhn.conf >/dev/null; then - sed -i "s/taskomatic.com.redhat.rhn.taskomatic.task.SSHMinionActionExecutor.parallel_threads[[:space:]]*=\(.\+\)/taskomatic.sshminion_action_executor.parallel_threads =\1/" /etc/rhn/rhn.conf -fi -if egrep -m1 "^taskomatic.com.redhat.rhn.taskomatic.task.MinionActionExecutor.parallel_threads[[:space:]]*=" /etc/rhn/rhn.conf >/dev/null; then - sed -i "s/taskomatic.com.redhat.rhn.taskomatic.task.MinionActionExecutor.parallel_threads[[:space:]]*=\(.\+\)/taskomatic.minion_action_executor.parallel_threads =\1/" /etc/rhn/rhn.conf -fi -if egrep -m1 "^taskomatic.com.redhat.rhn.taskomatic.task" /etc/rhn/rhn.conf >/dev/null; then - echo "WARNING: Found deprecated configuration items in /etc/rhn/rhn.conf" -fi -### END - %changelog diff --git a/spacewalk/package/spacewalk.changes.releng.bump b/spacewalk/package/spacewalk.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/spacewalk/package/spacewalk.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index e5f961613ad7..37fc4d7a0630 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -18,14 +18,14 @@ Name: spacewalk -Version: 5.0.3 +Version: 5.1.0 Release: 0 Summary: Spacewalk Systems Management Application License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet URL: https://github.com/uyuni-project/uyuni Source: https://github.com/uyuni-project/uyuni/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -34,8 +34,8 @@ inventory, provision, update and control your Linux machines. %package common Summary: Spacewalk Systems Management Application with postgresql database backend +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet - BuildRequires: python3 BuildRequires: spacewalk-backend BuildRequires: spacewalk-base-minimal-config @@ -97,6 +97,7 @@ inventory, provision, update and control your Linux machines. %package postgresql Summary: Spacewalk Systems Management Application with PostgreSQL database backend +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Requires: spacewalk-common = %{version}-%{release} Conflicts: spacewalk-oracle @@ -135,17 +136,17 @@ Version for PostgreSQL database backend. %install RDBMS="postgresql" -install -d $RPM_BUILD_ROOT/%{_sysconfdir} -install -d $RPM_BUILD_ROOT/%{_datadir}/spacewalk/setup/defaults.d +install -d %{buildroot}%{_sysconfdir} +install -d %{buildroot}%{_datadir}/spacewalk/setup/defaults.d for i in ${RDBMS} ; do - cat <$RPM_BUILD_ROOT/%{_datadir}/spacewalk/setup/defaults.d/$i-backend.conf + cat <%{buildroot}%{_datadir}/spacewalk/setup/defaults.d/$i-backend.conf # database backend to be used by spacewalk db-backend = $i EOF done -install -d $RPM_BUILD_ROOT/%{_bindir} +install -d %{buildroot}%{_bindir} %if 0%{?rhel} -ln -s /usr/pgsql-14/bin/initdb $RPM_BUILD_ROOT/%{_bindir}/initdb +ln -s %{_prefix}/pgsql-14/bin/initdb %{buildroot}%{_bindir}/initdb %endif %files common diff --git a/spacewalk/setup/spacewalk-setup.changes.releng.bump b/spacewalk/setup/spacewalk-setup.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/spacewalk/setup/spacewalk-setup.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index b0932f26423f..bb27d1679393 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -35,16 +35,15 @@ %{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}} Name: spacewalk-setup -Version: 5.0.5 +Version: 5.1.0 Release: 0 Summary: Initial setup tools for Spacewalk License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System - URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +BuildArch: noarch %if 0%{?fedora} BuildRequires: perl-interpreter %else @@ -61,7 +60,6 @@ BuildRequires: tomcat #BuildRequires: perl(Getopt::Long), perl(Pod::Usage) #BuildRequires: perl(Test::Pod::Coverage), perl(Test::Pod) -BuildArch: noarch %if 0%{?fedora} Requires: perl-interpreter %else @@ -129,8 +127,8 @@ setup tasks, re-installation, and upgrades. %setup -q %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor +%make_build # Fixing shebang for Python 3 %if 0%{?build_py3} @@ -156,72 +154,72 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w %{buildroot}/* -install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/ -install -d -m 755 %{buildroot}/%{_sysconfdir}/salt/master.d/ -install -d -m 755 %{buildroot}/%{_sysconfdir}/tomcat/conf.d/ -install -m 0755 share/embedded_diskspace_check.py %{buildroot}/%{_datadir}/spacewalk/setup/ -install -m 0644 share/mod_ssl.conf.* %{buildroot}/%{_datadir}/spacewalk/setup/ -install -m 0644 share/tomcat_java_opts.conf %{buildroot}/%{_sysconfdir}/tomcat/conf.d/ +install -d -m 755 %{buildroot}%{_datadir}/spacewalk/setup/ +install -d -m 755 %{buildroot}%{_sysconfdir}/salt/master.d/ +install -d -m 755 %{buildroot}%{_sysconfdir}/tomcat/conf.d/ +install -m 0755 share/embedded_diskspace_check.py %{buildroot}%{_datadir}/spacewalk/setup/ +install -m 0644 share/mod_ssl.conf.* %{buildroot}%{_datadir}/spacewalk/setup/ +install -m 0644 share/tomcat_java_opts.conf %{buildroot}%{_sysconfdir}/tomcat/conf.d/ %if 0%{?suse_version} -install -m 0644 share/tomcat_java_opts_suse.conf %{buildroot}/%{_sysconfdir}/tomcat/conf.d/ +install -m 0644 share/tomcat_java_opts_suse.conf %{buildroot}%{_sysconfdir}/tomcat/conf.d/ %endif -install -m 0644 share/server.xml.xsl %{buildroot}/%{_datadir}/spacewalk/setup/ -install -m 0644 share/server_update.xml.xsl %{buildroot}/%{_datadir}/spacewalk/setup/ -install -m 0644 share/add_appbase.xml.xsl %{buildroot}/%{_datadir}/spacewalk/setup/ -install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setup/ -install -m 0644 share/vhost-nossl.conf %{buildroot}/%{_datadir}/spacewalk/setup/ -install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/ -install -m 0644 share/defaults.d/defaults.conf %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/ -install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/cobbler -install -m 0644 salt/susemanager.conf %{buildroot}/%{_sysconfdir}/salt/master.d/ -install -m 0644 salt/salt-ssh-logging.conf %{buildroot}/%{_sysconfdir}/salt/master.d/ +install -m 0644 share/server.xml.xsl %{buildroot}%{_datadir}/spacewalk/setup/ +install -m 0644 share/server_update.xml.xsl %{buildroot}%{_datadir}/spacewalk/setup/ +install -m 0644 share/add_appbase.xml.xsl %{buildroot}%{_datadir}/spacewalk/setup/ +install -m 0644 share/old-jvm-list %{buildroot}%{_datadir}/spacewalk/setup/ +install -m 0644 share/vhost-nossl.conf %{buildroot}%{_datadir}/spacewalk/setup/ +install -d -m 755 %{buildroot}%{_datadir}/spacewalk/setup/defaults.d/ +install -m 0644 share/defaults.d/defaults.conf %{buildroot}%{_datadir}/spacewalk/setup/defaults.d/ +install -d -m 755 %{buildroot}%{_datadir}/spacewalk/setup/cobbler +install -m 0644 salt/susemanager.conf %{buildroot}%{_sysconfdir}/salt/master.d/ +install -m 0644 salt/salt-ssh-logging.conf %{buildroot}%{_sysconfdir}/salt/master.d/ # create a directory for misc. Spacewalk things install -d -m 755 %{buildroot}/%{misc_path}/spacewalk -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 -/usr/bin/pod2man --section=8 $RPM_BUILD_ROOT/%{_bindir}/spacewalk-make-mount-points | gzip > $RPM_BUILD_ROOT%{_mandir}/man8/spacewalk-make-mount-points.8.gz -/usr/bin/pod2man --section=1 $RPM_BUILD_ROOT/%{_bindir}/spacewalk-setup-httpd | gzip > $RPM_BUILD_ROOT%{_mandir}/man1/spacewalk-setup-httpd.1.gz +mkdir -p %{buildroot}%{_mandir}/man8 +%{_bindir}/pod2man --section=8 %{buildroot}%{_bindir}/spacewalk-make-mount-points | gzip > %{buildroot}%{_mandir}/man8/spacewalk-make-mount-points.8.gz +%{_bindir}/pod2man --section=1 %{buildroot}%{_bindir}/spacewalk-setup-httpd | gzip > %{buildroot}%{_mandir}/man1/spacewalk-setup-httpd.1.gz # Sphinx built manpage %define SPHINX_BASE_DIR %(echo %{SOURCE0}| sed -e 's/\.tar\.gz//' | sed 's@.*/@@') -install -m 0644 %{_builddir}/%{SPHINX_BASE_DIR}/out/spacewalk-cobbler-setup.1 $RPM_BUILD_ROOT%{_mandir}/man1/spacewalk-setup-cobbler.1 +install -m 0644 %{_builddir}/%{SPHINX_BASE_DIR}/out/spacewalk-cobbler-setup.1 %{buildroot}%{_mandir}/man1/spacewalk-setup-cobbler.1 # Standalone Salt formulas configuration -install -Dd -m 0755 %{buildroot}%{_prefix}/share/salt-formulas -install -Dd -m 0755 %{buildroot}%{_prefix}/share/salt-formulas/states -install -Dd -m 0755 %{buildroot}%{_prefix}/share/salt-formulas/metadata +install -Dd -m 0755 %{buildroot}%{_datadir}/salt-formulas +install -Dd -m 0755 %{buildroot}%{_datadir}/salt-formulas/states +install -Dd -m 0755 %{buildroot}%{_datadir}/salt-formulas/metadata %post if [ ! -f /etc/rhn/rhn.conf -o $(stat -c %%s "/etc/rhn/rhn.conf") -eq 0 ]; then # rhn.conf does not exists or is empty, this is new installation or update of new installation CURRENT_DATE=$(date +"%%Y-%%m-%%dT%%H:%%M:%%S.%%3N") - cp /etc/tomcat/server.xml /etc/tomcat/server.xml.$CURRENT_DATE - xsltproc %{_datadir}/spacewalk/setup/server.xml.xsl /etc/tomcat/server.xml.$CURRENT_DATE > /etc/tomcat/server.xml + cp %{_sysconfdir}/tomcat/server.xml %{_sysconfdir}/tomcat/server.xml.$CURRENT_DATE + xsltproc %{_datadir}/spacewalk/setup/server.xml.xsl %{_sysconfdir}/tomcat/server.xml.$CURRENT_DATE > %{_sysconfdir}/tomcat/server.xml fi CURRENT_DATE=$(date +"%%Y-%%m-%%dT%%H:%%M:%%S.%%3N") -cp /etc/tomcat/server.xml /etc/tomcat/server.xml.$CURRENT_DATE -xsltproc %{_datadir}/spacewalk/setup/add_appbase.xml.xsl /etc/tomcat/server.xml.$CURRENT_DATE > /etc/tomcat/server.xml +cp %{_sysconfdir}/tomcat/server.xml %{_sysconfdir}/tomcat/server.xml.$CURRENT_DATE +xsltproc %{_datadir}/spacewalk/setup/add_appbase.xml.xsl %{_sysconfdir}/tomcat/server.xml.$CURRENT_DATE > %{_sysconfdir}/tomcat/server.xml -if [ -e /etc/zypp/credentials.d/SCCcredentials ]; then - chgrp www /etc/zypp/credentials.d/SCCcredentials - chmod g+r /etc/zypp/credentials.d/SCCcredentials +if [ -e %{_sysconfdir}/zypp/credentials.d/SCCcredentials ]; then + chgrp www %{_sysconfdir}/zypp/credentials.d/SCCcredentials + chmod g+r %{_sysconfdir}/zypp/credentials.d/SCCcredentials fi -if [ -d /var/cache/salt/master/thin ]; then +if [ -d %{_localstatedir}/cache/salt/master/thin ]; then # clean the thin cache - rm -rf /var/cache/salt/master/thin + rm -rf %{_localstatedir}/cache/salt/master/thin fi -if [ -f /etc/rhn/rhn.conf ]; then +if [ -f %{_sysconfdir}/rhn/rhn.conf ]; then # Ensure all the apache configuration are present, also during upgrade - /usr/bin/spacewalk-setup-httpd + %{_bindir}/spacewalk-setup-httpd fi exit 0 %check -make test +%make_build test %files %defattr(-,root,root,-) @@ -238,9 +236,9 @@ make test %{_bindir}/spacewalk-make-mount-points %{_bindir}/spacewalk-setup-cobbler %{_mandir}/man[13]/*.[13]* -%dir %attr(0755, root, root) %{_prefix}/share/salt-formulas/ -%dir %attr(0755, root, root) %{_prefix}/share/salt-formulas/states/ -%dir %attr(0755, root, root) %{_prefix}/share/salt-formulas/metadata/ +%dir %attr(0755, root, root) %{_datadir}/salt-formulas/ +%dir %attr(0755, root, root) %{_datadir}/salt-formulas/states/ +%dir %attr(0755, root, root) %{_datadir}/salt-formulas/metadata/ %dir %{_datadir}/spacewalk %{_datadir}/spacewalk/* %attr(755, %{apache_user}, root) %{misc_path}/spacewalk diff --git a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.changes.releng.bump b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec index 16f23781ea84..890aab073a5c 100644 --- a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec +++ b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec @@ -18,15 +18,14 @@ Name: spacewalk-setup-postgresql -Version: 5.0.1 -Release: 1 +Version: 5.1.0 +Release: 0 Summary: Tools to setup embedded PostgreSQL database for Spacewalk License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %if 0%{?suse_version} # Actual version set by prjconf, default is 14 %{!?postgresql_version_min: %global postgresql_version_min 14} @@ -35,12 +34,12 @@ Requires: postgresql-contrib-implementation >= %{postgresql_version_min} Requires: postgresql-server-implementation >= %{postgresql_version_min} Conflicts: postgresql-contrib-implementation > %{postgresql_version_max} Conflicts: postgresql-server-implementation > %{postgresql_version_max} - %else Requires: postgresql-contrib >= 12 Requires: postgresql-server > 12 %endif Requires: lsof +BuildArch: noarch %description Script, which will setup PostgreSQL database for Spacewalk. @@ -51,11 +50,11 @@ Script, which will setup PostgreSQL database for Spacewalk. %build %install -install -d -m 755 %{buildroot}/%{_bindir} -install -m 0755 bin/* %{buildroot}/%{_bindir} -install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d -install -m 0644 setup/defaults.d/* %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/ -install -m 0644 setup/*.conf %{buildroot}/%{_datadir}/spacewalk/setup/ +install -d -m 755 %{buildroot}%{_bindir} +install -m 0755 bin/* %{buildroot}%{_bindir} +install -d -m 755 %{buildroot}%{_datadir}/spacewalk/setup/defaults.d +install -m 0644 setup/defaults.d/* %{buildroot}%{_datadir}/spacewalk/setup/defaults.d/ +install -m 0644 setup/*.conf %{buildroot}%{_datadir}/spacewalk/setup/ %files %defattr(-,root,root,-) diff --git a/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.changes.releng.bump b/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.spec b/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.spec index 499e16b0defe..e82a11b6463b 100644 --- a/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.spec +++ b/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.spec @@ -17,15 +17,14 @@ Name: uyuni-setup-reportdb -Version: 5.0.3 -Release: 1 +Version: 5.1.0 +Release: 0 Summary: Tools to setup PostgreSQL database as reporting DB for Uyuni and SUSE Manager License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/uyuni-project/uyuni/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %if 0%{?suse_version} # Actual version set by prjconf, default is 14 %{!?postgresql_version_min: %global postgresql_version_min 14} @@ -34,7 +33,6 @@ Requires: postgresql-contrib-implementation >= %{postgresql_version_min} Requires: postgresql-server-implementation >= %{postgresql_version_min} Conflicts: postgresql-contrib-implementation > %{postgresql_version_max} Conflicts: postgresql-server-implementation > %{postgresql_version_max} - %else Requires: postgresql-contrib >= 12 Requires: postgresql-server > 12 @@ -42,6 +40,7 @@ Requires: postgresql-server > 12 Requires: lsof Requires: susemanager-schema-utility Requires: uyuni-reportdb-schema +BuildArch: noarch %description Script, which will setup PostgreSQL database as reporting DB for Uyuni and SUSE Manager Server @@ -52,8 +51,8 @@ Script, which will setup PostgreSQL database as reporting DB for Uyuni and SUSE %build %install -install -d -m 755 %{buildroot}/%{_bindir} -install -m 0755 bin/* %{buildroot}/%{_bindir} +install -d -m 755 %{buildroot}%{_bindir} +install -m 0755 bin/* %{buildroot}%{_bindir} %files %defattr(-,root,root,-) diff --git a/susemanager-branding-oss/susemanager-branding-oss.changes.releng.bump b/susemanager-branding-oss/susemanager-branding-oss.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/susemanager-branding-oss/susemanager-branding-oss.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/susemanager-branding-oss/susemanager-branding-oss.spec b/susemanager-branding-oss/susemanager-branding-oss.spec index 8d2ea272ccd1..b9ed8d8c103b 100644 --- a/susemanager-branding-oss/susemanager-branding-oss.spec +++ b/susemanager-branding-oss/susemanager-branding-oss.spec @@ -16,30 +16,29 @@ # -%global susemanager_shared_path /usr/share/susemanager +%global susemanager_shared_path %{_datadir}/susemanager %global wwwroot %{susemanager_shared_path}/www %global wwwdocroot %{wwwroot}/htdocs - Name: susemanager-branding-oss -Version: 5.0.4 +Version: 5.1.0 Release: 0 Summary: SUSE Manager branding oss specific files License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: skelcd-EULA-suse-manager-server-container +Requires: skelcd-EULA-suse-manager-server-container +Conflicts: oracle-server +Conflicts: susemanager-branding +Provides: susemanager-branding = %{version} BuildArch: noarch # This package is not needed for Uyuni, so we do not build it if # the OS is openSUSE or anything else that is not SLE %if 0%{?is_opensuse} || (!0%{?sle_version} && !0%{?is_opensuse}) ExcludeArch: i586 x86_64 ppc64le s390x aarch64 %endif -Provides: susemanager-branding = %{version} -BuildRequires: skelcd-EULA-suse-manager-server-container -Requires: skelcd-EULA-suse-manager-server-container -Conflicts: oracle-server -Conflicts: otherproviders(susemanager-branding) %description A collection of files which are specific for @@ -49,23 +48,23 @@ SUSE Manager oss flavors. %setup -q %build -cp /usr/share/licenses/product/SUSE-Manager-Server/license.txt license.txt +cp %{_datadir}/licenses/product/SUSE-Manager-Server/license.txt license.txt echo "

" > eula.html cat license.txt | sed 's/^$/<\/p>

/' >> eula.html echo "

" >> eula.html %install -mkdir -p $RPM_BUILD_ROOT/%{wwwdocroot}/help/ -mkdir -p $RPM_BUILD_ROOT/%_defaultdocdir/susemanager/ +mkdir -p %{buildroot}%{wwwdocroot}/help/ +mkdir -p %{buildroot}/%{_defaultdocdir}/susemanager/ # final license -install -m 644 eula.html $RPM_BUILD_ROOT/%{wwwdocroot}/help/ -install -m 644 license.txt $RPM_BUILD_ROOT/%_defaultdocdir/susemanager/ +install -m 644 eula.html %{buildroot}%{wwwdocroot}/help/ +install -m 644 license.txt %{buildroot}/%{_defaultdocdir}/susemanager/ %files %defattr(-,root,root,-) -%docdir %_defaultdocdir/susemanager -%dir %_defaultdocdir/susemanager -%_defaultdocdir/susemanager/license.txt +%docdir %{_defaultdocdir}/susemanager +%dir %{_defaultdocdir}/susemanager +%{_defaultdocdir}/susemanager/license.txt %dir %{susemanager_shared_path} %dir %{wwwroot} %dir %{wwwdocroot} diff --git a/susemanager-sync-data/susemanager-sync-data.changes.releng.bump b/susemanager-sync-data/susemanager-sync-data.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/susemanager-sync-data/susemanager-sync-data.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/susemanager-sync-data/susemanager-sync-data.spec b/susemanager-sync-data/susemanager-sync-data.spec index 6328c0644913..db027aff499d 100644 --- a/susemanager-sync-data/susemanager-sync-data.spec +++ b/susemanager-sync-data/susemanager-sync-data.spec @@ -17,7 +17,7 @@ Name: susemanager-sync-data -Version: 5.0.6 +Version: 5.1.0 Release: 0 Summary: SUSE Manager specific scripts License: GPL-2.0-only @@ -25,7 +25,6 @@ Group: Productivity/Other URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz Requires: spacewalk-java-lib >= 2.5.59.7 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -37,17 +36,17 @@ This package contains data files with information used to channel syncing %build %install -mkdir -p %{buildroot}/usr/share/susemanager/scc -install -m 0644 channel_families.json %{buildroot}/usr/share/susemanager/scc/channel_families.json -install -m 0644 additional_products.json %{buildroot}/usr/share/susemanager/scc/additional_products.json -install -m 0644 additional_repositories.json %{buildroot}/usr/share/susemanager/scc/additional_repositories.json +mkdir -p %{buildroot}%{_datadir}/susemanager/scc +install -m 0644 channel_families.json %{buildroot}%{_datadir}/susemanager/scc/channel_families.json +install -m 0644 additional_products.json %{buildroot}%{_datadir}/susemanager/scc/additional_products.json +install -m 0644 additional_repositories.json %{buildroot}%{_datadir}/susemanager/scc/additional_repositories.json %files %defattr(-,root,root,-) -%dir /usr/share/susemanager -%dir /usr/share/susemanager/scc -/usr/share/susemanager/scc/channel_families.json -/usr/share/susemanager/scc/additional_products.json -/usr/share/susemanager/scc/additional_repositories.json +%dir %{_datadir}/susemanager +%dir %{_datadir}/susemanager/scc +%{_datadir}/susemanager/scc/channel_families.json +%{_datadir}/susemanager/scc/additional_products.json +%{_datadir}/susemanager/scc/additional_repositories.json %changelog diff --git a/susemanager-utils/mgr-libmod/mgr-libmod.changes.releng.bump b/susemanager-utils/mgr-libmod/mgr-libmod.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/susemanager-utils/mgr-libmod/mgr-libmod.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/susemanager-utils/mgr-libmod/mgr-libmod.spec b/susemanager-utils/mgr-libmod/mgr-libmod.spec index 0485dd81a294..f2957df4093e 100644 --- a/susemanager-utils/mgr-libmod/mgr-libmod.spec +++ b/susemanager-utils/mgr-libmod/mgr-libmod.spec @@ -17,22 +17,22 @@ Name: mgr-libmod -Version: 5.0.2 -Release: 1 +Version: 5.1.0 +Release: 0 Summary: libmod app License: MIT +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet +URL: https://github.com/uyuni-project/uyuni Source: %{name}-%{version}.tar.gz -Requires(pre): coreutils -Requires: python3-libmodulemd BuildRequires: python3-pytest BuildRequires: python3-rpm-macros +Requires: python3-libmodulemd +Requires(pre): coreutils +BuildArch: noarch %if 0%{?rhel} BuildRequires: python3-rpm-generators %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -URL: https://github.com/uyuni-project/uyuni %description mgr-libmod @@ -44,14 +44,14 @@ mgr-libmod %{__python3} setup.py build %install -%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT -mkdir -p %{buildroot}/usr/bin -cp -R scripts/* %{buildroot}/usr/bin +%{__python3} setup.py install --skip-build --root %{buildroot} +mkdir -p %{buildroot}%{_bindir} +cp -R scripts/* %{buildroot}%{_bindir} %files %defattr(-,root,root) %{python3_sitelib}/* -/usr/bin/mgr-libmod +%{_bindir}/mgr-libmod %license LICENSE %changelog diff --git a/susemanager-utils/supportutils-plugin-susemanager-client/supportutils-plugin-susemanager-client.changes.releng.bump b/susemanager-utils/supportutils-plugin-susemanager-client/supportutils-plugin-susemanager-client.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/susemanager-utils/supportutils-plugin-susemanager-client/supportutils-plugin-susemanager-client.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/susemanager-utils/supportutils-plugin-susemanager-client/supportutils-plugin-susemanager-client.spec b/susemanager-utils/supportutils-plugin-susemanager-client/supportutils-plugin-susemanager-client.spec index 07406b449750..5e740a228faa 100644 --- a/susemanager-utils/supportutils-plugin-susemanager-client/supportutils-plugin-susemanager-client.spec +++ b/susemanager-utils/supportutils-plugin-susemanager-client/supportutils-plugin-susemanager-client.spec @@ -17,19 +17,20 @@ Name: supportutils-plugin-susemanager-client -Version: 5.0.3 +Version: 5.1.0 Release: 0 -Source: %{name}-%{version}.tar.gz Summary: Supportconfig Plugin for SUSE Manager Client License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Documentation/SuSE -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +Source: %{name}-%{version}.tar.gz +URL: https://github.com/uyuni-project/uyuni BuildRequires: supportutils Requires: supportconfig-plugin-resource Requires: supportconfig-plugin-tag Supplements: packageand(salt-minion:supportutils) Supplements: packageand(spacewalk-check:supportutils) +BuildArch: noarch %description Extends supportconfig functionality to include system information for @@ -44,30 +45,26 @@ gzip -9f susemanagerclient-plugin.8 %install pwd;ls -la -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/lib/supportconfig/plugins -install -d $RPM_BUILD_ROOT/usr/share/man/man8 -install -d $RPM_BUILD_ROOT/sbin +install -d %{buildroot}%{_prefix}/lib/supportconfig/plugins +install -d %{buildroot}%{_mandir}/man8 +install -d %{buildroot}/sbin # if the new style rc file is available install the new version, otherwise the old one # Only SLE15 and newer support the new style rc file. # SLE12 and older only the old variant -if [ -e /usr/lib/supportconfig/resources/supportconfig.rc ]; then - install -m 0544 susemanagerclient $RPM_BUILD_ROOT/usr/lib/supportconfig/plugins/susemanagerclient +if [ -e %{_prefix}/lib/supportconfig/resources/supportconfig.rc ]; then + install -m 0544 susemanagerclient %{buildroot}%{_prefix}/lib/supportconfig/plugins/susemanagerclient else - install -m 0544 susemanagerclient-scplugin $RPM_BUILD_ROOT/usr/lib/supportconfig/plugins/susemanagerclient + install -m 0544 susemanagerclient-scplugin %{buildroot}%{_prefix}/lib/supportconfig/plugins/susemanagerclient fi -install -m 0644 susemanagerclient-plugin.8.gz $RPM_BUILD_ROOT/usr/share/man/man8/susemanagerclient-plugin.8.gz +install -m 0644 susemanagerclient-plugin.8.gz %{buildroot}%{_mandir}/man8/susemanagerclient-plugin.8.gz %files %defattr(-,root,root) -%doc COPYING.GPLv2 -/usr/lib/supportconfig -/usr/lib/supportconfig/plugins -/usr/lib/supportconfig/plugins/susemanagerclient -/usr/share/man/man8/susemanagerclient-plugin.8.gz - -%clean -rm -rf $RPM_BUILD_ROOT +%license COPYING.GPLv2 +%{_prefix}/lib/supportconfig +%{_prefix}/lib/supportconfig/plugins +%{_prefix}/lib/supportconfig/plugins/susemanagerclient +%{_mandir}/man8/susemanagerclient-plugin.8%{?ext_man} %changelog diff --git a/susemanager-utils/supportutils-plugin-susemanager-proxy/supportutils-plugin-susemanager-proxy.changes.releng.bump b/susemanager-utils/supportutils-plugin-susemanager-proxy/supportutils-plugin-susemanager-proxy.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/susemanager-utils/supportutils-plugin-susemanager-proxy/supportutils-plugin-susemanager-proxy.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/susemanager-utils/supportutils-plugin-susemanager-proxy/supportutils-plugin-susemanager-proxy.spec b/susemanager-utils/supportutils-plugin-susemanager-proxy/supportutils-plugin-susemanager-proxy.spec index 8fa3d626ceb5..8c1d129c5966 100644 --- a/susemanager-utils/supportutils-plugin-susemanager-proxy/supportutils-plugin-susemanager-proxy.spec +++ b/susemanager-utils/supportutils-plugin-susemanager-proxy/supportutils-plugin-susemanager-proxy.spec @@ -17,18 +17,19 @@ Name: supportutils-plugin-susemanager-proxy -Version: 5.0.2 -Release: 1 -Source: %{name}-%{version}.tar.gz +Version: 5.1.0 +Release: 0 Summary: Supportconfig Plugin for SUSE Manager Proxy License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Documentation/SuSE -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +Source: %{name}-%{version}.tar.gz +URL: https://github.com/uyuni-project/uyuni Requires: spacewalk-proxy-common Requires: supportconfig-plugin-resource Requires: supportconfig-plugin-tag Supplements: packageand(spacewalk-proxy-installer:supportutils) +BuildArch: noarch %description Extends supportconfig functionality to include system information about @@ -43,22 +44,18 @@ gzip -9f susemanagerproxy-plugin.8 %install pwd;ls -la -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/lib/supportconfig/plugins -install -d $RPM_BUILD_ROOT/usr/share/man/man8 -install -d $RPM_BUILD_ROOT/sbin -install -m 0544 susemanagerproxy $RPM_BUILD_ROOT/usr/lib/supportconfig/plugins -install -m 0644 susemanagerproxy-plugin.8.gz $RPM_BUILD_ROOT/usr/share/man/man8/susemanagerproxy-plugin.8.gz +install -d %{buildroot}%{_prefix}/lib/supportconfig/plugins +install -d %{buildroot}%{_mandir}/man8 +install -d %{buildroot}/sbin +install -m 0544 susemanagerproxy %{buildroot}%{_prefix}/lib/supportconfig/plugins +install -m 0644 susemanagerproxy-plugin.8.gz %{buildroot}%{_mandir}/man8/susemanagerproxy-plugin.8.gz %files %defattr(-,root,root) -%doc COPYING.GPLv2 -/usr/lib/supportconfig -/usr/lib/supportconfig/plugins -/usr/lib/supportconfig/plugins/susemanagerproxy -/usr/share/man/man8/susemanagerproxy-plugin.8.gz - -%clean -rm -rf $RPM_BUILD_ROOT +%license COPYING.GPLv2 +%{_prefix}/lib/supportconfig +%{_prefix}/lib/supportconfig/plugins +%{_prefix}/lib/supportconfig/plugins/susemanagerproxy +%{_mandir}/man8/susemanagerproxy-plugin.8%{?ext_man} %changelog diff --git a/susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.changes.releng.bump b/susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.spec b/susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.spec index a47236946930..ad9d8b5e70ae 100644 --- a/susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.spec +++ b/susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.spec @@ -17,19 +17,20 @@ Name: supportutils-plugin-susemanager -Version: 5.0.3 -Release: 1 -Source: %{name}-%{version}.tar.gz +Version: 5.1.0 +Release: 0 Summary: Supportconfig Plugin for SUSE Manager License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Documentation/SuSE -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +Source: %{name}-%{version}.tar.gz +URL: https://github.com/uyuni-project/uyuni Requires: supportconfig-plugin-resource Requires: supportconfig-plugin-tag Requires: susemanager Requires: perl(XML::Simple) Supplements: packageand(spacewalk-common:supportutils) +BuildArch: noarch %description Extends supportconfig functionality to include system information about @@ -43,29 +44,25 @@ gzip -9f susemanager-plugin.8 %install pwd;ls -la -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/lib/supportconfig/plugins -install -d $RPM_BUILD_ROOT/usr/share/man/man8 -install -d $RPM_BUILD_ROOT/sbin -install -d $RPM_BUILD_ROOT/usr/lib/susemanager/bin/ -install -m 0544 supportconfig-sumalog $RPM_BUILD_ROOT/sbin -install -m 0544 susemanager-connection-check.pl $RPM_BUILD_ROOT/usr/lib/susemanager/bin/susemanager-connection-check -install -m 0544 susemanager $RPM_BUILD_ROOT/usr/lib/supportconfig/plugins -install -m 0644 susemanager-plugin.8.gz $RPM_BUILD_ROOT/usr/share/man/man8/susemanager-plugin.8.gz +install -d %{buildroot}%{_prefix}/lib/supportconfig/plugins +install -d %{buildroot}%{_mandir}/man8 +install -d %{buildroot}/sbin +install -d %{buildroot}%{_prefix}/lib/susemanager/bin/ +install -m 0544 supportconfig-sumalog %{buildroot}/sbin +install -m 0544 susemanager-connection-check.pl %{buildroot}%{_prefix}/lib/susemanager/bin/susemanager-connection-check +install -m 0544 susemanager %{buildroot}%{_prefix}/lib/supportconfig/plugins +install -m 0644 susemanager-plugin.8.gz %{buildroot}%{_mandir}/man8/susemanager-plugin.8.gz %files %defattr(-,root,root) -%doc COPYING.GPLv2 -%dir /usr/lib/susemanager -%dir /usr/lib/susemanager/bin +%license COPYING.GPLv2 +%dir %{_prefix}/lib/susemanager +%dir %{_prefix}/lib/susemanager/bin /sbin/supportconfig-sumalog -/usr/lib/susemanager/bin/susemanager-connection-check -/usr/lib/supportconfig -/usr/lib/supportconfig/plugins -/usr/lib/supportconfig/plugins/susemanager -/usr/share/man/man8/susemanager-plugin.8.gz - -%clean -rm -rf $RPM_BUILD_ROOT +%{_prefix}/lib/susemanager/bin/susemanager-connection-check +%{_prefix}/lib/supportconfig +%{_prefix}/lib/supportconfig/plugins +%{_prefix}/lib/supportconfig/plugins/susemanager +%{_mandir}/man8/susemanager-plugin.8%{?ext_man} %changelog diff --git a/susemanager-utils/susemanager-sls/susemanager-sls.changes.releng.bump b/susemanager-utils/susemanager-sls/susemanager-sls.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/susemanager-utils/susemanager-sls/susemanager-sls.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/susemanager-utils/susemanager-sls/susemanager-sls.spec b/susemanager-utils/susemanager-sls/susemanager-sls.spec index 366ed7da13b6..db20dc3f4c02 100644 --- a/susemanager-utils/susemanager-sls/susemanager-sls.spec +++ b/susemanager-utils/susemanager-sls/susemanager-sls.spec @@ -30,10 +30,11 @@ %endif Name: susemanager-sls -Version: 5.0.10 +Version: 5.1.0 Release: 0 Summary: Static Salt state files for SUSE Manager License: Apache-2.0 AND LGPL-2.1-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Source: %{name}-%{version}.tar.gz Source1: https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-0/susemanager-utils/susemanager-sls/%{name}-rpmlintrc @@ -52,7 +53,6 @@ BuildRequires: python-pytest BuildRequires: python-salt Requires: python-PyYAML >= 5.1 %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -61,6 +61,7 @@ provided for the integration between infrastructure components. %package -n uyuni-config-modules Summary: Salt modules to configure a Server +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet %description -n uyuni-config-modules @@ -73,48 +74,48 @@ to configure a SUSE Manager or Uyuni Server. %build %install -mkdir -p %{buildroot}/usr/share/susemanager/salt/_grains -mkdir -p %{buildroot}/usr/share/susemanager/salt/_beacons -mkdir -p %{buildroot}/usr/share/susemanager/salt/_modules -mkdir -p %{buildroot}/usr/share/susemanager/salt/_states -mkdir -p %{buildroot}/usr/share/susemanager/salt-ssh -mkdir -p %{buildroot}/usr/share/susemanager/modules/pillar -mkdir -p %{buildroot}/usr/share/susemanager/modules/tops -mkdir -p %{buildroot}/usr/share/susemanager/modules/runners -mkdir -p %{buildroot}/usr/share/susemanager/modules/engines -mkdir -p %{buildroot}/usr/share/susemanager/modules/roster -mkdir -p %{buildroot}/usr/share/susemanager/pillar_data -mkdir -p %{buildroot}/usr/share/susemanager/formulas -mkdir -p %{buildroot}/usr/share/susemanager/formulas/metadata -mkdir -p %{buildroot}/usr/share/susemanager/reactor -mkdir -p %{buildroot}/usr/share/susemanager/scap +mkdir -p %{buildroot}%{_datadir}/susemanager/salt/_grains +mkdir -p %{buildroot}%{_datadir}/susemanager/salt/_beacons +mkdir -p %{buildroot}%{_datadir}/susemanager/salt/_modules +mkdir -p %{buildroot}%{_datadir}/susemanager/salt/_states +mkdir -p %{buildroot}%{_datadir}/susemanager/salt-ssh +mkdir -p %{buildroot}%{_datadir}/susemanager/modules/pillar +mkdir -p %{buildroot}%{_datadir}/susemanager/modules/tops +mkdir -p %{buildroot}%{_datadir}/susemanager/modules/runners +mkdir -p %{buildroot}%{_datadir}/susemanager/modules/engines +mkdir -p %{buildroot}%{_datadir}/susemanager/modules/roster +mkdir -p %{buildroot}%{_datadir}/susemanager/pillar_data +mkdir -p %{buildroot}%{_datadir}/susemanager/formulas +mkdir -p %{buildroot}%{_datadir}/susemanager/formulas/metadata +mkdir -p %{buildroot}%{_datadir}/susemanager/reactor +mkdir -p %{buildroot}%{_datadir}/susemanager/scap mkdir -p %{buildroot}/srv/formula_metadata -cp -R salt/* %{buildroot}/usr/share/susemanager/salt -cp -R salt-ssh/* %{buildroot}/usr/share/susemanager/salt-ssh -cp -R modules/pillar/* %{buildroot}/usr/share/susemanager/modules/pillar -cp -R modules/tops/* %{buildroot}/usr/share/susemanager/modules/tops -cp -R modules/runners/* %{buildroot}/usr/share/susemanager/modules/runners -cp -R modules/engines/* %{buildroot}/usr/share/susemanager/modules/engines -cp -R modules/roster/* %{buildroot}/usr/share/susemanager/modules/roster -cp -R formulas/* %{buildroot}/usr/share/susemanager/formulas +cp -R salt/* %{buildroot}%{_datadir}/susemanager/salt +cp -R salt-ssh/* %{buildroot}%{_datadir}/susemanager/salt-ssh +cp -R modules/pillar/* %{buildroot}%{_datadir}/susemanager/modules/pillar +cp -R modules/tops/* %{buildroot}%{_datadir}/susemanager/modules/tops +cp -R modules/runners/* %{buildroot}%{_datadir}/susemanager/modules/runners +cp -R modules/engines/* %{buildroot}%{_datadir}/susemanager/modules/engines +cp -R modules/roster/* %{buildroot}%{_datadir}/susemanager/modules/roster +cp -R formulas/* %{buildroot}%{_datadir}/susemanager/formulas cp -R formula_metadata/* %{buildroot}/srv/formula_metadata -cp -R reactor/* %{buildroot}/usr/share/susemanager/reactor -cp -R scap/* %{buildroot}/usr/share/susemanager/scap +cp -R reactor/* %{buildroot}%{_datadir}/susemanager/reactor +cp -R scap/* %{buildroot}%{_datadir}/susemanager/scap # Manually install Python part to already prepared structure -cp src/beacons/*.py %{buildroot}/usr/share/susemanager/salt/_beacons -cp src/grains/*.py %{buildroot}/usr/share/susemanager/salt/_grains/ -rm %{buildroot}/usr/share/susemanager/salt/_grains/__init__.py -cp src/modules/*.py %{buildroot}/usr/share/susemanager/salt/_modules -rm %{buildroot}/usr/share/susemanager/salt/_modules/__init__.py -cp src/states/*.py %{buildroot}/usr/share/susemanager/salt/_states -rm %{buildroot}/usr/share/susemanager/salt/_states/__init__.py +cp src/beacons/*.py %{buildroot}%{_datadir}/susemanager/salt/_beacons +cp src/grains/*.py %{buildroot}%{_datadir}/susemanager/salt/_grains/ +rm %{buildroot}%{_datadir}/susemanager/salt/_grains/__init__.py +cp src/modules/*.py %{buildroot}%{_datadir}/susemanager/salt/_modules +rm %{buildroot}%{_datadir}/susemanager/salt/_modules/__init__.py +cp src/states/*.py %{buildroot}%{_datadir}/susemanager/salt/_states +rm %{buildroot}%{_datadir}/susemanager/salt/_states/__init__.py # Install doc, examples -mkdir -p %{buildroot}/usr/share/doc/packages/uyuni-config-modules/examples/ldap -cp src/doc/* %{buildroot}/usr/share/doc/packages/uyuni-config-modules/ -cp src/examples/uyuni_config_hardcode.sls %{buildroot}/usr/share/doc/packages/uyuni-config-modules/examples -cp src/examples/ldap/* %{buildroot}/usr/share/doc/packages/uyuni-config-modules/examples/ldap +mkdir -p %{buildroot}%{_docdir}/uyuni-config-modules/examples/ldap +cp src/doc/* %{buildroot}%{_docdir}/uyuni-config-modules/ +cp src/examples/uyuni_config_hardcode.sls %{buildroot}%{_docdir}/uyuni-config-modules/examples +cp src/examples/ldap/* %{buildroot}%{_docdir}/uyuni-config-modules/examples/ldap %check cd test @@ -125,66 +126,66 @@ py.test%{?rhel:-3} # Check that SLS files don't contain any call to "module.run" which has # been replaced by "mgrcompat.module_run" calls. -! grep --include "*.sls" -r "module\.run" %{buildroot}/usr/share/susemanager/salt || exit 1 +! grep --include "*.sls" -r "module\.run" %{buildroot}%{_datadir}/susemanager/salt || exit 1 %pre # change /usr/share/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT # from symlink into a real file -if [ -L /usr/share/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT ]; then - rm -f /usr/share/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT - if [ -f /etc/pki/trust/anchors/LOCAL-RHN-ORG-TRUSTED-SSL-CERT ]; then - cp /etc/pki/trust/anchors/LOCAL-RHN-ORG-TRUSTED-SSL-CERT \ - /usr/share/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT - elif [ -f /etc/pki/ca-trust/source/anchors/RHN-ORG-TRUSTED-SSL-CERT ]; then - cp /etc/pki/ca-trust/source/anchors/RHN-ORG-TRUSTED-SSL-CERT \ - /usr/share/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT +if [ -L %{_datadir}/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT ]; then + rm -f %{_datadir}/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT + if [ -f %{_sysconfdir}/pki/trust/anchors/LOCAL-RHN-ORG-TRUSTED-SSL-CERT ]; then + cp %{_sysconfdir}/pki/trust/anchors/LOCAL-RHN-ORG-TRUSTED-SSL-CERT \ + %{_datadir}/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT + elif [ -f %{_sysconfdir}/pki/ca-trust/source/anchors/RHN-ORG-TRUSTED-SSL-CERT ]; then + cp %{_sysconfdir}/pki/ca-trust/source/anchors/RHN-ORG-TRUSTED-SSL-CERT \ + %{_datadir}/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT fi fi %post # when uyuni roster module has changed, we need to remove the cache -rm -f /var/cache/salt/master/roster/uyuni/minions.p +rm -f %{_localstatedir}/cache/salt/master/roster/uyuni/minions.p # this will be filled with content when a certificate gets deployed -if [ ! -e /usr/share/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT ]; then - touch /usr/share/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT +if [ ! -e %{_datadir}/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT ]; then + touch %{_datadir}/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT fi %posttrans # Run JMX exporter as Java Agent (bsc#1184617) -grep -q 'prometheus_monitoring_enabled\s*=\s*1\s*$' /etc/rhn/rhn.conf +grep -q 'prometheus_monitoring_enabled\s*=\s*1\s*$' %{_sysconfdir}/rhn/rhn.conf if [[ $? == 0 ]]; then - /usr/sbin/mgr-monitoring-ctl enable + %{_sbindir}/mgr-monitoring-ctl enable fi %files %defattr(-,root,root) -%dir /usr/share/susemanager -/usr/share/susemanager/salt -/usr/share/susemanager/salt-ssh -/usr/share/susemanager/pillar_data -/usr/share/susemanager/modules -/usr/share/susemanager/modules/pillar -/usr/share/susemanager/modules/tops -/usr/share/susemanager/modules/runners -/usr/share/susemanager/modules/engines -/usr/share/susemanager/modules/roster -/usr/share/susemanager/formulas -/usr/share/susemanager/reactor -/usr/share/susemanager/scap +%dir %{_datadir}/susemanager +%{_datadir}/susemanager/salt +%{_datadir}/susemanager/salt-ssh +%{_datadir}/susemanager/pillar_data +%{_datadir}/susemanager/modules +%{_datadir}/susemanager/modules/pillar +%{_datadir}/susemanager/modules/tops +%{_datadir}/susemanager/modules/runners +%{_datadir}/susemanager/modules/engines +%{_datadir}/susemanager/modules/roster +%{_datadir}/susemanager/formulas +%{_datadir}/susemanager/reactor +%{_datadir}/susemanager/scap /srv/formula_metadata -%exclude /usr/share/susemanager/salt/_modules/uyuni_config.py -%exclude /usr/share/susemanager/salt/_states/uyuni_config.py -%ghost /usr/share/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT +%exclude %{_datadir}/susemanager/salt/_modules/uyuni_config.py +%exclude %{_datadir}/susemanager/salt/_states/uyuni_config.py +%ghost %{_datadir}/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT %files -n uyuni-config-modules %defattr(-,root,root) -%dir /usr/share/susemanager -/usr/share/susemanager/salt/_modules/uyuni_config.py -/usr/share/susemanager/salt/_states/uyuni_config.py -%dir /usr/share/doc/packages/uyuni-config-modules -%doc /usr/share/doc/packages/uyuni-config-modules/* -%doc /usr/share/doc/packages/uyuni-config-modules/examples/* -%doc /usr/share/doc/packages/uyuni-config-modules/examples/ldap/* +%dir %{_datadir}/susemanager +%{_datadir}/susemanager/salt/_modules/uyuni_config.py +%{_datadir}/susemanager/salt/_states/uyuni_config.py +%dir %{_docdir}/uyuni-config-modules +%doc %{_docdir}/uyuni-config-modules/* +%doc %{_docdir}/uyuni-config-modules/examples/* +%doc %{_docdir}/uyuni-config-modules/examples/ldap/* %changelog diff --git a/susemanager/susemanager.changes.releng.bump b/susemanager/susemanager.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/susemanager/susemanager.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/susemanager/susemanager.spec b/susemanager/susemanager.spec index 3a11d4a11173..91b399a50bb8 100644 --- a/susemanager/susemanager.spec +++ b/susemanager/susemanager.spec @@ -48,14 +48,14 @@ %global debug_package %{nil} Name: susemanager -Version: 5.0.9 +Version: 5.1.0 Release: 0 Summary: SUSE Manager specific scripts License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildArch: noarch - not noarch because of ifarch usage!!!! %if 0%{?rhel} @@ -100,7 +100,7 @@ Requires: cobbler Requires: openslp-server Requires: spacewalk-admin Requires: spacewalk-setup -%ifarch %ix86 x86_64 +%ifarch %{ix86} x86_64 Requires: syslinux %endif %ifarch s390x ppc64le @@ -137,11 +137,11 @@ Summary: SUSE Manager Tools Group: Productivity/Other %if 0%{?build_py3} +BuildRequires: python3-configobj Requires: createrepo_c Requires: python3 Requires: python3-configobj Requires: python3-uyuni-common-libs -BuildRequires: python3-configobj %else Requires: createrepo Requires: python @@ -195,16 +195,16 @@ install -m 0755 bin/* %{buildroot}/%{_prefix}/lib/susemanager/bin/ ln -s mgr-setup %{buildroot}/%{_prefix}/lib/susemanager/bin/migration.sh ln -s pg-migrate-94-to-96.sh %{buildroot}/%{_prefix}/lib/susemanager/bin/pg-migrate.sh -mkdir -p %{buildroot}/%{_prefix}/share/rhn/config-defaults +mkdir -p %{buildroot}/%{_datadir}/rhn/config-defaults mkdir -p %{buildroot}/%{_sysconfdir}/slp.reg.d mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d -install -m 0644 rhn-conf/rhn_server_susemanager.conf %{buildroot}/%{_prefix}/share/rhn/config-defaults +install -m 0644 rhn-conf/rhn_server_susemanager.conf %{buildroot}/%{_datadir}/rhn/config-defaults install -m 0644 etc/logrotate.d/susemanager-tools %{buildroot}/%{_sysconfdir}/logrotate.d install -m 0644 etc/slp.reg.d/susemanager.reg %{buildroot}/%{_sysconfdir}/slp.reg.d -make -C src install PREFIX=$RPM_BUILD_ROOT PYTHON_BIN=%{pythonX} MANDIR=%{_mandir} +make -C src install PREFIX=%{buildroot} PYTHON_BIN=%{pythonX} MANDIR=%{_mandir} install -d -m 755 %{buildroot}/%{wwwroot}/os-images/ -mkdir -p %{buildroot}/etc/apache2/conf.d -install empty-repo.conf %{buildroot}/etc/apache2/conf.d/empty-repo.conf +mkdir -p %{buildroot}%{_sysconfdir}/apache2/conf.d +install empty-repo.conf %{buildroot}%{_sysconfdir}/apache2/conf.d/empty-repo.conf # empty repo for rhel base channels mkdir -p %{buildroot}%{reporoot}/repositories/ @@ -217,7 +217,7 @@ cp -r pub/empty-deb %{buildroot}%{reporoot}/repositories/ mkdir -p %{buildroot}%{_datadir}/YaST2/clients mkdir -p %{buildroot}%{_datadir}/YaST2/scrconf mkdir -p %{buildroot}%{_datadir}/applications/YaST2 -mkdir -p %{buildroot}/etc/YaST2 +mkdir -p %{buildroot}%{_sysconfdir}/YaST2 install -m 0644 yast/*.rb %{buildroot}%{_datadir}/YaST2/clients install -m 0644 yast/*.scr %{buildroot}%{_datadir}/YaST2/scrconf %if 0%{?is_opensuse} @@ -239,7 +239,7 @@ install -m 0644 etc/firewalld/services/suse-manager-server.xml %{buildroot}/%{_s rm -f %{buildroot}/%{_prefix}/lib/susemanager/bin/server-migrator.sh %endif -make -C po install PREFIX=$RPM_BUILD_ROOT +make -C po install PREFIX=%{buildroot} %find_lang susemanager @@ -249,40 +249,40 @@ make -C po install PREFIX=$RPM_BUILD_ROOT %check # we need to build a fake python dir. python did not work with # two site-package/spacewalk dirs having different content -mkdir -p /var/tmp/fakepython/spacewalk -cp -a %{python_sitelib}/spacewalk/* /var/tmp/fakepython/spacewalk/ -cp -a %{buildroot}%{python_sitelib}/spacewalk/* /var/tmp/fakepython/spacewalk/ -export PYTHONPATH=/var/tmp/fakepython/:%{_datadir}/rhn +mkdir -p %{_localstatedir}/tmp/fakepython/spacewalk +cp -a %{python_sitelib}/spacewalk/* %{_localstatedir}/tmp/fakepython/spacewalk/ +cp -a %{buildroot}%{python_sitelib}/spacewalk/* %{_localstatedir}/tmp/fakepython/spacewalk/ +export PYTHONPATH=%{_localstatedir}/tmp/fakepython/:%{_datadir}/rhn make -f Makefile.susemanager PYTHON_BIN=%{pythonX} unittest unset PYTHONPATH -rm -rf /var/tmp/fakepython +rm -rf %{_localstatedir}/tmp/fakepython %if !0%{?build_py3} pushd %{buildroot} -find -name '*.py' -print0 | xargs -0 python %py_libdir/py_compile.py +find -name '*.py' -print0 | xargs -0 python %{py_libdir}/py_compile.py popd %endif %post %if !0%{?suse_version} -sed -i 's/su wwwrun www/su apache apache/' /etc/logrotate.d/susemanager-tools +sed -i 's/su wwwrun www/su apache apache/' %{_sysconfdir}/logrotate.d/susemanager-tools %endif %posttrans %postun %if 0%{?suse_version} -%{insserv_cleanup} +%insserv_cleanup %endif # Cleanup sed -i '/You can access .* via https:\/\//d' /tmp/motd 2> /dev/null ||: %files -f susemanager.lang %defattr(-,root,root,-) -%doc COPYING +%license COPYING %dir %{_prefix}/lib/susemanager %dir %{_prefix}/lib/susemanager/bin/ %dir %{_prefix}/lib/susemanager/hooks/ -%dir /etc/YaST2 +%dir %{_sysconfdir}/YaST2 %dir %{_datadir}/YaST2 %dir %{_datadir}/YaST2/clients %dir %{_datadir}/YaST2/scrconf @@ -308,7 +308,7 @@ sed -i '/You can access .* via https:\/\//d' /tmp/motd 2> /dev/null ||: %defattr(-,root,root,-) %dir %{pythonsmroot} %dir %{pythonsmroot}/susemanager -%dir %{_prefix}/share/rhn/ +%dir %{_datadir}/rhn/ %dir %{_datadir}/susemanager %dir %{wwwroot} %dir %{sharedwwwroot} @@ -317,10 +317,10 @@ sed -i '/You can access .* via https:\/\//d' /tmp/motd 2> /dev/null ||: %dir %{reporoot}/repositories/empty %dir %{reporoot}/repositories/empty/repodata %dir %{reporoot}/repositories/empty-deb -%dir /etc/apache2 -%dir /etc/apache2/conf.d +%dir %{_sysconfdir}/apache2 +%dir %{_sysconfdir}/apache2/conf.d %config(noreplace) %{_sysconfdir}/logrotate.d/susemanager-tools -%{_prefix}/share/rhn/config-defaults/rhn_*.conf +%{_datadir}/rhn/config-defaults/rhn_*.conf %attr(0755,root,root) %{_bindir}/mgr-salt-ssh %attr(0755,root,root) %{_sbindir}/mgr-clean-old-patchnames %attr(0755,root,root) %{_sbindir}/mgr-create-bootstrap-repo @@ -344,7 +344,7 @@ sed -i '/You can access .* via https:\/\//d' /tmp/motd 2> /dev/null ||: %{reporoot}/repositories/empty/repodata/*.xml* %{reporoot}/repositories/empty-deb/Packages %{reporoot}/repositories/empty-deb/Release -/etc/apache2/conf.d/empty-repo.conf +%{_sysconfdir}/apache2/conf.d/empty-repo.conf %files bash-completion %{_datadir}/bash-completion/completions/mgr-sync diff --git a/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.changes.releng.bump b/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.spec b/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.spec index 7f23d8a78992..9217e467fb96 100644 --- a/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.spec +++ b/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.spec @@ -17,28 +17,28 @@ Name: susemanager-tftpsync-recv -Version: 5.0.1 -Release: 1 +Version: 5.1.0 +Release: 0 Summary: Reciever for SUSE Manager tftp sync License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: uyuni-base-common +Requires: (apache2-mod_wsgi or python3-mod_wsgi) +Requires: python3 +Requires: spacewalk-backend +Requires: spacewalk-proxy-common +Requires(pre): coreutils +Requires(pre): tftp +Requires(pre): uyuni-base-common BuildArch: noarch %if 0%{?suse_version} Requires(pre): apache2 %else Requires(pre): httpd %endif -Requires(pre): tftp -Requires: python3 -Requires: spacewalk-backend -Requires: spacewalk-proxy-common -Requires: (apache2-mod_wsgi or python3-mod_wsgi) -Requires(pre): coreutils -BuildRequires: uyuni-base-common -Requires(pre): uyuni-base-common %description Use SUSE Manager Proxy as installation server. Provide the capability @@ -59,13 +59,13 @@ install -p -D -m 755 configure-tftpsync.sh %{buildroot}%{_sbindir}/configure-tft install -p -D -m 644 rhn_tftpsync.conf %{buildroot}/%{_datadir}/rhn/config-defaults/rhn_tftpsync.conf %post -sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES wsgi +sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES wsgi if [ -d /srv/tftpboot ]; then chmod 750 /srv/tftpboot chown wwwrun:tftp /srv/tftpboot fi -if [ -f /etc/apache2/conf.d/susemanager-tftpsync-recv.conf.rpmnew ]; then - PARENT_FQDN=$( egrep -m1 "^proxy.rhn_parent[[:space:]]*=" /etc/rhn/rhn.conf | sed 's/^proxy.rhn_parent[[:space:]]*=[[:space:]]*\(.*\)/\1/' || echo "" ) +if [ -f %{_sysconfdir}/apache2/conf.d/susemanager-tftpsync-recv.conf.rpmnew ]; then + PARENT_FQDN=$( grep -E -m1 "^proxy.rhn_parent[[:space:]]*=" %{_sysconfdir}/rhn/rhn.conf | sed 's/^proxy.rhn_parent[[:space:]]*=[[:space:]]*\(.*\)/\1/' || echo "" ) if [ -z "$PARENT_FQDN" ]; then echo "Could not determine SUSE Manager Parent Hostname! Got /etc/rhn/rhn.conf vanished?" >&2; exit 1; @@ -73,10 +73,10 @@ if [ -f /etc/apache2/conf.d/susemanager-tftpsync-recv.conf.rpmnew ]; then SUMA_IP=$(getent hosts $PARENT_FQDN | awk '{ print $1 }' || echo "") - sed -i "s/^[[:space:]]*Allow from[[:space:]].*$/ Allow from $SUMA_IP/" /etc/apache2/conf.d/susemanager-tftpsync-recv.conf.rpmnew - sed -i "s/^[[:space:]#]*Require ip[[:space:]].*$/ Require ip $SUMA_IP/" /etc/apache2/conf.d/susemanager-tftpsync-recv.conf.rpmnew + sed -i "s/^[[:space:]]*Allow from[[:space:]].*$/ Allow from $SUMA_IP/" %{_sysconfdir}/apache2/conf.d/susemanager-tftpsync-recv.conf.rpmnew + sed -i "s/^[[:space:]#]*Require ip[[:space:]].*$/ Require ip $SUMA_IP/" %{_sysconfdir}/apache2/conf.d/susemanager-tftpsync-recv.conf.rpmnew - mv /etc/apache2/conf.d/susemanager-tftpsync-recv.conf.rpmnew /etc/apache2/conf.d/susemanager-tftpsync-recv.conf + mv %{_sysconfdir}/apache2/conf.d/susemanager-tftpsync-recv.conf.rpmnew %{_sysconfdir}/apache2/conf.d/susemanager-tftpsync-recv.conf fi %files @@ -85,9 +85,10 @@ fi %config(noreplace) %{_sysconfdir}/apache2/conf.d/susemanager-tftpsync-recv.conf %defattr(-,root,root,-) -%doc answers.txt COPYING README +%license COPYING +%doc answers.txt README %dir /srv/www/tftpsync -%dir /%{_datadir}/rhn +%dir %{_datadir}/rhn /srv/www/tftpsync/add /srv/www/tftpsync/delete %{_sbindir}/configure-tftpsync.sh diff --git a/tftpsync/susemanager-tftpsync/susemanager-tftpsync.changes.releng.bump b/tftpsync/susemanager-tftpsync/susemanager-tftpsync.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/tftpsync/susemanager-tftpsync/susemanager-tftpsync.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/tftpsync/susemanager-tftpsync/susemanager-tftpsync.spec b/tftpsync/susemanager-tftpsync/susemanager-tftpsync.spec index a5d1126b5d25..8ad6248a82c9 100644 --- a/tftpsync/susemanager-tftpsync/susemanager-tftpsync.spec +++ b/tftpsync/susemanager-tftpsync/susemanager-tftpsync.spec @@ -17,34 +17,31 @@ %global debug_package %{nil} - %if 0%{?suse_version} > 1320 || 0%{?rhel} # SLE15 builds on Python 3 %global build_py3 1 %endif %define pythonX %{?build_py3:python3}%{!?build_py3:python2} %define python_sitelib %(%{pythonX} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") - Name: susemanager-tftpsync -Version: 5.0.1 -Release: 1 +Version: 5.1.0 +Release: 0 Summary: Sync cobbler created tftp enviroment to SUSE Manager Proxies License: LGPL-2.1-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/System URL: https://github.com/uyuni-project/uyuni Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -Requires(pre): cobbler BuildRequires: cobbler +Requires(pre): cobbler %if 0%{?build_py3} +BuildRequires: python3-devel Requires: python3 Requires: python3-six -BuildRequires: python3-devel %else +BuildRequires: python-devel Requires: python Requires: python-six -BuildRequires: python-devel %endif %description @@ -80,7 +77,8 @@ install -p -D -m 755 configure-tftpsync.sh %{buildroot}%{_sbindir}/configure-tf %files %defattr(-,root,root,-) -%doc COPYING.LIB README +%license COPYING.LIB +%doc README %{python_sitelib}/cobbler/modules/sync_post_tftpd_proxies.py* %{python_sitelib}/cobbler/MultipartPostHandler.py* %{_sbindir}/configure-tftpsync.sh diff --git a/utils/spacewalk-utils.changes.releng.bump b/utils/spacewalk-utils.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/utils/spacewalk-utils.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index d01bc70a3975..493d2ca67382 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -18,22 +18,21 @@ Name: spacewalk-utils -Version: 5.0.4 +Version: 5.1.0 Release: 0 Summary: Utilities that may be run against a SUSE Manager/Uyuni server License: GPL-2.0-only AND GPL-3.0-or-later Group: Productivity/Other URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch BuildRequires: docbook-utils BuildRequires: fdupes BuildRequires: make BuildRequires: python3 BuildRequires: python3-rpm-macros BuildRequires: uyuni-base-common - +# Required by depsolver.py +Requires: (python3-PyYAML or python3-pyyaml) # Required by spacewalk-hostname-rename Requires: bash # Required by spacewalk-hostname-rename @@ -41,16 +40,8 @@ Requires: cobbler # Required by spacewalk-hostname-rename Requires: iproute # Required by spacewalk-hostname-rename -%if 0%{?suse_version} -Requires: perl = %{perl_version} -%else -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -%endif -# Required by spacewalk-hostname-rename Requires: perl-Satcon # Required by depsolver.py -Requires: (python3-PyYAML or python3-pyyaml) -# Required by depsolver.py Requires: python3-solv # Required by depsolver.py, cloneByDate.py, spacewalk-common-channels Requires: python3-uyuni-common-libs @@ -76,6 +67,12 @@ Requires: spacewalk-setup Requires: susemanager-schema # Required by cloneByDate.py, depsolver.py,spacewalk-clone-by-date Requires(pre): uyuni-base-common +BuildArch: noarch +%if 0%{?suse_version} +Requires: perl = %{perl_version} +%else +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +%endif %description Utilities that may be run against a SUSE Manager server (supported) or an Uyuni server @@ -85,12 +82,12 @@ Summary: Extra utilities that may run against a SUSE Manager/Uyuni server # Required by spacewalk-watch-channel-sync.sh Group: Productivity/Other Requires: bash +# Required by sw-ldap-user-sync +Requires: python3-PyYAML # Required by taskotop Requires: python3-curses # Required by sw-ldap-user-sync Requires: python3-ldap -# Required by sw-ldap-user-sync -Requires: python3-PyYAML # Required by migrate-system-profile Requires: python3-rhnlib >= 2.5.20 # Required by migrateSystemProfile.py, systemSnapshot.py @@ -116,7 +113,7 @@ Extra utilities that may be run against a SUSE Manager server (unsupported) or a make all %install -make install PREFIX=$RPM_BUILD_ROOT ROOT=%{python3_sitelib} \ +make install PREFIX=%{buildroot} ROOT=%{python3_sitelib} \ MANDIR=%{_mandir} pushd %{buildroot} %if 0%{?suse_version} @@ -148,9 +145,9 @@ popd %{python3_sitelib}/utils/__pycache__/systemSnapshot.* %{python3_sitelib}/utils/__pycache__/cloneByDate.* %{python3_sitelib}/utils/__pycache__/depsolver.* -%{_mandir}/man8/spacewalk-clone-by-date.8.gz -%{_mandir}/man8/spacewalk-hostname-rename.8.gz -%{_mandir}/man8/spacewalk-sync-setup.8.gz +%{_mandir}/man8/spacewalk-clone-by-date.8%{?ext_man} +%{_mandir}/man8/spacewalk-hostname-rename.8%{?ext_man} +%{_mandir}/man8/spacewalk-sync-setup.8%{?ext_man} %files extras %defattr(-,root,root) @@ -169,14 +166,14 @@ popd %{python3_sitelib}/utils/migrateSystemProfile.py* %{python3_sitelib}/utils/__pycache__/migrateSystemProfile.* %config(noreplace) %{_sysconfdir}/rhn/sw-ldap-user-sync.conf -%{_mandir}/man8/delete-old-systems-interactive.8.gz -%{_mandir}/man8/migrate-system-profile.8.gz -%{_mandir}/man8/spacewalk-api.8.gz -%{_mandir}/man8/spacewalk-export-channels.8.gz -%{_mandir}/man8/spacewalk-export.8.gz -%{_mandir}/man8/spacewalk-final-archive.8.gz -%{_mandir}/man8/spacewalk-manage-snapshots.8.gz -%{_mandir}/man8/sw-system-snapshot.8.gz -%{_mandir}/man8/taskotop.8.gz +%{_mandir}/man8/delete-old-systems-interactive.8%{?ext_man} +%{_mandir}/man8/migrate-system-profile.8%{?ext_man} +%{_mandir}/man8/spacewalk-api.8%{?ext_man} +%{_mandir}/man8/spacewalk-export-channels.8%{?ext_man} +%{_mandir}/man8/spacewalk-export.8%{?ext_man} +%{_mandir}/man8/spacewalk-final-archive.8%{?ext_man} +%{_mandir}/man8/spacewalk-manage-snapshots.8%{?ext_man} +%{_mandir}/man8/sw-system-snapshot.8%{?ext_man} +%{_mandir}/man8/taskotop.8%{?ext_man} %changelog diff --git a/uyuni/base/uyuni-base.changes.releng.bump b/uyuni/base/uyuni-base.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/uyuni/base/uyuni-base.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/uyuni/base/uyuni-base.spec b/uyuni/base/uyuni-base.spec index 17cceb4c19bc..c5bae9876f9d 100644 --- a/uyuni/base/uyuni-base.spec +++ b/uyuni/base/uyuni-base.spec @@ -17,12 +17,10 @@ %global debug_package %{nil} - #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - %if 0%{?suse_version} %define www_path /srv/ %define apache_user wwwrun @@ -32,16 +30,14 @@ %define apache_user apache %define apache_group apache %endif - Name: uyuni-base -Version: 5.0.2 +Version: 5.1.0 Release: 0 -URL: https://github.com/uyuni-project/uyuni -Source0: %{name}-%{version}.tar.gz Summary: Uyuni Base Package License: GPL-2.0-only Group: System/Fhs -BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: https://github.com/uyuni-project/uyuni +Source0: %{name}-%{version}.tar.gz %description Uyuni is a systems management application that will @@ -64,12 +60,12 @@ Basic filesystem hierarchy for Uyuni server and proxy. %package server Summary: Base structure for Uyuni server Group: System/Fhs -Provides: group(susemanager) -Requires(pre): uyuni-base-common Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/usermod -Requires(pre): tomcat Requires(pre): salt +Requires(pre): tomcat +Requires(pre): uyuni-base-common +Provides: group(susemanager) %if 0%{?suse_version} >= 1500 Requires(pre): user(wwwrun) %endif @@ -96,12 +92,12 @@ Basic filesystem hierarchy for Uyuni proxy. # nothing to do here %install -mkdir -p %{buildroot}/etc/rhn -mkdir -p %{buildroot}/usr/share/rhn/proxy +mkdir -p %{buildroot}%{_sysconfdir}/rhn +mkdir -p %{buildroot}%{_datadir}/rhn/proxy %if 0%{?suse_version} >= 1500 || 0%{?rhel} >= 9 -mkdir -p %{buildroot}/var/spacewalk +mkdir -p %{buildroot}%{_localstatedir}/spacewalk %endif -mkdir -p %{buildroot}/%{_prefix}/share/rhn/config-defaults +mkdir -p %{buildroot}%{_datadir}/rhn/config-defaults mkdir -p %{buildroot}/srv/www/distributions %if 0%{?suse_version} >= 1500 || 0%{?rhel} >= 9 @@ -116,19 +112,19 @@ getent passwd %{apache_user} >/dev/null && %{_sbindir}/usermod -a -G susemanager %defattr(-,root,root) %{!?_licensedir:%global license %doc} %license LICENSE -%dir %attr(750,root,%{apache_group}) /etc/rhn -%dir %{_prefix}/share/rhn -%dir %attr(755,root,%{apache_group}) %{_prefix}/share/rhn/config-defaults +%dir %attr(750,root,%{apache_group}) %{_sysconfdir}/rhn +%dir %{_datadir}/rhn +%dir %attr(755,root,%{apache_group}) %{_datadir}/rhn/config-defaults %if 0%{?suse_version} >= 1500 || 0%{?rhel} >= 9 %files server %defattr(-,root,root) -%dir %attr(755,%{apache_user}, root) /var/spacewalk +%dir %attr(755,%{apache_user}, root) %{_localstatedir}/spacewalk %dir %attr(755,root,root) /srv/www/distributions %endif %files proxy %defattr(-,root,root) -%dir /usr/share/rhn/proxy +%dir %{_datadir}/rhn/proxy %changelog diff --git a/uyuni/uyuni-payg-timer/uyuni-payg-timer.changes.releng.bump b/uyuni/uyuni-payg-timer/uyuni-payg-timer.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/uyuni/uyuni-payg-timer/uyuni-payg-timer.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/uyuni/uyuni-payg-timer/uyuni-payg-timer.spec b/uyuni/uyuni-payg-timer/uyuni-payg-timer.spec index c3107ec8a10e..a0165bc9e5af 100644 --- a/uyuni/uyuni-payg-timer/uyuni-payg-timer.spec +++ b/uyuni/uyuni-payg-timer/uyuni-payg-timer.spec @@ -17,25 +17,22 @@ %global debug_package %{nil} - #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - Name: uyuni-payg-timer -Version: 5.0.2 +Version: 5.1.0 Release: 0 -URL: https://github.com/uyuni-project/uyuni -Source0: %{name}-%{version}.tar.gz -Source1: uyuni-payg-timer-rpmlintrc Summary: Uyuni PAYG Timer Package License: GPL-2.0-only Group: System/Fhs +URL: https://github.com/uyuni-project/uyuni +Source0: %{name}-%{version}.tar.gz +Source1: uyuni-payg-timer-rpmlintrc BuildRequires: systemd-rpm-macros -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: mgradm BuildArch: noarch -Requires: mgradm %systemd_requires %description @@ -50,11 +47,11 @@ This package provide a timer for Cloud PAYG usage. # nothing to do here %install -mkdir -p %{buildroot}/%{_unitdir} -mkdir -p %{buildroot}/%{_sbindir} -install -m 644 uyuni-payg-timer.timer %{buildroot}/%{_unitdir}/ -install -m 644 uyuni-payg-timer.service %{buildroot}/%{_unitdir}/ -install -m 755 uyuni-payg-extract-data.py %{buildroot}/%{_sbindir}/uyuni-payg-extract-data +mkdir -p %{buildroot}%{_unitdir} +mkdir -p %{buildroot}%{_sbindir} +install -m 644 uyuni-payg-timer.timer %{buildroot}%{_unitdir}/ +install -m 644 uyuni-payg-timer.service %{buildroot}%{_unitdir}/ +install -m 755 uyuni-payg-extract-data.py %{buildroot}%{_sbindir}/uyuni-payg-extract-data %files %defattr(-,root,root) @@ -64,7 +61,6 @@ install -m 755 uyuni-payg-extract-data.py %{buildroot}/%{_sbindir}/uyuni-payg-ex %{_unitdir}/uyuni-payg-timer.timer %{_unitdir}/uyuni-payg-timer.service - %pre %service_add_pre uyuni-payg-timer.service uyuni-payg-timer.timer @@ -79,7 +75,7 @@ install -m 755 uyuni-payg-extract-data.py %{buildroot}/%{_sbindir}/uyuni-payg-ex %posttrans if [ -f %{_unitdir}/uyuni-payg-timer.timer ]; then - /usr/bin/systemctl --quiet enable uyuni-payg-timer.timer 2>&1 ||: + %{_bindir}/systemctl --quiet enable uyuni-payg-timer.timer 2>&1 ||: fi %changelog diff --git a/uyuni/uyuni-storage-setup/uyuni-storage-setup.changes.releng.bump b/uyuni/uyuni-storage-setup/uyuni-storage-setup.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/uyuni/uyuni-storage-setup/uyuni-storage-setup.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/uyuni/uyuni-storage-setup/uyuni-storage-setup.spec b/uyuni/uyuni-storage-setup/uyuni-storage-setup.spec index f4f803db7698..1c22184886d9 100644 --- a/uyuni/uyuni-storage-setup/uyuni-storage-setup.spec +++ b/uyuni/uyuni-storage-setup/uyuni-storage-setup.spec @@ -15,10 +15,10 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%global debug_package %{nil} +%global debug_package %{nil} Name: uyuni-storage-setup -Version: 5.0.2 +Version: 5.1.0 Release: 0 Summary: Tools for managing storage on Uyuni License: GPL-3.0-only @@ -62,11 +62,11 @@ Scripts that help setting up Uyuni and SUSE Manager Proxy storage after deployme %install install -m 0755 -vd %{buildroot}%{_bindir} -install -m 0755 -vd %{buildroot}/%{_usr}/lib/susemanager/ +install -m 0755 -vd %{buildroot}%{_usr}/lib/susemanager/ -install -m 755 scripts/mgr-storage-server %{buildroot}/%{_bindir}/mgr-storage-server -install -m 755 scripts/mgr-storage-proxy %{buildroot}/%{_bindir}/mgr-storage-proxy -install -m 755 scripts/susemanager-storage-setup-functions.sh %{buildroot}/%{_usr}/lib/susemanager/ +install -m 755 scripts/mgr-storage-server %{buildroot}%{_bindir}/mgr-storage-server +install -m 755 scripts/mgr-storage-proxy %{buildroot}%{_bindir}/mgr-storage-proxy +install -m 755 scripts/susemanager-storage-setup-functions.sh %{buildroot}%{_usr}/lib/susemanager/ %files server %defattr(-,root,root) diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf index c813b84ce9de..4330d0005a36 100644 --- a/web/conf/rhn_web.conf +++ b/web/conf/rhn_web.conf @@ -58,12 +58,12 @@ web.config_delim_start = {| web.config_delim_end = |} # the version of SUSE Manager to show at the WebUI -web.version = 5.0.1 +web.version = 5.1.0 Alpha1 # the version of Uyuni to show at the WebUI, it will be prepended # to web.version as version for the SPECs, when building them # for Uyuni -web.version.uyuni = 2024.08 +web.version.uyuni = 2024.09 web.buildtimestamp = _OBS_BUILD_TIMESTAMP_ diff --git a/web/spacewalk-web.changes.releng.bump b/web/spacewalk-web.changes.releng.bump new file mode 100644 index 000000000000..b27f7e65ff4f --- /dev/null +++ b/web/spacewalk-web.changes.releng.bump @@ -0,0 +1 @@ +- Bump version to 5.1.0 diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 8acad4b0eacb..1e1211d205f2 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -31,25 +31,24 @@ %{!?nodejs_sitelib:%define nodejs_sitelib %{_prefix}/lib/node_modules} Name: spacewalk-web +Version: 5.1.0 +Release: 0 Summary: Spacewalk Web site - Perl modules License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet -Version: 5.0.12 -Release: 0 URL: https://github.com/uyuni-project/uyuni Source0: https://github.com/uyuni-project/uyuni/archive/%{name}-%{version}.tar.gz Source1: node-modules.tar.gz -Source2: spacewalk-web-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -Requires(pre): uyuni-base-common +Source2: spacewalk-web-rpmlintrc BuildRequires: gettext BuildRequires: make +BuildRequires: nodejs >= 20 BuildRequires: spacewalk-backend BuildRequires: uyuni-base-common BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: nodejs >= 20 - +Requires(pre): uyuni-base-common +BuildArch: noarch %if 0%{?suse_version} BuildRequires: apache2 %else @@ -65,6 +64,7 @@ but it does generate a number of sub-packages. %package -n spacewalk-html Summary: HTML document files for Spacewalk License: (MPL-2.0 OR Apache-2.0) AND 0BSD AND BSD-3-Clause AND GPL-2.0-only AND ISC AND LGPL-3.0-or-later AND MIT AND MPL-2.0 +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Requires: httpd Requires: spacewalk-branding @@ -86,6 +86,7 @@ This package contains the HTML files for the Spacewalk web site. %package -n spacewalk-html-debug Summary: HTML document debug files for Spacewalk License: GPL-2.0-only AND MIT +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet Requires: spacewalk-html @@ -95,8 +96,18 @@ This package contains the debug files for spacewalk-html. %package -n spacewalk-base Summary: Programs which need to be installed for the Spacewalk Web base classes License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet +Requires: httpd +Requires: sudo +Requires: perl(Params::Validate) +Requires: perl(XML::LibXML) Provides: spacewalk(spacewalk-base) = %{version}-%{release} +Obsoletes: rhn-base < 5.3.0 +Obsoletes: spacewalk-grail < %{version} +Obsoletes: spacewalk-pxt < %{version} +Obsoletes: spacewalk-sniglets < %{version} +Provides: rhn-base = 5.3.0 %if 0%{?suse_version} Requires: susemanager-frontend-libs %if 0%{?suse_version} >= 1500 @@ -109,15 +120,6 @@ Requires: python-numpy Requires: python-websockify %endif %endif -Requires: httpd -Requires: sudo -Requires: perl(Params::Validate) -Requires: perl(XML::LibXML) -Obsoletes: rhn-base < 5.3.0 -Obsoletes: spacewalk-grail < %{version} -Obsoletes: spacewalk-pxt < %{version} -Obsoletes: spacewalk-sniglets < %{version} -Provides: rhn-base = 5.3.0 %description -n spacewalk-base This package includes the core RHN:: packages necessary to manipulate the @@ -126,12 +128,13 @@ database. This includes RHN::* and RHN::DB::*. %package -n spacewalk-base-minimal Summary: Core of Perl modules for %{name} package License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet +Requires: perl(DBI) +Requires: perl(Params::Validate) Provides: spacewalk(spacewalk-base-minimal) = %{version}-%{release} Obsoletes: rhn-base-minimal < 5.3.0 Provides: rhn-base-minimal = 5.3.0 -Requires: perl(DBI) -Requires: perl(Params::Validate) %description -n spacewalk-base-minimal Independent Perl modules in the RHN:: name-space. @@ -141,10 +144,11 @@ sessions and exceptions. %package -n spacewalk-base-minimal-config Summary: Configuration for %{name} package License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet -Provides: spacewalk(spacewalk-base-minimal-config) = %{version}-%{release} Requires: httpd Requires: spacewalk-base-minimal = %{version}-%{release} +Provides: spacewalk(spacewalk-base-minimal-config) = %{version}-%{release} %description -n spacewalk-base-minimal-config Configuration file for spacewalk-base-minimal package. @@ -152,12 +156,13 @@ Configuration file for spacewalk-base-minimal package. %package -n spacewalk-dobby Summary: Perl modules and scripts to administer a PostgreSQL database License: GPL-2.0-only +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Applications/Internet +Requires: %{sbinpath}/runuser Requires: perl-Filesys-Df +Conflicts: spacewalk-oracle Obsoletes: rhn-dobby < 5.3.0 Provides: rhn-dobby = 5.3.0 -Requires: %{sbinpath}/runuser -Conflicts: spacewalk-oracle %description -n spacewalk-dobby Dobby is collection of Perl modules and scripts to administer a PostgreSQL @@ -180,46 +185,46 @@ rm -rf %{buildroot}%{nodejs_sitelib} sed -i -r "s/^(web.buildtimestamp *= *)_OBS_BUILD_TIMESTAMP_$/\1$(date +'%%Y%%m%%d%%H%%M%%S')/" conf/rhn_web.conf %install -make -C modules install DESTDIR=$RPM_BUILD_ROOT PERLARGS="INSTALLDIRS=vendor" %{?_smp_mflags} -make -C html install PREFIX=$RPM_BUILD_ROOT INSTALL_DEST=%{www_path} -make -C po install PREFIX=$RPM_BUILD_ROOT +make -C modules install DESTDIR=%{buildroot} PERLARGS="INSTALLDIRS=vendor" %{?_smp_mflags} +make -C html install PREFIX=%{buildroot} INSTALL_DEST=%{www_path} +make -C po install PREFIX=%{buildroot} -find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} \; -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +find %{buildroot} -type f -name perllocal.pod -exec rm -f {} \; +find %{buildroot} -type f -name .packlist -exec rm -f {} \; -mkdir -p $RPM_BUILD_ROOT/%{www_path}/pub -mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/rhn/config-defaults -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily +mkdir -p %{buildroot}%{www_path}/pub +mkdir -p %{buildroot}/%{_datadir}/rhn/config-defaults +mkdir -p %{buildroot}%{_sysconfdir}/init.d +mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf +mkdir -p %{buildroot}%{_sysconfdir}/cron.daily -install -m 644 conf/rhn_web.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults -install -m 644 conf/rhn_dobby.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults -install -m 755 modules/dobby/scripts/check-database-space-usage.sh $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/check-database-space-usage.sh +install -m 644 conf/rhn_web.conf %{buildroot}%{_datadir}/rhn/config-defaults +install -m 644 conf/rhn_dobby.conf %{buildroot}%{_datadir}/rhn/config-defaults +install -m 755 modules/dobby/scripts/check-database-space-usage.sh %{buildroot}%{_sysconfdir}/cron.daily/check-database-space-usage.sh if grep -F 'product_name' %{_datadir}/rhn/config-defaults/rhn.conf | grep 'SUSE Manager' >/dev/null; then SUMA_REL=$(echo %{version} | awk -F. '{print $1"."$2}') - SUMA_FULL_REL=$(sed -n 's/web\.version\s*=\s*\(.*\)/\1/p' $RPM_BUILD_ROOT%{_datadir}/rhn/config-defaults/rhn_web.conf) - echo "SUSE Manager release $SUMA_REL ($SUMA_FULL_REL)" > $RPM_BUILD_ROOT/%{_sysconfdir}/susemanager-release + SUMA_FULL_REL=$(sed -n 's/web\.version\s*=\s*\(.*\)/\1/p' %{buildroot}%{_datadir}/rhn/config-defaults/rhn_web.conf) + echo "SUSE Manager release $SUMA_REL ($SUMA_FULL_REL)" > %{buildroot}%{_sysconfdir}/susemanager-release else - UYUNI_REL=$(sed -n 's/web\.version.uyuni\s*=\s*\(.*\)/\1/p' $RPM_BUILD_ROOT%{_datadir}/rhn/config-defaults/rhn_web.conf) - echo "Uyuni release $UYUNI_REL" > $RPM_BUILD_ROOT/%{_sysconfdir}/uyuni-release + UYUNI_REL=$(sed -n 's/web\.version.uyuni\s*=\s*\(.*\)/\1/p' %{buildroot}%{_datadir}/rhn/config-defaults/rhn_web.conf) + echo "Uyuni release $UYUNI_REL" > %{buildroot}%{_sysconfdir}/uyuni-release fi -%{__mkdir_p} %{buildroot}/%{www_path}/css -%{__mkdir_p} %{buildroot}/%{www_path}/fonts -%{__mkdir_p} %{buildroot}/%{www_path}/img -%{__mkdir_p} %{buildroot}/%{www_path}/javascript +mkdir -p %{buildroot}%{www_path}/css +mkdir -p %{buildroot}%{www_path}/fonts +mkdir -p %{buildroot}%{www_path}/img +mkdir -p %{buildroot}%{www_path}/javascript pushd html/src/dist -cp -pR css %{buildroot}/%{www_path} -cp -pR fonts %{buildroot}/%{www_path} -cp -pR img %{buildroot}/%{www_path} -cp -pR javascript %{buildroot}/%{www_path} +cp -pR css %{buildroot}%{www_path} +cp -pR fonts %{buildroot}%{www_path} +cp -pR img %{buildroot}%{www_path} +cp -pR javascript %{buildroot}%{www_path} popd # Adjust default theme for SUSE Manager %if 0%{?sle_version} && ! (0%{?is_opensuse} || 0%{?rhel} || 0%{?fedora}) -sed -i -e 's/^web.theme_default =.*$/web.theme_default = susemanager-light/' $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_web.conf +sed -i -e 's/^web.theme_default =.*$/web.theme_default = susemanager-light/' %{buildroot}%{_datadir}/rhn/config-defaults/rhn_web.conf %endif %find_lang spacewalk-web @@ -243,18 +248,18 @@ sed -i -e 's/^web.theme_default =.*$/web.theme_default = susemanager-light/' $RP %files -n spacewalk-base-minimal-config %defattr(644,root,root,755) -%dir %{_prefix}/share/rhn -%attr(644,root,%{apache_group}) %{_prefix}/share/rhn/config-defaults/rhn_web.conf +%dir %{_datadir}/rhn +%attr(644,root,%{apache_group}) %{_datadir}/rhn/config-defaults/rhn_web.conf %files -n spacewalk-dobby %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/db-control -%{_mandir}/man1/db-control.1.gz +%{_mandir}/man1/db-control.1%{?ext_man} %{perl_vendorlib}/Dobby.pm -%attr(644,root,root) %{_prefix}/share/rhn/config-defaults/rhn_dobby.conf +%attr(644,root,root) %{_datadir}/rhn/config-defaults/rhn_dobby.conf %attr(0755,root,root) %{_sysconfdir}/cron.daily/check-database-space-usage.sh %{perl_vendorlib}/Dobby/ -%dir %{_prefix}/share/rhn +%dir %{_datadir}/rhn %files -n spacewalk-html -f spacewalk-web.lang %defattr(644,root,root,755)