Compare commits

..

No commits in common. "rawhide" and "f39" have entirely different histories.

5 changed files with 36 additions and 71 deletions

4
.gitignore vendored
View file

@ -6,7 +6,3 @@
/omniORB-4.2.3.tar.bz2
/omniORB-4.2.4.tar.bz2
/omniORB-4.3.0.tar.bz2
/omniORB-4.3.1.tar.bz2
/omniORB-4.3.2.tar.bz2
/omniORB-4.3.3.tar.bz2
/omniORB-4.3.4.tar.bz2

View file

@ -6,4 +6,7 @@
compress
notifempty
missingok
}
postrotate
/bin/kill -USR1 `cat /var/run/omniORB/omniORB.pid 2>/dev/null` 2> /dev/null|| true
endscript
}

View file

@ -8,11 +8,11 @@
%bcond_without openssl
Name: omniORB
Version: 4.3.4
Release: 1%{?dist}
Version: 4.3.0
Release: 9%{?dist}
Summary: A robust high performance CORBA ORB for C++ and Python
License: LGPL-2.0-or-later
License: LGPLv2+
URL: http://omniorb.sourceforge.net
Source0: http://downloads.sourceforge.net/project/omniorb/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2
Source1: omniORB-nameserver.init
@ -20,6 +20,9 @@ Source2: omniORB-nameserver.logrotate
Source3: omniORB.cfg
Source4: omniNames.service
# Don't use distutils module removed in python 3.12
Patch0: omniORB_py312.patch
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: python3-devel
@ -34,6 +37,7 @@ Requires(postun): systemd
%else
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(pre): shadow-utils
# This is for /sbin/service
Requires(postun): initscripts
%endif
@ -52,7 +56,7 @@ compliant.
%package devel
Summary: Development files for %{name}
License: LGPL-2.0-or-later
License: LGPLv2+
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@ -70,7 +74,7 @@ developing and administrating applications that use %{name}.
%package servers
Summary: OmniORB naming service
License: GPL-2.0-or-later
License: GPLv2+
Requires: %{name}%{?_isa} = %{version}-%{release}
%description servers
@ -78,7 +82,7 @@ The %{name}-servers package contains omniNames naming server.
%package utils
Summary: Development files for %{name}
License: GPL-2.0-or-later
License: GPLv2+
Requires: %{name}%{?_isa} = %{version}-%{release}
%description utils
@ -93,11 +97,6 @@ sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!%{__python3}=' \
./src/tool/omniidl/python3/scripts/omniidlrun.py \
./src/tool/omniidl/python3/omniidl/main.py
# Create a sysusers.d config file
cat >omniorb.sysusers.conf <<EOF
u omniORB - 'OmniNames Naming Service' %{_sharedstatedir}/%{name} -
EOF
%build
# Per guidelines: if the same functionality is provided regardless of the interpreter version, only the python 3 version should be packaged
export PYTHON=%{__python3}
@ -146,10 +145,14 @@ mkdir -p %{buildroot}%{_mandir}/man8
install -m 0644 man8/* %{buildroot}%{_mandir}/man8/
popd
install -m0644 -D omniorb.sysusers.conf %{buildroot}%{_sysusersdir}/omniorb.conf
%ldconfig_scriptlets
%pre servers
getent group %{name} >/dev/null || groupadd -r %{name}
getent passwd %{name} >/dev/null || \
useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /sbin/nologin \
-c "OmniNames Naming Service" %{name}
exit 0
%if 0%{?with_systemd}
%post servers
@ -207,7 +210,6 @@ fi
%{_bindir}/omniMapper
%{_bindir}/%{nameserver}
%{_mandir}/man8/*
%{_sysusersdir}/omniorb.conf
%files devel
%doc doc/
@ -240,57 +242,6 @@ fi
%changelog
* Fri Jan 09 2026 Sandro Mani <manisandro@gmail.com> - 4.3.4-1
- Update to 4.3.4
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 4.3.3-7
- Rebuilt for Python 3.14.0rc3 bytecode
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 4.3.3-6
- Rebuilt for Python 3.14.0rc2 bytecode
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Jun 10 2025 Python Maint <python-maint@redhat.com> - 4.3.3-4
- Rebuilt for Python 3.14
* Tue Jun 10 2025 Sandro Mani <manisandro@gmail.com> - 4.3.3-3
- Remove unnecessary postrotate script from logrotate configuration
* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 4.3.3-2
- Rebuilt for Python 3.14
* Wed Apr 02 2025 Sandro Mani <manisandro@gmail.com> - 4.3.3-1
- Update to 4.3.3
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.2-8
- Add sysusers.d config file to allow rpm to create users/groups automatically
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 4.3.2-6
- convert license to SPDX
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 4.3.2-4
- Rebuilt for Python 3.13
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 17 2024 Sandro Mani <manisandro@gmail.com> - 4.3.2-1
- Update to 4.3.2
* Thu Aug 31 2023 Sandro Mani <manisandro@gmail.com> - 4.3.1-1
- Update to 4.3.1
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

15
omniORB_py312.patch Normal file
View file

@ -0,0 +1,15 @@
diff -rupN --no-dereference omniORB-4.3.0/mk/python.mk omniORB-4.3.0-new/mk/python.mk
--- omniORB-4.3.0/mk/python.mk 2021-10-31 19:14:57.000000000 +0100
+++ omniORB-4.3.0-new/mk/python.mk 2022-12-20 11:19:52.168065816 +0100
@@ -4,9 +4,9 @@
PYVERSION := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(".".join(sys.version.split(".")[:2]))')
PYPREFIX := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(sys.exec_prefix.replace("\\","/"))')
-PYINCDIR := $(shell $(PYTHON) -c 'import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_python_inc().replace("\\","/"))')
+PYINCDIR := $(shell $(PYTHON) -c 'import sys, sysconfig; sys.stdout.write(sysconfig.get_paths()["include"].replace("\\","/"))')
-PythonSHAREDLIB_SUFFIX = $(shell $(PYTHON) -c 'import sys, distutils.sysconfig; sys.stdout.write((distutils.sysconfig.get_config_var("SO") or ".so").lstrip("."))')
+PythonSHAREDLIB_SUFFIX = $(shell $(PYTHON) -c 'import sys, sysconfig; sys.stdout.write((sysconfig.get_config_var("SHLIB_SUFFIX") or ".so").lstrip("."))')
PY_MODULE_SUFFIX := $(shell $(PYTHON) -c 'import sys; sys.stdout.write((sys.hexversion < 0x3000000 and not hasattr(sys, "pypy_version_info")) and "module" or "")')

View file

@ -1 +1 @@
SHA512 (omniORB-4.3.4.tar.bz2) = e9eddcd9e53df1783f74a75b6471de6f0e4dbb806329506de1e3b87a279b0a0894db2df47cd1917254fa1ef660ec8503fba260144d3b810f6380f56f337791cd
SHA512 (omniORB-4.3.0.tar.bz2) = b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f