pool/kdiff3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 913377 from KDE:Extra

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/913377
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2021-08-23 08:08:03 +00:00 committed by Git OBS Bridge
commit 343afec89c
7 changed files with 30 additions and 1391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1369
0001-Collected-fixes-from-master.patch
View File

File diff suppressed because it is too large Load Diff

3
kdiff3-1.9.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f1775f1ca501080363707b2923d493fc314ae4f0b00b172d4cad9b4d3cc2d805
size 1053404

16
kdiff3-1.9.2.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmCip8UACgkQ9EKzbWFL
Brz8sw//TUw2Istgn3/gzTNQAZPM2ESnrPRGrSjxjkGt3k+Q4RUA90tGTgaUfKCo
57ctuCBhnw9othrEptVj2cmVIobYDwnGeXjZtNbajT022nYXFBDDvKMaXgREGrVa
pQiLN9IPifDdunctIJwtVSzlBC4Al6XgBfxB2jS6KRoaGT3/TVrqgRg10Rvnj03i
acysMwqiVT4udbCP+0vSvbUpWtzcNsQM5F5dJVF9fSe6n9KqBGiLPc2srTVBCqqr
YsDV0kRaszBdE0bB+Ig7m3NcK/B/O1KzyvwTbX/+ANSH390Htm96GPUfTHUiUFiQ
Mcp6oHrY3dl9vnLcZZfxhnEvIJPIV/FaacXdN6EtHm9j44VFmlBWquvWli5NSwqG
aBAkYPOsE6l2sHYioQBM+51juXk6CbfNz+3wo3L2rXC40LqtgqS2IDgRF3f8wsah
cK489y7b7HkFVkJ2MEi8grmhRs1UEJhYtbaa/j4Ez6+zOqsO9KVJAPSc38COYjpy
GrhPhtD/WTzuFtoJrw3wMYVX3hgJufZBKs/o4NjqMQRC4MaEiLE9+siFvyAVmXFG
/R1yCVgeapb00nM3PGAvLFX5GDowR8R5JPrcPCPHrcXs+QsI6EEMk3817g+zbCbD
QY5wcngfFon+oRMx5PrEQpryC8iFJ3WKgnWLoDgx//f8IuAbwH0=
=rdtz
-----END PGP SIGNATURE-----

3
kdiff3-1.9.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:317bf5c7e27cba81bce7e1a7a579105443133b633cbb71bc1f169e86a235af9c
size 1056920

16
kdiff3-1.9.3.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmEdUAEACgkQ9EKzbWFL
BrxtURAAsWEgaEqwBEdFZorV3JCHjnvI4bMiJ/iRojJnp/Oi5+/Rvm8LKrl7RD/U
FXLQOOWYrY30wLEForWp8Yz54xQzOh6RMcSQXK9Ojy79OfRuaD4BU+KDuyfXXZdy
dbjhfaV7QQAYZDW/CcRLQDD+Kc1B8FMr9slyd/b6gYnpEqHQ038bEgOm5CeXvadO
pyt0ET2pA/6Qp2+a++nHxQp5mDb8bZADrJrABNiWrTH4NTcAWtR1pCNp5yPFWDqB
6YuRv6yhOg9bWDidXgvIF3H2twooeUzyPZ1Nbxc3jJ8l/yW4B9KG+uFsb6iJliBh
ivHEUFhlZwvOg3haV5pQQT7yUX2SuoA6S41qP7abQY9AyUA8yh8gm7CCe7j7lPj5
T3ik7GRbKrTrsgRKMUv2yUCNpnXEZxfGyAALUj+OyF9Irg2aJ8r1yjf1dbchNE5Y
KVh6/mWy0xzFrC6LOOHDoYUibB8SOaH4Rbe+hE1LmBYCk+YinGM24CAvwWYy9qs4
6Gc+uJ7gL9G06CjpYXGTkujlf8ryEG5eaztATj6ZdbU1BrI+ysdex9ztBUW82sMt
NybrkBendsyE8PJSSXk3U2hxuABxXOaPEYnAWiLrgldwf6mz8/klU5jyzf7gKZkF
Y/r2+Co055f5CJzb1Av/cjUx2JD6siSBV5UdF304/grwFYRFuVw=
=nhB8
-----END PGP SIGNATURE-----

10
kdiff3.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Aug 20 12:58:46 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
- Update to 1.9.3
* Fix multiple regressions in file comparison
* Fix trailing EOL stripped (kde#437570)
* Fix arbitrary line insertion during merge (kde#437570)
- Drop 0001-Collected-fixes-from-master.patch, the relevant fixes
are included in this release
-------------------------------------------------------------------
Mon Jun 28 13:10:55 UTC 2021 - Tilman Vogel <tilman.vogel@web.de>

4
kdiff3.spec
View File

@ -18,7 +18,7 @@
%bcond_without lang
Name: kdiff3
Version: 1.9.2
Version: 1.9.3
Release: 0
Summary: Code Comparison Utility
License: GPL-2.0-or-later
@ -27,8 +27,6 @@ URL: https://apps.kde.org/kdiff3
Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig
Source2: kdiff3.keyring
# PATCH-FIX-UPSTREAM
Patch0: 0001-Collected-fixes-from-master.patch
BuildRequires: boost-devel
BuildRequires: extra-cmake-modules
BuildRequires: fdupes