From 534c53e3b63f70943314f89c4bbaa281f87148d0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Oct 2018 16:14:32 +0900 Subject: [PATCH 1/8] Nightly build (20181014gitf4ebdb4) --- .gitignore | 1 + create-JD-git-bare-tarball.sh | 11 ++++ ...6.0-rc100130-env-copr-build-specific.patch | 11 ++++ jd.spec | 52 +++++++++++++++---- sources | 2 +- 5 files changed, 65 insertions(+), 12 deletions(-) create mode 100644 jd-2.6.0-rc100130-env-copr-build-specific.patch diff --git a/.gitignore b/.gitignore index 97270d1..0792127 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ jd-2.7.0-svn3613_trunk.tgz /jd-2.8.9-150226.tgz /JD-20180217T2310.tar.gz /JD-20180502T1630.tar.gz +/JD-20181015T1336.tar.gz diff --git a/create-JD-git-bare-tarball.sh b/create-JD-git-bare-tarball.sh index 519bcfa..c190c55 100644 --- a/create-JD-git-bare-tarball.sh +++ b/create-JD-git-bare-tarball.sh @@ -16,6 +16,17 @@ TMPDIR=$(mktemp -d /var/tmp/${REPONAME}-XXXXXX) pushd $TMPDIR git clone --mirror $GITURL + +mkdir TMP +pushd TMP +git clone ../${REPONAME}.git +cd ${REPONAME} +git checkout -t origin/test +git log 2>&1 | head -n 4 +grep JDDATE src/jdversion.h +echo +popd + tar czf ${TARNAME} ${REPONAME}.git/ cp -p ${TARNAME} $PWDDIR diff --git a/jd-2.6.0-rc100130-env-copr-build-specific.patch b/jd-2.6.0-rc100130-env-copr-build-specific.patch new file mode 100644 index 0000000..769cd15 --- /dev/null +++ b/jd-2.6.0-rc100130-env-copr-build-specific.patch @@ -0,0 +1,11 @@ +--- jd-2.6.0-rc100130/src/environment.cpp.distro 2009-06-16 00:34:09.000000000 +0900 ++++ jd-2.6.0-rc100130/src/environment.cpp 2010-02-03 03:52:28.000000000 +0900 +@@ -478,7 +478,7 @@ + // "[リポジトリ ] " << SVN_REPOSITORY << "\n" << + //#endif + "[ディストリ ] " << distribution << "\n" << +- "[パッケージ] " << "バイナリ/ソース( <配布元> )" << "\n" << ++ "[パッケージ] " << "Fedora copr nightly build" << "\n" << + "[ DE／WM ] " << desktop << "\n" << + "[　gtkmm 　] " << get_gtkmm_version() << "\n" << + "[　glibmm 　] " << get_glibmm_version()<< "\n" << diff --git a/jd.spec b/jd.spec index 42a42ef..d85b056 100644 --- a/jd.spec +++ b/jd.spec @@ -8,6 +8,8 @@ %undefine _changelog_trimtime +%bcond_with copr_build + ########################################## # Defined by upsteam # @@ -16,17 +18,18 @@ %define repoid 62877 ########################################## # -%global gitdate 20180424 -%global gitcommit c1c9d64a85d830671ff7a931c6732325f6b9badb +%global gitdate 20181014 +%global gitcommit f4ebdb45d79019464f32e510a30dc3d3d97145ad %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20180502 -%global tarballtime 1630 +%global tarballdate 20181015 +%global tarballtime 1336 +%global use_test 1 ########################################## # Defined by vendor # -%define vendor_rel 3 +%define vendor_rel 4 %define extra_rel %{nil} # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary @@ -34,11 +37,19 @@ %define gtkmmdevel gtkmm24-devel %define fontpackage mona-fonts-VLGothic %define icondir %{_datadir}/icons/hicolor/96x96/apps/ + +%global coprtag %{nil} +%if 0%{?with_copr_build} >= 1 +%global coprtag .copr +%endif ########################################## ########################################## -#%global rel %{vendor_rel}.D%{gitdate}git%{shortcommit}%{?dist} -%define rel %{vendor_rel}%{?dist} +%if 0%{?use_test} >= 1 +%define rel %{vendor_rel}.D%{gitdate}git%{shortcommit}%{?coprtag}%{?dist} +%else +%define rel %{vendor_rel}%{?coprtag}%{?dist} +%endif %define _with_migemo 1 %define _with_onig 0 @@ -47,6 +58,7 @@ %if ! 0%{?fedora} %define _with_migemo 0 %endif + ########################################## Name: jd @@ -64,10 +76,10 @@ Source0: JD-%{tarballdate}T%{tarballtime}.tar.gz Source1: create-JD-git-bare-tarball.sh Patch0: jd-2.6.0-rc100130-env-pkg-distro-specific.patch -# From natuki github JD test branch -Patch10: 0001-Deprecate-usage-of-GLib-memory-profiler-on-2.46-and-.patch +Patch1: jd-2.6.0-rc100130-env-copr-build-specific.patch BuildRequires: gcc-c++ +BuildRequires: autoconf-archive BuildRequires: %{gtkmmdevel} BuildRequires: libgcrypt-devel %if 0%{?fedora} >= 28 @@ -102,22 +114,37 @@ git config user.name "%{name} Fedora maintainer" git config user.email "%{name}-owner@fedoraproject.org" #git checkout -b %{version}-fedora %{gitcommit} -git checkout -b %{version}-fedora jd-%{main_ver}-%{strtag} +git checkout -b %{version}-fedora \ +%if 0%{?use_test} >= 1 + %{gitcommit} +%else + jd-%{main_ver}-%{strtag} +%endif cp -a [A-Z]* .. # Fedora specific +uname -n if ( uname -n | grep -q 'fedoraproject\.org' ) ; then %patch0 -p1 -b .env_fedora git commit -m "apply Fedora specific config" -a fi -cat %PATCH10 | git am +%if 0%{?with_copr_build} >= 1 +%patch1 -p1 -b .env_copr +git commit -m "apply Copr specific config" -a +%endif sh autogen.sh %build cd JD +%if 0%{?use_test} >= 1 +# soft reset to set buildinfo +git checkout -b build +git reset %{gitcommit} +%endif + # set TZ for __TIME__ export TZ='Asia/Tokyo' @@ -161,6 +188,9 @@ desktop-file-install \ %{icondir}/%{name}.png %changelog +* Mon Oct 15 2018 Mamoru TASAKA +- Nightly build (20181014gitf4ebdb4) + * Mon Aug 27 2018 Mamoru TASAKA - 2.8.9.180424-3 - Apply upstream patch to suppress GLib deprecation warning diff --git a/sources b/sources index a1221aa..a5b170e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JD-20180502T1630.tar.gz) = af861af38a50335e5c274048d5583ddcc5550609af774911e73e0728211de16393517f51255aaa6d5124d3170e279c33d3a432f624ea8ba9fb444ce4f2aa62f5 +SHA512 (JD-20181015T1336.tar.gz) = 0898521e315cfc3ee15b5f72e74474285ef2c48f03c51272e529fc6b8ff8819405ae1447b3edf8b4ff9e9fc685f47d6270c011efdc8008189e0fc224a88cc94a From da9c527060075d752988883f0c7768fb25b30ea9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Oct 2018 13:17:58 +0900 Subject: [PATCH 2/8] Nightly build (20181023gitbb608f2) --- .gitignore | 1 + jd.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0792127..f19adde 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ jd-2.7.0-svn3613_trunk.tgz /JD-20180217T2310.tar.gz /JD-20180502T1630.tar.gz /JD-20181015T1336.tar.gz +/JD-20181023T1313.tar.gz diff --git a/jd.spec b/jd.spec index d85b056..c871488 100644 --- a/jd.spec +++ b/jd.spec @@ -18,12 +18,12 @@ %define repoid 62877 ########################################## # -%global gitdate 20181014 -%global gitcommit f4ebdb45d79019464f32e510a30dc3d3d97145ad +%global gitdate 20181023 +%global gitcommit bb608f24b178da24780cd1cb318bd560c2256dcc %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20181015 -%global tarballtime 1336 +%global tarballdate 20181023 +%global tarballtime 1313 %global use_test 1 ########################################## @@ -188,6 +188,9 @@ desktop-file-install \ %{icondir}/%{name}.png %changelog +* Tue Oct 23 2018 Mamoru TASAKA +- Nightly build (20181023gitbb608f2) + * Mon Oct 15 2018 Mamoru TASAKA - Nightly build (20181014gitf4ebdb4) diff --git a/sources b/sources index a5b170e..b93a820 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JD-20181015T1336.tar.gz) = 0898521e315cfc3ee15b5f72e74474285ef2c48f03c51272e529fc6b8ff8819405ae1447b3edf8b4ff9e9fc685f47d6270c011efdc8008189e0fc224a88cc94a +SHA512 (JD-20181023T1313.tar.gz) = 5a28bc7fea2776c7dcd640ff32515fc38eed902f81a66a98ab6a80ab0d603384b7fa6fac2939d1711aabb7912a526b073561afef128aa612f0dd2b80e721c28e From cbc703161727ab73174f2c7a6a6b8a66d76ca25a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Oct 2018 13:27:54 +0900 Subject: [PATCH 3/8] bump --- jd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jd.spec b/jd.spec index c871488..2c63f60 100644 --- a/jd.spec +++ b/jd.spec @@ -62,7 +62,7 @@ ########################################## Name: jd -Version: %{main_ver}.%{strtag} +Version: %{main_ver}.%{strtag}.1 Release: %{rel} Summary: A 2ch browser From 8170d3f531f130a85261ff4ca4c55efaa4938ecc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Oct 2018 13:31:09 +0900 Subject: [PATCH 4/8] oops.. --- jd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jd.spec b/jd.spec index 2c63f60..b1076db 100644 --- a/jd.spec +++ b/jd.spec @@ -62,8 +62,8 @@ ########################################## Name: jd -Version: %{main_ver}.%{strtag}.1 -Release: %{rel} +Version: %{main_ver}.%{strtag} +Release: %{rel}.1 Summary: A 2ch browser Group: Applications/Internet From 5abf5a34a4e20df4c329070f899ca7b383764995 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 8 Dec 2018 22:58:19 +0900 Subject: [PATCH 5/8] Nightly build (20181202git7b42142493) --- .gitignore | 1 + jd.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f19adde..185b4f4 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ jd-2.7.0-svn3613_trunk.tgz /JD-20180502T1630.tar.gz /JD-20181015T1336.tar.gz /JD-20181023T1313.tar.gz +/JD-20181208T2237.tar.gz diff --git a/jd.spec b/jd.spec index b1076db..1f52b24 100644 --- a/jd.spec +++ b/jd.spec @@ -18,12 +18,12 @@ %define repoid 62877 ########################################## # -%global gitdate 20181023 -%global gitcommit bb608f24b178da24780cd1cb318bd560c2256dcc -%global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) +%global gitdate 20181202 +%global gitcommit 7b421424930ab9fe4e633a3703d779b2f4127637 +%global shortcommit %(c=%{gitcommit}; echo ${c:0:10}) -%global tarballdate 20181023 -%global tarballtime 1313 +%global tarballdate 20181208 +%global tarballtime 2237 %global use_test 1 ########################################## @@ -63,7 +63,7 @@ Name: jd Version: %{main_ver}.%{strtag} -Release: %{rel}.1 +Release: %{rel} Summary: A 2ch browser Group: Applications/Internet @@ -188,6 +188,9 @@ desktop-file-install \ %{icondir}/%{name}.png %changelog +* Sat Dec 8 2018 Mamoru TASAKA +- Nightly build (20181202git7b42142493) + * Tue Oct 23 2018 Mamoru TASAKA - Nightly build (20181023gitbb608f2) diff --git a/sources b/sources index b93a820..e1c1eb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JD-20181023T1313.tar.gz) = 5a28bc7fea2776c7dcd640ff32515fc38eed902f81a66a98ab6a80ab0d603384b7fa6fac2939d1711aabb7912a526b073561afef128aa612f0dd2b80e721c28e +SHA512 (JD-20181208T2237.tar.gz) = 6166bc4e22324bbaae173e01d7fca65f37a245c761c0ce788a89f1d2421e6c69097a4f8b0b19f3d0883f760db297433642de6abbb6c4a2eb9682077a77046f31 From 91762b742a8ea129d46485034c49a6ee68324048 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 24 Dec 2018 00:23:24 +0900 Subject: [PATCH 6/8] Nightly build (20181222gitf4032cf884) --- .gitignore | 1 + jd.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 185b4f4..230802d 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,4 @@ jd-2.7.0-svn3613_trunk.tgz /JD-20181015T1336.tar.gz /JD-20181023T1313.tar.gz /JD-20181208T2237.tar.gz +/JD-20181224T0003.tar.gz diff --git a/jd.spec b/jd.spec index 1f52b24..73d0fd5 100644 --- a/jd.spec +++ b/jd.spec @@ -18,12 +18,12 @@ %define repoid 62877 ########################################## # -%global gitdate 20181202 -%global gitcommit 7b421424930ab9fe4e633a3703d779b2f4127637 +%global gitdate 20181222 +%global gitcommit f4032cf88471ac81fffe60da4c48792274180611 %global shortcommit %(c=%{gitcommit}; echo ${c:0:10}) -%global tarballdate 20181208 -%global tarballtime 2237 +%global tarballdate 20181224 +%global tarballtime 0003 %global use_test 1 ########################################## @@ -136,6 +136,10 @@ git commit -m "apply Copr specific config" -a sh autogen.sh +# Current jd source adds -pedantic-errors , and this causes +# glib header glib/gmessages.h error +%global optflags %optflags -Wno-variadic-macros + %build cd JD @@ -188,6 +192,9 @@ desktop-file-install \ %{icondir}/%{name}.png %changelog +* Mon Dec 24 2018 Mamoru TASAKA +- Nightly build (20181222gitf4032cf884) + * Sat Dec 8 2018 Mamoru TASAKA - Nightly build (20181202git7b42142493) diff --git a/sources b/sources index e1c1eb7..a2f4f80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JD-20181208T2237.tar.gz) = 6166bc4e22324bbaae173e01d7fca65f37a245c761c0ce788a89f1d2421e6c69097a4f8b0b19f3d0883f760db297433642de6abbb6c4a2eb9682077a77046f31 +SHA512 (JD-20181224T0003.tar.gz) = 91c44e75a8d852f61b798131be0a25c36b30f30c95ca61a4bc87ac707bf6e2dde9a1d9f53c6bf332eb80aa122f3b3714a00dc9ef7f1553b0d32f16d3c30f716d From cbea2010e2a3e6e0f335e9a5673567bdb4650bac Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 24 Dec 2018 11:06:15 +0900 Subject: [PATCH 7/8] Nightly build (20181224gitbddb6d4481) --- .gitignore | 1 + jd.spec | 12 ++++-------- sources | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 230802d..cc5334b 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ jd-2.7.0-svn3613_trunk.tgz /JD-20181023T1313.tar.gz /JD-20181208T2237.tar.gz /JD-20181224T0003.tar.gz +/JD-20181224T1101.tar.gz diff --git a/jd.spec b/jd.spec index 73d0fd5..cce28e5 100644 --- a/jd.spec +++ b/jd.spec @@ -18,12 +18,12 @@ %define repoid 62877 ########################################## # -%global gitdate 20181222 -%global gitcommit f4032cf88471ac81fffe60da4c48792274180611 +%global gitdate 20181224 +%global gitcommit bddb6d44816efb5c36b5fd71aaead63836a1bec3 %global shortcommit %(c=%{gitcommit}; echo ${c:0:10}) %global tarballdate 20181224 -%global tarballtime 0003 +%global tarballtime 1101 %global use_test 1 ########################################## @@ -136,10 +136,6 @@ git commit -m "apply Copr specific config" -a sh autogen.sh -# Current jd source adds -pedantic-errors , and this causes -# glib header glib/gmessages.h error -%global optflags %optflags -Wno-variadic-macros - %build cd JD @@ -193,7 +189,7 @@ desktop-file-install \ %changelog * Mon Dec 24 2018 Mamoru TASAKA -- Nightly build (20181222gitf4032cf884) +- Nightly build (20181224gitbddb6d4481) * Sat Dec 8 2018 Mamoru TASAKA - Nightly build (20181202git7b42142493) diff --git a/sources b/sources index a2f4f80..85e166b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JD-20181224T0003.tar.gz) = 91c44e75a8d852f61b798131be0a25c36b30f30c95ca61a4bc87ac707bf6e2dde9a1d9f53c6bf332eb80aa122f3b3714a00dc9ef7f1553b0d32f16d3c30f716d +SHA512 (JD-20181224T1101.tar.gz) = 869615a2f817a6dedd62be81466c91e25c163eee5a9fdf69beb97dbdfdb5e3c337e85eeba885d534fbe376851b2485702884daf9ff1f2da0b179539164438987 From 17d90e354be9a6138bc3170ba7282b184ca79abc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 30 Dec 2018 12:38:42 +0900 Subject: [PATCH 8/8] Nightly build (20181224gitbddb6d4481) --- .gitignore | 1 + jd.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cc5334b..f360664 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ jd-2.7.0-svn3613_trunk.tgz /JD-20181208T2237.tar.gz /JD-20181224T0003.tar.gz /JD-20181224T1101.tar.gz +/JD-20181230T1231.tar.gz diff --git a/jd.spec b/jd.spec index cce28e5..32d28e4 100644 --- a/jd.spec +++ b/jd.spec @@ -18,12 +18,12 @@ %define repoid 62877 ########################################## # -%global gitdate 20181224 -%global gitcommit bddb6d44816efb5c36b5fd71aaead63836a1bec3 +%global gitdate 20181229 +%global gitcommit 3608961f9d9feb9c1abfb1c57136af0d7c3a8cd2 %global shortcommit %(c=%{gitcommit}; echo ${c:0:10}) -%global tarballdate 20181224 -%global tarballtime 1101 +%global tarballdate 20181230 +%global tarballtime 1231 %global use_test 1 ########################################## @@ -188,6 +188,9 @@ desktop-file-install \ %{icondir}/%{name}.png %changelog +* Sun Dec 30 2018 Mamoru TASAKA +- Nightly build (20181229git3608961f9d) + * Mon Dec 24 2018 Mamoru TASAKA - Nightly build (20181224gitbddb6d4481) diff --git a/sources b/sources index 85e166b..f2c92f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JD-20181224T1101.tar.gz) = 869615a2f817a6dedd62be81466c91e25c163eee5a9fdf69beb97dbdfdb5e3c337e85eeba885d534fbe376851b2485702884daf9ff1f2da0b179539164438987 +SHA512 (JD-20181230T1231.tar.gz) = 5446a6939bfa359831757c828a4b5a6b90b685bef0cc849b3902a64ad8a7b4a40a709142b1dedc473399fbd47e6bf38be6bd506fb60ac67ad9000b91bee489ec