File project.diff of Package xxdiff
--- xxdiff.changes.orig
+++ xxdiff.changes
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Tue Feb 18 11:38:00 UTC 2025 - Ansgar Esztermann <aeszter@gwdg.de>
+
+- enable build for RockyLinux 8 and 9
+
+-------------------------------------------------------------------
+Wed Jan 11 14:15:09 UTC 2023 - Ansgar Esztermann <aeszter@gwdg.de> - 5.1
+
+- update to 5.1
+ * adds support for Qt 5 and 6
+
+-------------------------------------------------------------------
Thu Apr 9 15:10:24 UTC 2015 - lnussel@suse.de
- upgrade to version 4.0 from mercurial tip
@@ -11,6 +22,7 @@ Mon Nov 12 11:32:01 UTC 2012 - aeszter@g
- Add xxdiff-environ.patch, remove conflicting 'environ' declaration
-------------------------------------------------------------------
+>>>>>>> ./xxdiff.changes.new
Tue Apr 26 13:30:41 UTC 2011 - puzel@novell.com
- use spec-cleaner
--- xxdiff.spec.orig
+++ xxdiff.spec
@@ -1,22 +1,62 @@
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-Name: xxdiff
-Version: 4.0+hg445
-Release: 0
+%global _qt @BUILD_FLAVOR@%{nil}
+%if 0%{?fedora} > 33 || 0%{?rhel} > 7
+%define __python %__python3
+%define python_build %py3_build
+%define python_install %py3_install
+%endif
+%if "%{_qt}" == ""
+ExclusiveArch: do_not_build
+%endif
+%if "%{_qt}" == "qt5"
+%define mname xxdiff-qt5
+%if 0%{?suse_version}
+%define _qmake %_libqt5_qmake
+%else
+%define _qmake /usr/bin/qmake-qt5
+%endif
+%define _qmake_build %{__make} %{?_smp_mflags} VERBOSE=1
+%define _qmake_install %qmake5_install
+%define _qt_datadir %_libqt5_datadir
+%define _qt_archdatadir %_libqt5_archdatadir
+%define psuffix -qt5
+%endif
+%if "%{_qt}" == "qt6"
+%define mname xxdiff-qt6
+%define _qmake %__qt6_qmake
+%define _qmake_build %qmake6_build
+%define _qmake_install %qmake6_install
+%define _qt_datadir %_qt6_datadir
+%define _qt_archdatadir %_qt6_archdatadir
+%endif
+
+Name: xxdiff%{?psuffix}
+Version: 5.1
+Release: 2
License: GPL-2.0+
Summary: A graphical front end to the diff command
-Url: https://bitbucket.org/blais/xxdiff
+Url: https://github.com/blais/xxdiff
Group: Development/Tools/Other
-Source: xxdiff-%{version}.tar.xz
+Source: xxdiff-%{version}.tar.bz2
BuildRequires: bison,
BuildRequires: flex,
-BuildRequires: python,
-BuildRequires: python-devel
-BuildRequires: libqt4-devel,
+BuildRequires: python3,
+BuildRequires: python3-devel
+BuildRequires: pkgconfig
+BuildRequires: gcc-c++
+%if "%{_qt}" == "qt5"
+BuildRequires: pkgconfig(Qt5Core) > 5.11.0
+BuildRequires: pkgconfig(Qt5Widgets)
+%endif
+%if "%{_qt}" == "qt6"
+#see BOO 1195368
+BuildRequires: qt6-base-private-devel
+BuildRequires: cmake(Qt6Core)
+BuildRequires: cmake(Qt6Widgets)
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%py_requires
%description
xxdiff is a graphical browser for viewing the differences between two
@@ -34,24 +74,20 @@ Helper scripts built around xxdiff to ea
for more details.
%prep
-%setup -q
-# directly call python
-sed -i -e '1s,/env ,/,' bin/svn-foreign
-# not needed. the sed call above converted the symlink to file
-# already
-rm lib/python/xxdiff/scripts/svnforeign.py
+%setup -q -n xxdiff
%build
pushd src
-QMAKE=/usr/bin/qmake make -f Makefile.bootstrap
-make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
+make QMAKE=%{_qmake} -f Makefile.bootstrap Makefile
+make %{?_smp_mflags} CFLAGS="%{optflags}"
popd
bin/xxdiff --help-html > xxdiff-doc.html
# tools
-CFLAGS="%{optflags}" python setup.py build
+export CFLAGS="%{optflags}"
+%python_build
%install
mkdir -p %{buildroot}%{_bindir}
@@ -61,20 +97,23 @@ install -c -m 755 bin/xxdiff %{buildroot
install -c -m 644 src/xxdiff.1 %{buildroot}%{_mandir}/man1/xxdiff.1
# tools
-python setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES
+%python_install
%clean
rm -rf %{buildroot}
%files
%defattr(-,root, root)
-%doc README
%doc CHANGES
%doc xxdiff-doc.html
%{_bindir}/xxdiff
+%{_bindir}/xx-*
+%{_bindir}/svn-foreign
+%{_bindir}/termdiff
%{_mandir}/man1/xxdiff.1*
-%files tools -f INSTALLED_FILES
+%files tools
%defattr(-,root, root)
+%{python_sitelib}/xxdiff*
%changelog
