update to 5.1.20230111git.604300e [release 5.1.20230111git.604300e-1mamba;Mon Mar 06 2023]

xxdiff.spec

@@ -1,18 +1,24 @@
+%define gittag %(echo %version | cut -d. -f4)
 Name:          xxdiff
-Version:       4.0
+Version:       5.1.20230111git.604300e
 Release:       1mamba
 Summary:       Graphical File And Directories Comparator And Merge Tool
 Group:         Graphical Desktop/Applications/Utilities
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://furius.ca/xxdiff/
-Source:        http://downloads.sourceforge.net/sourceforge/xxdiff/xxdiff-%{version}.tar.bz2
+URL:           https://furius.ca/xxdiff/
+Source:        https://github.com/blais/xxdiff.git/master@%{gittag}/xxdiff-%{version}.tar.bz2
+#Source:        https://sourceforge.net/projects/xxdiff/files/xxdiff/%{version}/xxdiff-%{version}.tar.bz2
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
-BuildRequires: libpython-devel
+BuildRequires: glibc-devel
+BuildRequires: libgcc
+BuildRequires: libglvnd-devel
+BuildRequires: libpython3-devel
+BuildRequires: libstdc++6-devel
+BuildRequires: qt6-qtbase-devel
 ## AUTOBUILDREQ-END
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 xxdiff is a Graphical File And Directories Comparator And Merge Tool.
@@ -27,18 +33,27 @@ Features:
     * Look-and-feel similar to Rudy Wortel's/SGI xdiff, it is desktop agnostic (i.e. will work equall well with KDE or Gnome);
     * Features and output that ease integration with scripts.
 
+%debug_package
+
 %prep
 %setup -q
 
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="%{optflags}" %{__python3} setup.py build
+
+cd src
+make -f Makefile.bootstrap QMAKE=qmake-qt6
+%make
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%{__python} setup.py install \
+%{__python3} setup.py install \
    --root=%{buildroot} \
-   --install-headers=%{_includedir}/python \
-   --install-lib=%{python_sitearch}
+   --install-headers=%{python3_inc} \
+   --install-lib=%{python3_sitearch}
+
+install -D -m 755 bin/xxdiff %{buildroot}%{_bindir}/xxdiff
+install -D -m 644 src/xxdiff.1 %{buildroot}%{_mandir}/man1/xxdiff.1
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -46,17 +61,23 @@ CFLAGS="%{optflags}" %{__python} setup.py build
 %files
 %defattr(-,root,root)
 %{_bindir}/svn-foreign
+%{_bindir}/termdiff
+%{_bindir}/xxdiff
 %{_bindir}/xx-*
-%{python_sitearch}/xxdiff/*.py
-%{python_sitearch}/xxdiff/*.pyc
-%{python_sitearch}/xxdiff/scm/*.py
-%{python_sitearch}/xxdiff/scm/*.pyc
-%{python_sitearch}/xxdiff/scripts/*.py
-%{python_sitearch}/xxdiff/scripts/*.pyc
-%{python_sitearch}/xxdiff_scripts-%{version}-py*.egg-info
-%doc CHANGES COPYING README README.build TODO
+%dir %{python3_sitearch}/xxdiff_scripts-*-py*.egg-info
+%{python3_sitearch}/xxdiff_scripts-*-py*.egg-info/*
+%dir %{python3_sitearch}/xxdiff
+%{python3_sitearch}/xxdiff/*
+%{_mandir}/man1/xxdiff.1*
+%doc COPYING
 
 %changelog
+* Mon Mar 06 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 5.1.20230111git.604300e-1mamba
+- update to 5.1.20230111git.604300e
+
+* Mon Mar 22 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.1-1mamba
+- update to 4.0.1
+
 * Thu Aug 15 2013 Automatic Build System <autodist@mambasoft.it> 4.0-1mamba
 - automatic update by autodist