diff --git a/create-JD-git-bare-tarball.sh b/create-JD-git-bare-tarball.sh index 17b610d..be89c12 100644 --- a/create-JD-git-bare-tarball.sh +++ b/create-JD-git-bare-tarball.sh @@ -21,7 +21,7 @@ mkdir TMP pushd TMP git clone ../${REPONAME}.git cd ${REPONAME} -git log 2>&1 | head -n 5 +git log 2>&1 | head -n 10 #grep version README.md echo popd diff --git a/jd.spec b/jd.spec index 2308d6f..976df2d 100644 --- a/jd.spec +++ b/jd.spec @@ -11,30 +11,28 @@ ########################################## # Defined by upsteam # -%define main_ver 0.11.0 +%define main_ver 0.17.0 #%%define strtag 20200118 -#%%define pre_ver beta +%dnl %define pre_ver beta ########################################## # %global reponame JDim -%global gitdate 20240113 -%global gitcommit 9de81380b46582ba89834ddda686fa77c3e085d0 -#%%global gitcommit JDim-v%{main_ver} +%global gitdate 20260711 +%global gitcommit 3d20eba5565e8c7b2bf70aaaad3d5b97794c66e0 +%dnl %global gitcommit JDim-v%{main_ver} %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20240113 -%global tarballtime 1943 +%global tarballdate 20260711 +%global tarballtime 2130 ########################################## # 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 ########################################## @@ -69,24 +67,28 @@ %endif #%%undefine _annotated_build +%if 0%{?use_gitcommit_as_rel} >= 1 +%global clamp_mtime_to_source_date_epoch 0 +%endif ########################################## Name: jd Epoch: 1 Version: %{main_ver}%{?strtag:.%{strtag}}%{?pre_ver:~%{pre_ver}}%{gitver_rpm} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A 2ch browser -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: https://github.com/JDimproved/JDim -#Source0: http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz +%dnl 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: %{gtkmmdevel} +BuildRequires: pkgconfig(gtkmm-3.0) BuildRequires: libgcrypt-devel BuildRequires: libxcrypt-devel BuildRequires: pkgconfig(alsa) @@ -123,7 +125,7 @@ git clone ./%{reponame}.git cd JDim git config user.name "%{name} Fedora maintainer" -git config user.email "%{name}-owner@fedoraproject.org" +git config user.email "%{name}-maintainers@fedoraproject.org" %if 0%{?use_gitcommit_as_rel} >= 1 git checkout -b %{main_ver}-fedora-local %{gitcommit} @@ -160,12 +162,6 @@ 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 \ @@ -215,6 +211,51 @@ export ASAN_OPTIONS=detect_leaks=0 %{_datadir}/icons/hicolor/*/apps/jdim.* %changelog +* Thu Jul 16 2026 Fedora Release Engineering - 1:0.17.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jul 11 2026 Mamoru TASAKA - 1:0.17.0-1 +- 0.17.0 + +* Tue Mar 17 2026 Mamoru TASAKA - 1:0.16.0-1 +- 0.16.0 + +* Fri Jan 16 2026 Fedora Release Engineering - 1:0.15.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* 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 diff --git a/sources b/sources index 09478c9..f4f3a40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JDim-20240113T1943.tar.gz) = b8ea4f303cadb78232164d6129218b0147295df3a70cd53c713f5e6c87e787ede7b90a1a593005dac6ca7530d00f82d45406030f860b84aa114366d93eb5074f +SHA512 (JDim-20260711T2130.tar.gz) = a57175354ab09926aa7186de1a7f0580d31f5c4a3fef93ceb6946429b6f117dda2bc34095a09711a8c39341de4542b6199959b02a6cce30bea1d78b4d06ed41e