Nightly build (20181224gitbddb6d4481)

.gitignore

@@ -105,3 +105,9 @@ 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
+/JD-20181023T1313.tar.gz
+/JD-20181208T2237.tar.gz
+/JD-20181224T0003.tar.gz
+/JD-20181224T1101.tar.gz
+/JD-20181230T1231.tar.gz

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

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" <<

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         shortcommit   %(c=%{gitcommit}; echo ${c:0:7})
+%global         gitdate       20181229
+%global         gitcommit     3608961f9d9feb9c1abfb1c57136af0d7c3a8cd2
+%global         shortcommit   %(c=%{gitcommit}; echo ${c:0:10})
 
-%global         tarballdate   20180502
-%global         tarballtime   1630
+%global         tarballdate   20181230
+%global         tarballtime   1231
+%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,21 @@ desktop-file-install \
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Dec 30 2018 Mamoru TASAKA <mtasaka@fedoraproject.org>
+- Nightly build (20181229git3608961f9d)
+
+* Mon Dec 24 2018 Mamoru TASAKA <mtasaka@fedoraproject.org>
+- Nightly build (20181224gitbddb6d4481)
+
+* Sat Dec  8 2018 Mamoru TASAKA <mtasaka@fedoraproject.org>
+- Nightly build (20181202git7b42142493)
+
+* Tue Oct 23 2018 Mamoru TASAKA <mtasaka@fedoraproject.org>
+- Nightly build (20181023gitbb608f2)
+
+* Mon Oct 15 2018 Mamoru TASAKA <mtasaka@fedoraproject.org>
+- Nightly build (20181014gitf4ebdb4)
+
 * Mon Aug 27 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.8.9.180424-3
 - Apply upstream patch to suppress GLib deprecation warning
 

sources

@@ -1 +1 @@
-SHA512 (JD-20180502T1630.tar.gz) = af861af38a50335e5c274048d5583ddcc5550609af774911e73e0728211de16393517f51255aaa6d5124d3170e279c33d3a432f624ea8ba9fb444ce4f2aa62f5
+SHA512 (JD-20181230T1231.tar.gz) = 5446a6939bfa359831757c828a4b5a6b90b685bef0cc849b3902a64ad8a7b4a40a709142b1dedc473399fbd47e6bf38be6bd506fb60ac67ad9000b91bee489ec