Compare commits
4 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 69b5393661 | |||
| 895ecd2299 | |||
| 0393b10b8e | |||
| dc88735b31 |
20
_service
Normal file
20
_service
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<services>
|
||||||
|
<service name="obs_scm" mode="manual">
|
||||||
|
<param name="scm">git</param>
|
||||||
|
<param name="url">https://gitlab.gnome.org/GNOME/meld.git</param>
|
||||||
|
<param name="revision">3.23.1</param>
|
||||||
|
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
|
||||||
|
<param name="versionrewrite-pattern">(.*)\+0</param>
|
||||||
|
<param name="versionrewrite-replacement">\1</param>
|
||||||
|
<!-- <param name="changesgenerate">enable</param> -->
|
||||||
|
</service>
|
||||||
|
<service name="tar" mode="buildtime"/>
|
||||||
|
<service name="recompress" mode="buildtime">
|
||||||
|
<param name="file">*.tar</param>
|
||||||
|
<param name="compression">zst</param>
|
||||||
|
</service>
|
||||||
|
<service name="set_version" mode="manual">
|
||||||
|
</service>
|
||||||
|
</services>
|
||||||
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:37f7f29eb1ff0fec4d8b088d5483c556de1089f6d018fe6d481993caf2499d84
|
|
||||||
size 676560
|
|
||||||
3
meld-3.23.1.obscpio
Normal file
3
meld-3.23.1.obscpio
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:dd9eaa8a94282b37692efe045d230786c8b51d40f11009fccab9b21cdc808c43
|
||||||
|
size 5834765
|
||||||
38
meld.changes
38
meld.changes
@@ -1,3 +1,41 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 31 06:52:27 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
- Update to version 3.23.1:
|
||||||
|
+ Fix crash on image comparison with admin:// scheme
|
||||||
|
+ Fix subfolder comparison initiation
|
||||||
|
+ Fix action duplication without cursor movement
|
||||||
|
+ Update dependency requirements and other README details
|
||||||
|
+ Use appstream for appdata validation test
|
||||||
|
+ Rename appdata to metainfo
|
||||||
|
+ Updated translations.
|
||||||
|
- Replace appstream-glib for AppStream BuildRequires, and use
|
||||||
|
meson_test macro instead of manual calls to validate metainfo and
|
||||||
|
desktop files.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Mar 23 07:39:40 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
- Update to version 3.23.0:
|
||||||
|
+ Features:
|
||||||
|
- Add new side-by-side image file comparison
|
||||||
|
- Add CI build support for macOS
|
||||||
|
- Add version control support for Git unstaging
|
||||||
|
- Added option to compare folders based on size only
|
||||||
|
- Support starting with blank comparison panes using @blank
|
||||||
|
- Per-pane path labels now accept drag-n-drop to open files
|
||||||
|
+ UI Changes:
|
||||||
|
- Icon updates
|
||||||
|
- Use development styling when uninstalled
|
||||||
|
- Shortcut and mnemonic updates and shortcut documentation
|
||||||
|
fixes
|
||||||
|
- Help documentation updates
|
||||||
|
- String updates and translation fixes
|
||||||
|
+ Updated translations.
|
||||||
|
- For complete overview of changes, please see the included NEWS
|
||||||
|
file.
|
||||||
|
- Switch to source service for tarball/sources.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 8 08:38:57 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
|
Wed Jan 8 08:38:57 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
|||||||
4
meld.obsinfo
Normal file
4
meld.obsinfo
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
name: meld
|
||||||
|
version: 3.23.1
|
||||||
|
mtime: 1767158283
|
||||||
|
commit: 09f740b2141239bc4b29aa359c18c89747d112ce
|
||||||
16
meld.spec
16
meld.spec
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package meld
|
# spec file for package meld
|
||||||
#
|
#
|
||||||
# Copyright (c) 2025 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC and contributors
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -17,14 +17,15 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: meld
|
Name: meld
|
||||||
Version: 3.22.3
|
Version: 3.23.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Visual diff and merge tool
|
Summary: Visual diff and merge tool
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: Development/Tools/Other
|
Group: Development/Tools/Other
|
||||||
URL: https://meldmerge.org/
|
URL: https://meldmerge.org/
|
||||||
Source0: https://download.gnome.org/sources/meld/3.22/%{name}-%{version}.tar.xz
|
Source0: %{name}-%{version}.tar.zst
|
||||||
BuildRequires: appstream-glib
|
|
||||||
|
BuildRequires: AppStream
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
# Needed for typelib() Requires
|
# Needed for typelib() Requires
|
||||||
@@ -81,17 +82,16 @@ Subversion, Bazaar-ng and Mercurial can be browsed and viewed.
|
|||||||
%fdupes %{buildroot}%{_datadir}
|
%fdupes %{buildroot}%{_datadir}
|
||||||
|
|
||||||
%check
|
%check
|
||||||
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.Meld.appdata.xml
|
%meson_test
|
||||||
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Meld.desktop
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc NEWS
|
%doc NEWS
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
%{_datadir}/%{name}/
|
%{_datadir}/%{name}/
|
||||||
%{_datadir}/metainfo/org.gnome.Meld.appdata.xml
|
%{_datadir}/metainfo/org.gnome.Meld.metainfo.xml
|
||||||
%{_datadir}/applications/org.gnome.Meld.desktop
|
%{_datadir}/applications/org.gnome.Meld.desktop
|
||||||
%{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml
|
%{_datadir}/glib-2.0/schemas/org.gnome.Meld.gschema.xml
|
||||||
%doc %{_datadir}/help/C/meld/
|
%doc %{_datadir}/help/C/meld/
|
||||||
%{_datadir}/icons/hicolor/*/*/*
|
%{_datadir}/icons/hicolor/*/*/*
|
||||||
%{_datadir}/mime/packages/org.gnome.Meld.xml
|
%{_datadir}/mime/packages/org.gnome.Meld.xml
|
||||||
|
|||||||
Reference in New Issue
Block a user