Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnuhealth for openSUSE:Factory
checked in at 2024-01-23 22:57:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnuhealth (Old)
and /work/SRC/openSUSE:Factory/.gnuhealth.new.16006 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuhealth"
Tue Jan 23 22:57:04 2024 rev:64 rq:1140831 version:4.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnuhealth/gnuhealth.changes 2023-10-18
21:25:24.480044693 +0200
+++ /work/SRC/openSUSE:Factory/.gnuhealth.new.16006/gnuhealth.changes
2024-01-23 22:57:13.698793372 +0100
@@ -1,0 +2,12 @@
+Sat Jan 6 09:09:19 UTC 2024 - Axel Braun <axel.br...@gmx.de>
+
+- Switch Leap packages to Python 3.11
+ shebang.diff removed (call in spec file)
+
+-------------------------------------------------------------------
+Sat Dec 23 17:04:58 UTC 2023 - Axel Braun <axel.br...@gmx.de>
+
+- version 4.4.0
+ See Changelog for details
+
+-------------------------------------------------------------------
Old:
----
gnuhealth-4.2.3.tar.gz
gnuhealth-4.2.3.tar.gz.sig
shebang.diff
New:
----
gnuhealth-4.4.0.tar.gz
gnuhealth-4.4.0.tar.gz.sig
BETA DEBUG BEGIN:
Old:- Switch Leap packages to Python 3.11
shebang.diff removed (call in spec file)
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnuhealth.spec ++++++
--- /var/tmp/diff_new_pack.jKAXxG/_old 2024-01-23 22:57:14.790833300 +0100
+++ /var/tmp/diff_new_pack.jKAXxG/_new 2024-01-23 22:57:14.790833300 +0100
@@ -1,8 +1,8 @@
#
# spec file for package gnuhealth
#
-# Copyright (c) 2023 SUSE LLC
-# Copyright (c) 2014-2023 Dr. Axel Braun
+# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2014-2024 Dr. Axel Braun
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,24 @@
%bcond_with tests 1
-
%define skip_python2 1
+
+%if 0%{?suse_version} >= 1550
+%define pythons python3
+%define mypython python3
+%define mysitelib %python3_sitelib
+%else
+%{?sle15_python_module_pythons}
+%define mypython %pythons
+%define mysitelib %{expand:%%%{mypython}_sitelib}
+%endif
+
%define t_version %(rpm -q --qf '%%{VERSION}' trytond)
-%define majorver 4.2
+%define majorver 4.4
Name: gnuhealth
-Version: %{majorver}.3
+Version: %{majorver}.0
Release: 0
URL: https://health.gnu.org
Summary: A Health and Hospital Information System
@@ -43,13 +53,16 @@
Source7: gnuhealth-rpmlintrc
Source8: https://ftp.gnu.org/gnu/health/%{name}-%{version}.tar.gz.sig
Source9:
https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=health&download=1#/%{name}.keyring
-Patch0: shebang.diff
+## BuildRequires: %{python_module pytest}
+BuildRequires: %{mypython}-pip
+BuildRequires: %{mypython}-devel
+BuildRequires: %{mypython}-setuptools
+BuildRequires: %{mypython}-wheel
BuildRequires: fdupes
BuildRequires: python-rpm-generators
BuildRequires: python-rpm-macros
-BuildRequires: python3-pytest
-BuildRequires: python3-setuptools
+
# For the tests:
BuildRequires: trytond
BuildRequires: trytond_company
@@ -59,20 +72,20 @@
# new fonts for the forms:
Requires: gnu-free-fonts
+Requires: %{mypython}-Pillow
+Requires: %{mypython}-PyWebDAV3-GNUHealth
+Requires: %{mypython}-caldav
+Requires: %{mypython}-hl7apy
+Requires: %{mypython}-ldap3
+Requires: %{mypython}-matplotlib
+Requires: %{mypython}-passlib
+Requires: %{mypython}-python-barcode
+Requires: %{mypython}-qrcode
+Requires: %{mypython}-simpleeval
+Requires: %{mypython}-six
+Requires: %{mypython}-vobject
Requires: bsdtar
Requires: proteus
-Requires: python3-Pillow
-Requires: python3-PyWebDAV3-GNUHealth
-Requires: python3-caldav
-Requires: python3-hl7apy
-Requires: python3-ldap3
-Requires: python3-matplotlib
-Requires: python3-passlib
-Requires: python3-pyBarcode
-Requires: python3-qrcode
-Requires: python3-simpleeval
-Requires: python3-six
-Requires: python3-vobject
Requires: trytond
Requires: trytond_account
Requires: trytond_account_invoice
@@ -112,30 +125,34 @@
%package -n %{name}-orthanc
Summary: Integration module for Orthanc
Group: Productivity/Office/Management
+Requires: %{mypython}-beren
+Requires: %{mypython}-pendulum
+Requires: %{mypython}-pydicom
Requires: gnuhealth
-Requires: python3-beren
-Requires: python3-pendulum
%description -n %{name}-orthanc
This package provides the interface to Orthanc
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1
+## %patch0 -p1
cp %{S:1} .
cp %{S:2} .
+#shebag ersetzen
+find . -iname "*.py" -exec sed -i "s/env python/%{mypython}/" '{}' \;
+
%build
for i in h*; do
pushd $i
- %python3_build
+ %pyproject_wheel
popd
done
%install
for i in h*; do
pushd $i
- %python3_install
+ %pyproject_install
popd
done
@@ -162,11 +179,11 @@
mv doc/* %{buildroot}%{_docdir}/%{name}/examples/.
rmdir doc
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%python_expand %fdupes %{buildroot}%{mysitelib}
%if %{with tests}
%check
-cd %{buildroot}%{python3_sitelib}/trytond/modules
+cd %{buildroot}%{mysitelib}/trytond/modules
for i in h*; do
pushd $i
%pytest -rs tests
@@ -208,8 +225,8 @@
%service_del_postun gnuhealth-webdav@.service
%files -n %{name}-orthanc
-%{python3_sitelib}/%{name}_orthanc*
-%{python3_sitelib}/trytond/modules/health_orthanc*
+%{mysitelib}/%{name}_orthanc*
+%{mysitelib}/trytond/modules/health_orthanc*
%files
%defattr(-,root,root)
@@ -224,7 +241,8 @@
%{_docdir}/%{name}/examples*
%dir %{_sysconfdir}/tryton
%license COPYING LICENSES/*
-%exclude %{python3_sitelib}/%{name}_orthanc*
-%exclude %{python3_sitelib}/trytond/modules/health_orthanc*
-%{python3_sitelib}/*
+%exclude %{mysitelib}/%{name}_orthanc*
+%exclude %{mysitelib}/trytond/modules/health_orthanc*
+%{mysitelib}/trytond*
+%{mysitelib}/gnuhealth*
++++++ gnuhealth-4.2.3.tar.gz -> gnuhealth-4.4.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/gnuhealth/gnuhealth-4.2.3.tar.gz
/work/SRC/openSUSE:Factory/.gnuhealth.new.16006/gnuhealth-4.4.0.tar.gz differ:
char 5, line 1
