Skip to content

Commit

Permalink
meld: Autospec creation for update from version 3.20.2 to version 3.20.3
Browse files Browse the repository at this point in the history
Packaging notes:

- A PyPI package exists with the name 'meld', but it's unrelated to this
  package. Autospec should probably have a heuristic to make a better
  guess about whether a package corresponds to a PyPI package with the
  same (canonicalized) name. For now, ban all pypi requires. Autospec
  issue filed at clearlinux/autospec#652.

Shortlog:

Andika Triwidada (1):
      Update Indonesian translation

Daniel Șerbănescu (3):
      Update Romanian translation
      Update Romanian translation
      Update Romanian translation

Kai Willadsen (13):
      Post-release version bump
      ui.msgarea: Allow Infobar text to wrap at character boundaries (#432)
      Fix dialog border width for custom filechooser (#451)
      meldapp: Mark clipboard targets to be kept after exit (#482)
      filediff: Handle our delete handler being called multiple times (#502)
      dirdiff: Fix sensitivity when cancelling existing folder scans (#499)
      Update DOAP links to HTTPS
      Update DOAP to reflect mailing list move to discourse
      Update README for discourse move
      vc.svn: Update xml.etree API usage for Python 3.9 (#526)
      CI: Sync up Windows build with the newer CI build from master
      CI: Add an explicit setuptools requirement
      Update NEWS + appdata

Sabri Ünal (1):
      Update Turkish translation

Stephan Woidowski (1):
      Update German translation

Yuri Chornoivan (3):
      Update Ukrainian translation
      Add Ukrainian translation
      Update Ukrainian translation

Мирослав Николић (1):
      Update Serbian translation

2021-02-13 meld 3.20.3
======================

  Fixes:

   * Fix folder comparison sensitivity breaking when cancelling a scan (Kai
     Willadsen)
   * Fix Subversion comparsion on Python 3.9 (Kai Willadsen)
   * Retain clipboard contents after exiting Meld (Kai Willadsen)
   * Fix wrapping in notification bars (Kai Willadsen)
   * Fix border width in our file selection dialog (Kai Willadsen)
   * Fix occasional traceback when closing comparisons (Kai Willadsen)
   * Update links to reflect move to Discourse (Kai Willadsen)

   * Issues fixed: 432, 451, 482, 499, 502, 526

(NEWS truncated at 15 lines)
  • Loading branch information
phmccarty committed Feb 16, 2021
1 parent c4580d5 commit 643dcde
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME := meld
URL = https://download.gnome.org/sources/meld/3.20/meld-3.20.2.tar.xz
URL = https://download.gnome.org/sources/meld/3.20/meld-3.20.3.tar.xz
ARCHIVES =

include ../common/Makefile.common
26 changes: 26 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,30 @@

2021-02-13 meld 3.20.3
======================

Fixes:

* Fix folder comparison sensitivity breaking when cancelling a scan (Kai
Willadsen)
* Fix Subversion comparsion on Python 3.9 (Kai Willadsen)
* Retain clipboard contents after exiting Meld (Kai Willadsen)
* Fix wrapping in notification bars (Kai Willadsen)
* Fix border width in our file selection dialog (Kai Willadsen)
* Fix occasional traceback when closing comparisons (Kai Willadsen)
* Update links to reflect move to Discourse (Kai Willadsen)

* Issues fixed: 432, 451, 482, 499, 502, 526


Translations:

* Andika Triwidada (id)
* Daniel Șerbănescu (ro)
* Sabri Ünal (tr)
* Stephan Woidowski (de)
* Yuri Chornoivan (uk)
* Мирослав Николић (sr)

2020-02-16 meld 3.20.2
======================

Expand Down
3 changes: 3 additions & 0 deletions description
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Meld is the visual diff and merge tool of GNOME, targeted at developers. It
allows users to compare two or three files or directories visually,
color-coding the different lines.
35 changes: 19 additions & 16 deletions meld.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# Generated by: autospec.py
#
Name : meld
Version : 3.20.2
Release : 36
URL : https://download.gnome.org/sources/meld/3.20/meld-3.20.2.tar.xz
Source0 : https://download.gnome.org/sources/meld/3.20/meld-3.20.2.tar.xz
Version : 3.20.3
Release : 37
URL : https://download.gnome.org/sources/meld/3.20/meld-3.20.3.tar.xz
Source0 : https://download.gnome.org/sources/meld/3.20/meld-3.20.3.tar.xz
Summary : Visual diff and merge tool
Group : Development/Tools
License : BSD-2-Clause CC-BY-SA-3.0 GPL-2.0 GPL-2.0+
Expand All @@ -29,9 +29,9 @@ BuildRequires : libxml2
BuildRequires : pygobject

%description
This is vc, the version control working copy library.
It is licenced separately from meld with the BSD licence.
See COPYING for details.
Meld is the visual diff and merge tool of GNOME, targeted at developers. It
allows users to compare two or three files or directories visually,
color-coding the different lines.

%package bin
Summary: bin components for the meld package.
Expand Down Expand Up @@ -97,21 +97,22 @@ python components for the meld package.
Summary: python3 components for the meld package.
Group: Default
Requires: python3-core
Provides: pypi(meld)

%description python3
python3 components for the meld package.


%prep
%setup -q -n meld-3.20.2
cd %{_builddir}/meld-3.20.2
%setup -q -n meld-3.20.3
cd %{_builddir}/meld-3.20.3

%build
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C.UTF-8
export SOURCE_DATE_EPOCH=1586242613
export SOURCE_DATE_EPOCH=1613501721
export GCC_IGNORE_WERROR=1
export AR=gcc-ar
export RANLIB=gcc-ranlib
Expand All @@ -127,10 +128,10 @@ python3 setup.py build
export MAKEFLAGS=%{?_smp_mflags}
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/meld
cp %{_builddir}/meld-3.20.2/COPYING %{buildroot}/usr/share/package-licenses/meld/4cc77b90af91e615a64ae04893fdffa7939db84c
cp %{_builddir}/meld-3.20.2/data/icons/COPYING %{buildroot}/usr/share/package-licenses/meld/3e0c4049892ab31e3aaf45c71f830176bc566c14
cp %{_builddir}/meld-3.20.2/data/icons/COPYING_CCBYSA3 %{buildroot}/usr/share/package-licenses/meld/80059f30d312011eaf041ce648eeca6473a08746
cp %{_builddir}/meld-3.20.2/meld/vc/COPYING %{buildroot}/usr/share/package-licenses/meld/14c4e1f2e383319099e47e974f26fba40e0c975d
cp %{_builddir}/meld-3.20.3/COPYING %{buildroot}/usr/share/package-licenses/meld/4cc77b90af91e615a64ae04893fdffa7939db84c
cp %{_builddir}/meld-3.20.3/data/icons/COPYING %{buildroot}/usr/share/package-licenses/meld/3e0c4049892ab31e3aaf45c71f830176bc566c14
cp %{_builddir}/meld-3.20.3/data/icons/COPYING_CCBYSA3 %{buildroot}/usr/share/package-licenses/meld/80059f30d312011eaf041ce648eeca6473a08746
cp %{_builddir}/meld-3.20.3/meld/vc/COPYING %{buildroot}/usr/share/package-licenses/meld/14c4e1f2e383319099e47e974f26fba40e0c975d
python3 -tt setup.py build install --root=%{buildroot}
echo ----[ mark ]----
cat %{buildroot}/usr/lib/python3*/site-packages/*/requires.txt || :
Expand Down Expand Up @@ -178,7 +179,9 @@ rm -f %{buildroot}/usr/share/icons/hicolor/icon-theme.cache
/usr/share/meld/icons/vc-resolve-24.png
/usr/share/meld/icons/vc-update-24.png
/usr/share/meld/meld.css
/usr/share/meld/styles/meld-base.style-scheme.xml
/usr/share/meld/styles/meld-base.xml
/usr/share/meld/styles/meld-dark.style-scheme.xml
/usr/share/meld/styles/meld-dark.xml
/usr/share/meld/ui/EditableList.ui
/usr/share/meld/ui/application.ui
Expand All @@ -203,8 +206,8 @@ rm -f %{buildroot}/usr/share/icons/hicolor/icon-theme.cache

%files doc
%defattr(0644,root,root,0755)
/usr/share/doc/meld-3.20.2/COPYING
/usr/share/doc/meld-3.20.2/NEWS
/usr/share/doc/meld-3.20.3/COPYING
/usr/share/doc/meld-3.20.3/NEWS
/usr/share/help/C/meld/command-line.page
/usr/share/help/C/meld/file-changes.page
/usr/share/help/C/meld/file-filters.page
Expand Down
2 changes: 1 addition & 1 deletion options.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = meld
url = https://download.gnome.org/sources/meld/3.20/meld-3.20.2.tar.xz
url = https://download.gnome.org/sources/meld/3.20/meld-3.20.3.tar.xz
archives =
giturl = https://gitlab.gnome.org/GNOME/meld
domain =
Expand Down
7 changes: 7 additions & 0 deletions python3_requires_ban
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pypi(graphtools)
pypi(numpy)
pypi(pandas)
pypi(pygsp)
pypi(scipy)
pypi(scprep)
pypi(sklearn)
2 changes: 1 addition & 1 deletion release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
36
37
1 change: 1 addition & 0 deletions summary
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Visual diff and merge tool
2 changes: 1 addition & 1 deletion upstream
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6aa69d9841efe7535f7699e0f5a895034f182e41/meld-3.20.2.tar.xz
9e045b0421f91bc0726825d88da0cf1cea1701ca/meld-3.20.3.tar.xz
2 changes: 1 addition & 1 deletion versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.20.2
3.20.3

0 comments on commit 643dcde

Please sign in to comment.