rpms/meld
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebuilt with python3 [release 3.20.3-2mamba;Wed Apr 28 2021]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-06 07:04:15 +01:00
parent 0e4829743a
commit 4793f9f3d7
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -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 files and edit them in place (diffs update dynamically).
You can compare two or three folders and launch file comparisons. 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. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial.

26
meld.spec
View File

@ -1,16 +1,16 @@
Name: meld Name: meld
Version: 3.20.3 Version: 3.20.3
Release: 1mamba Release: 2mamba
Summary: A visual diff and merge tool Summary: A visual diff and merge tool
Group: System/Libraries Group: System/Libraries
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Stefano Cotta Ramusino <stefano.cotta@openmamba.org> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://meld.sourceforge.net/ URL: https://meld.sourceforge.net/
Source: http://ftp.gnome.org/pub/gnome/sources/meld/%{majorminor}/meld-%{version}.tar.xz Source: http://ftp.gnome.org/pub/gnome/sources/meld/%{majorminor}/meld-%{version}.tar.xz
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: libpython-devel BuildRequires: libpython3-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: libscrollkeeper-devel BuildRequires: libscrollkeeper-devel
BuildRequires: intltool BuildRequires: intltool
@ -19,7 +19,6 @@ Requires: patch
Requires: pygobject Requires: pygobject
Requires: pygtk Requires: pygtk
Requires: libgtksourceview Requires: libgtksourceview
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description %description
Meld is a visual diff and merge tool. 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 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. 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 %prep
%setup -q %setup -q
#sed -i "s|update-mime-database|/bin/true|" Makefile #sed -i "s|update-mime-database|/bin/true|" Makefile
#sed -i "s|update-desktop-database|/bin/true|" Makefile #sed -i "s|update-desktop-database|/bin/true|" Makefile
%build %build
CFLAGS="%{optflags}" %{__python36} setup.py build CFLAGS="%{optflags}" %{__python3} setup.py build
%install %install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%{__python36} setup.py \ %{__python3} setup.py \
--no-update-icon-cache \ --no-update-icon-cache \
--no-compile-schemas \ --no-compile-schemas \
install \ install \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--root="%{buildroot}" \ --root="%{buildroot}" \
--optimize=1 \ --optimize=1 \
--install-headers=%{_includedir}/python \ --install-headers=%{python3_inc} \
--install-lib=%{python36_sitearch} \ --install-lib=%{python3_sitearch} \
--record=%{name}.filelist --record=%{name}.filelist
%find_lang %{name} %find_lang %{name}
@ -79,9 +80,9 @@ fi
%{_datadir}/icons/HighContrast/scalable/apps/org.gnome.meld.svg %{_datadir}/icons/HighContrast/scalable/apps/org.gnome.meld.svg
%{_datadir}/metainfo/org.gnome.meld.appdata.xml %{_datadir}/metainfo/org.gnome.meld.appdata.xml
%{_datadir}/mime/packages/org.gnome.meld.xml %{_datadir}/mime/packages/org.gnome.meld.xml
%{python36_sitearch}/meld-%{version}-py*.egg-info %{python3_sitearch}/meld-%{version}-py*.egg-info
%dir %{python36_sitearch}/meld %dir %{python3_sitearch}/meld
%{python36_sitearch}/meld/* %{python3_sitearch}/meld/*
%{_mandir}/man1/* %{_mandir}/man1/*
%dir %{_datadir}/help/C/meld/ %dir %{_datadir}/help/C/meld/
%{_datadir}/help/C/meld/* %{_datadir}/help/C/meld/*
@ -99,6 +100,9 @@ fi
%doc COPYING %doc COPYING
%changelog %changelog
* Wed Apr 28 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 3.20.3-2mamba
- rebuilt with python3
* Sat Feb 13 2021 Automatic Build System <autodist@mambasoft.it> 3.20.3-1mamba * Sat Feb 13 2021 Automatic Build System <autodist@mambasoft.it> 3.20.3-1mamba
- automatic version update by autodist - automatic version update by autodist