diff --git a/README.md b/README.md index 03a6287..91d05af 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,3 @@ Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. - diff --git a/meld.spec b/meld.spec index d4f43ac..465ad3a 100644 --- a/meld.spec +++ b/meld.spec @@ -1,16 +1,16 @@ Name: meld Version: 3.20.3 -Release: 1mamba +Release: 2mamba Summary: A visual diff and merge tool Group: System/Libraries Vendor: openmamba Distribution: openmamba -Packager: Stefano Cotta Ramusino +Packager: Silvan Calarco URL: https://meld.sourceforge.net/ Source: http://ftp.gnome.org/pub/gnome/sources/meld/%{majorminor}/meld-%{version}.tar.xz License: GPL ## AUTOBUILDREQ-BEGIN -BuildRequires: libpython-devel +BuildRequires: libpython3-devel ## AUTOBUILDREQ-END BuildRequires: libscrollkeeper-devel BuildRequires: intltool @@ -19,7 +19,6 @@ Requires: patch Requires: pygobject Requires: pygtk Requires: libgtksourceview -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Meld is a visual diff and merge tool. @@ -27,25 +26,27 @@ You can compare two or three files and edit them in place (diffs update dynamica You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. +#% debug_package + %prep %setup -q #sed -i "s|update-mime-database|/bin/true|" Makefile #sed -i "s|update-desktop-database|/bin/true|" Makefile %build -CFLAGS="%{optflags}" %{__python36} setup.py build +CFLAGS="%{optflags}" %{__python3} setup.py build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%{__python36} setup.py \ +%{__python3} setup.py \ --no-update-icon-cache \ --no-compile-schemas \ install \ --prefix=%{_prefix} \ --root="%{buildroot}" \ --optimize=1 \ - --install-headers=%{_includedir}/python \ - --install-lib=%{python36_sitearch} \ + --install-headers=%{python3_inc} \ + --install-lib=%{python3_sitearch} \ --record=%{name}.filelist %find_lang %{name} @@ -79,9 +80,9 @@ fi %{_datadir}/icons/HighContrast/scalable/apps/org.gnome.meld.svg %{_datadir}/metainfo/org.gnome.meld.appdata.xml %{_datadir}/mime/packages/org.gnome.meld.xml -%{python36_sitearch}/meld-%{version}-py*.egg-info -%dir %{python36_sitearch}/meld -%{python36_sitearch}/meld/* +%{python3_sitearch}/meld-%{version}-py*.egg-info +%dir %{python3_sitearch}/meld +%{python3_sitearch}/meld/* %{_mandir}/man1/* %dir %{_datadir}/help/C/meld/ %{_datadir}/help/C/meld/* @@ -99,6 +100,9 @@ fi %doc COPYING %changelog +* Wed Apr 28 2021 Silvan Calarco 3.20.3-2mamba +- rebuilt with python3 + * Sat Feb 13 2021 Automatic Build System 3.20.3-1mamba - automatic version update by autodist