[rpms/httrack] rawhide: update to 3.49.8-2 fixes rhbz#2491009

[rpms/httrack] rawhide: update to 3.49.8-2 fixes rhbz#2491009

[Filipe Rosset]

            A new commit has been pushed.

            Repo   : rpms/httrack
            Branch : rawhide
            Commit : 8ecb3b21a18b6654b2eb15c905d93955489900ae
            Author : Filipe Rosset <filiperosset@fedoraproject.org>
            Date   : 2026-06-20T19:36:12-03:00
            Stats  : +1/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/httrack/c/8ecb3b21a18b6654b2eb15c905d93955489900ae?branch=rawhide

            Log:
            update to 3.49.8-2 fixes rhbz#2491009

Signed-off-by: Filipe Rosset <filiperosset@fedoraproject.org>

---
diff --git a/sources b/sources
index 681f3ba..e0185e7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (httrack-3.49.8-2.tar.gz) = 5039c5dd398fc594fbad5aa272c3a8faf54433d6b82a4a45a7e440384c10deeb7f1fbdb8f7158cfeaa91ddddfc729c92bbc2d6cf7d92fcfef41939e1dc6818d2
+SHA512 (coucal-73ada075553b7607d083037a87cb9c73b3683bfc.tar.gz) = 818cfdbf6038cf27433973d3994f7231c61c366b44a28dd74e1a6d216c9bbb66b0699bf40ccbd7816de7876d73b096b93d895f6f61efbd0d79c39d559b3aee73

[rpms/httrack] rawhide: update to 3.49.8-2 fixes rhbz#2491009

[Filipe Rosset]

            A new commit has been pushed.

            Repo   : rpms/httrack
            Branch : rawhide
            Commit : 1eb9c9e290b6c52f4d27a35b944156cf323a21db
            Author : Filipe Rosset <filiperosset@fedoraproject.org>
            Date   : 2026-06-20T19:35:35-03:00
            Stats  : +22/-13 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/httrack/c/1eb9c9e290b6c52f4d27a35b944156cf323a21db?branch=rawhide

            Log:
            update to 3.49.8-2 fixes rhbz#2491009

Signed-off-by: Filipe Rosset <filiperosset@fedoraproject.org>

---
diff --git a/httrack.spec b/httrack.spec
index 408d7c4..5ae1939 100644
--- a/httrack.spec
+++ b/httrack.spec
@@ -1,12 +1,13 @@
 %global coucal_commit 73ada075553b7607d083037a87cb9c73b3683bfc
+%global upstream_version 3.49.8-2
 
 Name:           httrack
-Version:        3.49.7
+Version:        3.49.8^2
 Release:        %autorelease
 Summary:        Website copier and offline browser
 License:        GPL-3.0-or-later AND BSD-3-Clause
 URL:            https://github.com/xroche/httrack/
-Source:         https://github.com/xroche/httrack/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/xroche/httrack/archive/%{upstream_version}/%{name}-%{upstream_version}.tar.gz
 Source1:        https://github.com/xroche/coucal/archive/%{coucal_commit}/coucal-%{coucal_commit}.tar.gz
 BuildRequires:  autoconf
 BuildRequires:  autoconf-archive
@@ -14,12 +15,15 @@ BuildRequires:  automake
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
+BuildRequires:  libappstream-glib
 BuildRequires:  libtool
 BuildRequires:  make
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
 Requires:       hicolor-icon-theme
 Requires:       xdg-utils
+Provides:       bundled(coucal) = 0^git73ada07
+
 
 %description
 HTTrack is a free and easy-to-use offline browser utility. It allows the user 
@@ -40,7 +44,7 @@ This package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%autosetup -p1 -a 1
+%autosetup -n %{name}-%{upstream_version} -p1 -a 1
 rmdir src/coucal
 mv coucal-%{coucal_commit} src/coucal
 autoreconf -vfi
@@ -52,6 +56,13 @@ sed -i '/write to the Free Software/{N;s|write to the Free Software\nFoundation,
 iconv --from-code ISO8859-1 --to-code UTF-8 ./html/contact.html \
   --output contact.utf-8 && mv contact.utf-8 ./html/contact.html
 
+# Fix AppStream icon validation error by removing the invalid stock icon tag
+sed -i '/<icon type="stock">httrack<\/icon>/d' html/server/div/com.httrack.WebHTTrack.metainfo.xml
+
+# Avoid duplicate files warning in rpmlint by symlinking license.txt to COPYING
+rm -f license.txt
+ln -s COPYING license.txt
+
 %build
 %configure  --disable-static \
             --disable-online-unit-tests \
@@ -85,18 +96,16 @@ rm %{buildroot}%{_pkgdocdir}/html/license.txt
 rm %{buildroot}%{_datadir}/%{name}/html
 ln -s ../doc/%{name}/html %{buildroot}%{_datadir}/%{name}/html
 
-desktop-file-install --delete-original \
-  --dir %{buildroot}%{_datadir}/applications \
-  %{buildroot}%{_datadir}/applications/WebHTTrack.desktop
-
-desktop-file-install --delete-original \
-  --dir %{buildroot}%{_datadir}/applications \
-  %{buildroot}%{_datadir}/applications/WebHTTrack-Websites.desktop
-
 %check
 export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 make check -C tests
 
+desktop-file-validate %{buildroot}%{_datadir}/applications/WebHTTrack.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/WebHTTrack-Websites.desktop
+appstream-util validate-relax --nonet \
+%{buildroot}%{_metainfodir}/com.httrack.WebHTTrack.metainfo.xml
+
+
 %files
 %{_pkgdocdir}
 %exclude %{_pkgdocdir}/libtest
@@ -116,6 +125,7 @@ make check -C tests
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man1/proxytrack.1*
 %{_mandir}/man1/webhttrack.1*
+%{_metainfodir}/com.httrack.WebHTTrack.metainfo.xml
 
 %files devel
 %{_pkgdocdir}/libtest/

diff --git a/sources b/sources
index 6a825bf..681f3ba 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (httrack-3.49.7.tar.gz) = d50b1b35bce069539f819de9add5899279eda9c8c603b501f51cc4531ef0c35901ccb557de59f76a2d4d2f0da6ed38a82514e0784c7b7d0410b65fd23ddc9fbe
-SHA512 (coucal-73ada075553b7607d083037a87cb9c73b3683bfc.tar.gz) = 818cfdbf6038cf27433973d3994f7231c61c366b44a28dd74e1a6d216c9bbb66b0699bf40ccbd7816de7876d73b096b93d895f6f61efbd0d79c39d559b3aee73
+SHA512 (httrack-3.49.8-2.tar.gz) = 5039c5dd398fc594fbad5aa272c3a8faf54433d6b82a4a45a7e440384c10deeb7f1fbdb8f7158cfeaa91ddddfc729c92bbc2d6cf7d92fcfef41939e1dc6818d2