diff --git a/jd.spec b/jd.spec index ba33ca3..c553b7e 100644 --- a/jd.spec +++ b/jd.spec @@ -11,28 +11,30 @@ ########################################## # Defined by upsteam # -%define main_ver 0.15.0 +%define main_ver 0.10.1 #%%define strtag 20200118 -%dnl %define pre_ver beta +#%%define pre_ver beta ########################################## # %global reponame JDim -%global gitdate 20260110 -%global gitcommit 95c8d64c60e607aebb9097b9dd4b865670b1844c -%dnl %global gitcommit JDim-v%{main_ver} +%global gitdate 20230723 +%global gitcommit a9a364306b99c480d1407f77f8a5fc9efc665a36 +#%%global gitcommit JDim-v%{main_ver} %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20260110 -%global tarballtime 2319 +%global tarballdate 20230723 +%global tarballtime 2216 ########################################## # Defined by vendor # +%define baserelease 1 %define extra_rel %{nil} %define use_gitcommit_as_rel 0 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora +%define gtkmmdevel pkgconfig(gtkmm-3.0) %define fontpackage mona-fonts-VLGothic ########################################## @@ -67,9 +69,6 @@ %endif #%%undefine _annotated_build -%if 0%{?use_gitcommit_as_rel} >= 1 -%global clamp_mtime_to_source_date_epoch 0 -%endif ########################################## @@ -79,16 +78,15 @@ Version: %{main_ver}%{?strtag:.%{strtag}}%{?pre_ver:~%{pre_ver}}%{gitver_ Release: 1%{?dist}%{flagrel} Summary: A 2ch browser -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only +License: GPLv2 URL: https://github.com/JDimproved/JDim -%dnl Source0: http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz +#Source0: http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz Source0: JDim-%{tarballdate}T%{tarballtime}.tar.gz Source1: create-JD-git-bare-tarball.sh BuildRequires: gcc-c++ -BuildRequires: pkgconfig(gtkmm-3.0) +BuildRequires: %{gtkmmdevel} BuildRequires: libgcrypt-devel BuildRequires: libxcrypt-devel BuildRequires: pkgconfig(alsa) @@ -162,6 +160,12 @@ export LDFLAGS="$LDFLAGS -Wl,--push-state,--no-as-needed -lcrypt -Wl,--pop-state export CC="${CC} -fsanitize=address -fsanitize=undefined" export CXX="${CXX} -fsanitize=address -fsanitize=undefined" export LDFLAGS="${LDFLAGS} -pthread" + +# Currently -fPIE binary cannot work with ASAN on kernel 4.12 +# https://github.com/google/sanitizers/issues/837 +export CFLAGS="$(echo $CFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')" +export CXXFLAGS="$(echo $CXXFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')" +export LDFLAGS="$(echo $LDFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')" %endif %meson \ @@ -201,8 +205,7 @@ export ASAN_OPTIONS=detect_leaks=0 %files %defattr(-,root,root,-) %license COPYING -%doc ChangeLog -%doc README.md +%doc ChangeLog README %{_bindir}/jdim %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop @@ -211,45 +214,6 @@ export ASAN_OPTIONS=detect_leaks=0 %{_datadir}/icons/hicolor/*/apps/jdim.* %changelog -* Sat Jan 10 2026 Mamoru TASAKA - 1:0.15.0-1 -- 0.15.0 - -* Sun Jul 27 2025 Mamoru TASAKA - 1:0.14.0-1 -- 0.14.0 - -* Thu Jul 24 2025 Fedora Release Engineering - 1:0.13.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 1:0.13.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jan 11 2025 Mamoru TASAKA - 1:0.13.0-1 -- 0.13.0 - -* Mon Jul 29 2024 Miroslav Suchý - 1:0.12.0-3 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 1:0.12.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun Jul 07 2024 Mamoru TASAKA - 1:0.12.0-1 -- 0.12.0 - -* Tue Jun 18 2024 Mamoru TASAKA - 1:0.12.0~beta-1 -- 0.12.0-beta - -* Wed Jan 24 2024 Fedora Release Engineering - 1:0.11.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1:0.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 13 2024 Mamoru TASAKA - 1:0.11.0-1 -- 0.11.0 - -* Sun Dec 24 2023 Mamoru TASAKA - 1:0.11.0~beta-1 -- 0.11.0 beta - * Sun Jul 23 2023 Mamoru TASAKA - 1:0.10.1-1 - 0.10.1 diff --git a/sources b/sources index 9728c56..4af0091 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JDim-20260110T2319.tar.gz) = c51355599dddc8794f0c7975a8f4db15879f4a4a99771493469a42927d43f1619b8ef02a70d7e492ea61cbc93c1b00232ec09fe59f5c10c1460dde06c8d84b2c +SHA512 (JDim-20230723T2216.tar.gz) = 6ad0af98b9b012a1de7daeba7b6bf6beb330d08a62b2e4c790e008e9d56c92f1473894c0c031c1a73d3850eb5895c8982d20367bfb3b0971835be86a7693e59a