commit 467d528c911b35594833e432e3a3b6ec1f58c904
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Mon Jan 6 14:45:31 2020 +0100
- updated dependencies
- added install patch (move install_data options from global to
install_data, use py3_install macro)
- release 4
meld-install.patch | 42 ++++++++++++++++++++++++++++++++++++++++
meld.spec | 57 ++++++++++++++++++++++++++----------------------------
2 files changed, 69 insertions(+), 30 deletions(-)
---
diff --git a/meld.spec b/meld.spec
index 25d74a6..cf6aaa9 100644
--- a/meld.spec
+++ b/meld.spec
@@ -2,36 +2,35 @@ Summary: Visual diff and merge tool
Summary(pl.UTF-8): Wizualne narzędzie do oglądania i włączania zmian (diff)
Name: meld
Version: 3.20.1
-Release: 3
-License: GPL
+Release: 4
+License: GPL v2+
Group: Applications/Text
Source0:
http://ftp.gnome.org/pub/GNOME/sources/meld/3.20/%{name}-%{version}.tar.xz
# Source0-md5: 0a2419d75fc8f8677fa6b4ce31ca8adc
Patch0: %{name}-desktop.patch
Patch1: python3.8.patch
+Patch2: %{name}-install.patch
URL: http://meld.sourceforge.net/
BuildRequires: intltool
BuildRequires: itstool
BuildRequires: python3-modules >= 1:3.3
-BuildRequires: python3-setuptools
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.710
+BuildRequires: rpmbuild(macros) >= 1.714
BuildRequires: tar >= 1:1.22
BuildRequires: xz
+# for versions see bin/meld /check_requirements
Requires(post,postun): desktop-file-utils
-Requires(post,postun): glib2 >= 1:2.26.0
+Requires(post,postun): glib2 >= 1:2.48
Requires(post,postun): gtk-update-icon-cache
-Requires: glib2 >= 1:2.36
-Requires: gtk+3 >= 3.14
-Requires: gtksourceview3 >= 3.14
+Requires: glib2 >= 1:2.48
+Requires: gtk+3 >= 3.20
+Requires: gtksourceview3 >= 3.20.0
Requires: hicolor-icon-theme
Requires: pango >= 1:1.26
Requires: python3-modules >= 1:3.3
Requires: python3-pycairo
Requires: python3-pygobject3 >= 3.14
-# sr@Latn vs. sr@latin
-Conflicts: glibc-misc < 6:2.7
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -56,26 +55,24 @@ zakładkami, pozwalający na otwieranie wielu plików diff
naraz.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+
+cp -p meld/vc/COPYING COPYING.vc
+cp -p meld/vc/README README.vc
%build
+%py3_build
%install
rm -rf $RPM_BUILD_ROOT
-%{__python3} setup.py \
+%py3_install install_data \
--no-compile-schemas \
- --no-update-icon-cache \
- build --build-base=build-3 \
- install --skip-build \
- --prefix=%{_prefix} \
- --install-purelib=%{py3_sitescriptdir} \
- --install-platlib=%{py3_sitedir} \
- --optimize=2 \
- --root=$RPM_BUILD_ROOT
+ --no-update-icon-cache
-%{__rm} -r $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-%find_lang %{name} --with-gnome --with-omf
+%find_lang %{name} --with-gnome
%clean
rm -rf $RPM_BUILD_ROOT
@@ -92,9 +89,9 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc NEWS
-%attr(755,root,root) %{_bindir}/%{name}
-%dir %{py3_sitescriptdir}/meld-*.egg-info
+%doc NEWS COPYING.vc README.vc
+%attr(755,root,root) %{_bindir}/meld
+%dir %{py3_sitescriptdir}/meld-%{version}-py*.egg-info
%dir %{py3_sitescriptdir}/%{name}
%{py3_sitescriptdir}/%{name}/*.py
%{py3_sitescriptdir}/%{name}/__pycache__
@@ -107,14 +104,14 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py3_sitescriptdir}/%{name}/vc
%{py3_sitescriptdir}/%{name}/vc/*.py
%{py3_sitescriptdir}/%{name}/vc/__pycache__
-%{_iconsdir}/hicolor/*/actions/*.png
-%{_iconsdir}/hicolor/*/apps/org.gnome.meld.png
-%{_iconsdir}/hicolor/*/apps/*.svg
-%{_iconsdir}/hicolor/*/apps/meld-version-control.png
+%{_iconsdir}/hicolor/16x16/actions/meld-change-*.png
+%{_iconsdir}/hicolor/*x*/apps/meld-version-control.png
+%{_iconsdir}/hicolor/*x*/apps/org.gnome.meld.png
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.meld.svg
%{_iconsdir}/HighContrast/scalable/apps/org.gnome.meld.svg
%{_datadir}/%{name}
-%{_datadir}/metainfo/org.gnome.meld.appdata.xml
%{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml
+%{_datadir}/metainfo/org.gnome.meld.appdata.xml
%{_datadir}/mime/packages/org.gnome.meld.xml
%{_desktopdir}/org.gnome.meld.desktop
-%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/meld.1*
diff --git a/meld-install.patch b/meld-install.patch
new file mode 100644
index 0000000..62cfc2a
--- /dev/null
+++ b/meld-install.patch
@@ -0,0 +1,42 @@
+--- meld-3.20.1/meld/build_helpers.py.orig 2020-01-04 09:01:35.032939451
+0100
++++ meld-3.20.1/meld/build_helpers.py 2020-01-06 12:55:45.200685245 +0100
+@@ -66,10 +66,6 @@
+
+
+ class MeldDistribution(distutils.dist.Distribution):
+- global_options = distutils.dist.Distribution.global_options + [
+- ("no-update-icon-cache", None, "Don't run gtk-update-icon-cache"),
+- ("no-compile-schemas", None, "Don't compile gsettings schemas"),
+- ]
+
+ def __init__(self, *args, **kwargs):
+ self.no_update_icon_cache = False
+@@ -407,17 +407,26 @@
+
+
+ class install_data(distutils.command.install_data.install_data):
++ user_options = distutils.command.install_data.install_data.user_options +
[
++ ("no-update-icon-cache", None, "Don't run gtk-update-icon-cache"),
++ ("no-compile-schemas", None, "Don't compile gsettings schemas"),
++ ]
++
++ def initialize_options(self):
++ distutils.command.install_data.install_data.initialize_options(self)
++ self.no_update_icon_cache = None
++ self.no_compile_schemas = None
+
+ def run(self):
+ distutils.command.install_data.install_data.run(self)
+
+- if not self.distribution.no_update_icon_cache:
++ if not self.no_update_icon_cache:
+ # TODO: Generalise to non-hicolor icon themes
+ info("running gtk-update-icon-cache")
+ icon_path = os.path.join(self.install_dir, "share/icons/hicolor")
+ self.spawn(["gtk-update-icon-cache", "-q", "-t", icon_path])
+
+- if not self.distribution.no_compile_schemas:
++ if not self.no_compile_schemas:
+ info("compiling gsettings schemas")
+ gschema_path = build_data.gschemas[0][0]
+ gschema_install = os.path.join(self.install_dir, gschema_path)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/meld.git/commitdiff/467d528c911b35594833e432e3a3b6ec1f58c904
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
