mschorm pushed to mariadb (master). "Allow to run the test-suite in
parallel when more versions are built"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-01-31 23:41:45 UTC
From d282b9922b37b15a291ec911a03b3033917444f3 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm(a)redhat.com>
Date: Jan 31 2021 23:40:49 +0000
Subject: Allow to run the test-suite in parallel when more versions are built
---
diff --git a/mariadb.spec b/mariadb.spec
index 567a95b..815d41a 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1191,8 +1191,10 @@ rm %{buildroot}%{_mandir}/man1/mbstream.1*
%if %runselftest
# hack to let 32- and 64-bit tests run concurrently on same build machine
export MTR_PARALLEL=1
-# builds might happen at the same host, avoid collision
-export MTR_BUILD_THREAD=%{__isa_bits}
+# Builds might happen at the same host, avoid collision
+# The port used is calculated as 10 * MTR_BUILD_THREAD + 10000
+# The resulting port must be between 5000 and 32767
+export MTR_BUILD_THREAD=$(( $(date +%s) % 2200 ))
# The cmake build scripts don't provide any simple way to control the
# options for mysql-test-run, so ignore the make target and just call it
https://src.fedoraproject.org/rpms/mariadb/c/d282b9922b37b15a291ec911a03b...
3Â years, 1Â month
ahughes pushed to java-1.8.0-openjdk (master). "Cleanup package
descriptions and version number placement."
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-01-31 23:40:37 UTC
From dfa3a28dae350edbf13d2e79c3f90f95deb54bb1 Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Jan 30 2021 16:01:35 +0000
Subject: Cleanup package descriptions and version number placement.
---
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 7e60e5f..6b4227f 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -41,10 +41,11 @@
%global normal_suffix ""
%global debug_warning This package is unoptimised with full debugging. Install only as needed and remove ASAP.
-%global debug_on with full debug on
%global fastdebug_warning This package is optimised with full debugging. Install only as needed and remove ASAP.
-%global for_fastdebug with minimal debug on
-%global for_debug for packages with debug on
+%global debug_on unoptimised with full debugging on
+%global fastdebug_on optimised with full debugging on
+%global for_fastdebug for packages with debugging on and optimisation
+%global for_debug for packages with debugging on and no optimisation
%if %{with release}
%global include_normal_build 1
@@ -310,7 +311,7 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease 3
+%global rpmrelease 4
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
# Release will be (where N is usually a number starting at 1):
# - 0.N%%{?extraver}%%{?dist} for EA releases,
@@ -1220,7 +1221,7 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
Epoch: 1
-Summary: %{origin_nice} Runtime Environment %{majorver}
+Summary: %{origin_nice} %{majorver} Runtime Environment
# HotSpot code is licensed under GPLv2
# JDK library code is licensed under GPLv2 with the Classpath exception
@@ -1479,160 +1480,160 @@ BuildRequires: systemtap-sdt-devel
%{java_rpo %{nil}}
%description
-The %{origin_nice} runtime environment %{majorver}.
+The %{origin_nice} %{majorver} runtime environment.
%if %{include_debug_build}
%package slowdebug
-Summary: %{origin_nice} Runtime Environment %{majorver} %{debug_on}
+Summary: %{origin_nice} %{majorver} Runtime Environment %{debug_on}
%{java_rpo -- %{debug_suffix_unquoted}}
%description slowdebug
-The %{origin_nice} runtime environment %{majorver}.
+The %{origin_nice} %{majorver} runtime environment.
%{debug_warning}
%endif
%if %{include_fastdebug_build}
%package fastdebug
-Summary: %{origin_nice} Runtime Environment %{majorver} %{fastdebug_on}
+Summary: %{origin_nice} %{majorver} Runtime Environment %{fastdebug_on}
Group: Development/Languages
%{java_rpo -- %{fastdebug_suffix_unquoted}}
%description fastdebug
-The %{origin_nice} runtime environment.
+The %{origin_nice} %{majorver} runtime environment.
%{fastdebug_warning}
%endif
%if %{include_normal_build}
%package headless
-Summary: %{origin_nice} Headless Runtime Environment %{majorver}
+Summary: %{origin_nice} %{majorver} Headless Runtime Environment
%{java_headless_rpo %{nil}}
%description headless
-The %{origin_nice} runtime environment %{majorver} without audio and video support.
+The %{origin_nice} %{majorver} runtime environment without audio and video support.
%endif
%if %{include_debug_build}
%package headless-slowdebug
-Summary: %{origin_nice} Runtime Environment %{majorver} %{debug_on}
+Summary: %{origin_nice} %{majorver} Runtime Environment %{debug_on}
%{java_headless_rpo -- %{debug_suffix_unquoted}}
%description headless-slowdebug
-The %{origin_nice} runtime environment %{majorver} without audio and video support.
+The %{origin_nice} %{majorver} runtime environment without audio and video support.
%{debug_warning}
%endif
%if %{include_fastdebug_build}
%package headless-fastdebug
-Summary: %{origin_nice} Runtime Environment %{fastdebug_on}
+Summary: %{origin_nice} %{majorver} Runtime Environment %{fastdebug_on}
Group: Development/Languages
%{java_headless_rpo -- %{fastdebug_suffix_unquoted}}
%description headless-fastdebug
-The %{origin_nice} runtime environment %{majorver} without audio and video support.
+The %{origin_nice} %{majorver} runtime environment without audio and video support.
%{fastdebug_warning}
%endif
%if %{include_normal_build}
%package devel
-Summary: %{origin_nice} Development Environment %{majorver}
+Summary: %{origin_nice} %{majorver} Development Environment
%{java_devel_rpo %{nil}}
%description devel
-The %{origin_nice} development tools %{majorver}.
+The %{origin_nice} %{majorver} development tools.
%endif
%if %{include_debug_build}
%package devel-slowdebug
-Summary: %{origin_nice} Development Environment %{majorver} %{debug_on}
+Summary: %{origin_nice} %{majorver} Development Environment %{debug_on}
%{java_devel_rpo -- %{debug_suffix_unquoted}}
%description devel-slowdebug
-The %{origin_nice} development tools %{majorver}.
+The %{origin_nice} %{majorver} development tools.
%{debug_warning}
%endif
%if %{include_fastdebug_build}
%package devel-fastdebug
-Summary: %{origin_nice} Development Environment %{majorver} %{fastdebug_on}
+Summary: %{origin_nice} %{majorver} Development Environment %{fastdebug_on}
Group: Development/Tools
%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
%description devel-fastdebug
-The %{origin_nice} development tools %{majorver}.
+The %{origin_nice} %{majorver} development tools.
%{fastdebug_warning}
%endif
%if %{include_normal_build}
%package demo
-Summary: %{origin_nice} Demos %{majorver}
+Summary: %{origin_nice} %{majorver} Demos
%{java_demo_rpo %{nil}}
%description demo
-The %{origin_nice} demos %{majorver}.
+The %{origin_nice} %{majorver} demos.
%endif
%if %{include_debug_build}
%package demo-slowdebug
-Summary: %{origin_nice} Demos %{majorver} %{debug_on}
+Summary: %{origin_nice} %{majorver} Demos %{debug_on}
%{java_demo_rpo -- %{debug_suffix_unquoted}}
%description demo-slowdebug
-The %{origin_nice} demos %{majorver}.
+The %{origin_nice} %{majorver} demos.
%{debug_warning}
%endif
%if %{include_fastdebug_build}
%package demo-fastdebug
-Summary: %{origin_nice} Demos %{majorver} %{fastdebug_on}
+Summary: %{origin_nice} %{majorver} Demos %{fastdebug_on}
Group: Development/Languages
%{java_demo_rpo -- %{fastdebug_suffix_unquoted}}
%description demo-fastdebug
-The %{origin_nice} demos %{majorver}.
+The %{origin_nice} %{majorver} demos.
%{fastdebug_warning}
%endif
%if %{include_normal_build}
%package src
-Summary: %{origin_nice} Source Bundle %{majorver}
+Summary: %{origin_nice} %{majorver} Source Bundle
%{java_src_rpo %{nil}}
%description src
-The java-%{origin}-src sub-package contains the complete %{origin_nice} %{majorver}
+The %{compatiblename}-src sub-package contains the complete %{origin_nice} %{majorver}
class library source code for use by IDE indexers and debuggers.
%endif
%if %{include_debug_build}
%package src-slowdebug
-Summary: %{origin_nice} Source Bundle %{majorver} %{for_debug}
+Summary: %{origin_nice} %{majorver} Source Bundle %{for_debug}
%{java_src_rpo -- %{debug_suffix_unquoted}}
%description src-slowdebug
-The java-%{origin}-src-slowdebug sub-package contains the complete %{origin_nice} %{majorver}
- class library source code for use by IDE indexers and debuggers. Debugging %{for_debug}.
+The %{compatiblename}-src-slowdebug sub-package contains the complete %{origin_nice} %{majorver}
+ class library source code for use by IDE indexers and debuggers, %{for_debug}.
%endif
%if %{include_fastdebug_build}
%package src-fastdebug
-Summary: %{origin_nice} Source Bundle %{majorver} %{for_fastdebug}
+Summary: %{origin_nice} %{majorver} Source Bundle %{for_fastdebug}
Group: Development/Languages
%{java_src_rpo -- %{fastdebug_suffix_unquoted}}
%description src-fastdebug
-The java-%{origin}-src-fastdebug sub-package contains the complete %{origin_nice} %{majorver}
- class library source code for use by IDE indexers and debuggers. Debugging %{for_fastdebug}.
+The %{compatiblename}-src-fastdebug sub-package contains the complete %{origin_nice} %{majorver}
+ class library source code for use by IDE indexers and debuggers, %{for_fastdebug}.
%endif
@@ -2613,6 +2614,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Sat Jan 30 2021 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.282.b08-4
+- Cleanup package descriptions and version number placement.
+
* Tue Jan 26 2021 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.282.b08-3
- Include a test in the RPM to check the build has the correct vendor information.
- Use 'oj_' prefix on new vendor globals to avoid a conflict with RPM's vendor value.
https://src.fedoraproject.org/rpms/java-1.8.0-openjdk/c/dfa3a28dae350edbf...
3Â years, 1Â month
mschorm pushed to mariadb (master). "For compatibility with upstream
RPMs, create symlinks to "mysql*" named systemd services"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-01-31 23:39:05 UTC
From 7c5259855284cd8e6f4f18e9939c4e65b4869ae8 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm(a)redhat.com>
Date: Jan 31 2021 23:38:04 +0000
Subject: For compatibility with upstream RPMs, create symlinks to "mysql*" named systemd services
---
diff --git a/mariadb.spec b/mariadb.spec
index 9ac2158..567a95b 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -154,7 +154,7 @@
Name: mariadb
Version: 10.5.8
-Release: 4%{?with_debug:.debug}%{?dist}
+Release: 5%{?with_debug:.debug}%{?dist}
Epoch: 3
Summary: A very fast and robust SQL database server
@@ -1033,7 +1033,11 @@ install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}
# We don't use this location of service files
rm %{buildroot}%{_datadir}/%{pkg_name}/systemd/{mysql,mysqld}.service
# These may come handy in a future, but right now we use our own services
-rm %{buildroot}/usr/lib/systemd/system/{mysql,mysqld}.service
+rm %{buildroot}%{_unitdir}/{mysql,mysqld}.service
+
+# For compatibility with upstream RPMs, create symlinks to "mysql*" named systemd services
+ln -s %{_unitdir}/mariadb.service %{buildroot}%{_unitdir}/mysql.service
+ln -s %{_unitdir}/mariadb.service %{buildroot}%{_unitdir}/mysqld.service
# install galera config file
%if %{with galera}
@@ -1492,6 +1496,8 @@ fi
%endif
%{_unitdir}/%{daemon_name}*
+%{_unitdir}/mysql.service
+%{_unitdir}/mysqld.service
%{?with_tokudb:%exclude %{_unitdir}/mariadb.service.d/tokudb.conf}
%{_libexecdir}/mysql-prepare-db-dir
@@ -1629,6 +1635,9 @@ fi
%endif
%changelog
+* Sun Jan 31 2021 Michal Schorm <hhorak(a)redhat.com> - 3:10.5.8-5
+- For compatibility with upstream RPMs, create symlinks to "mysql*" named systemd services
+
* Thu Jan 28 2021 Honza Horak <hhorak(a)redhat.com> - 3:10.5.8-4
- For compatibility with upstream RPMs, create mysqld symlink in sbin
https://src.fedoraproject.org/rpms/mariadb/c/7c5259855284cd8e6f4f18e9939c...
3Â years, 1Â month
pagure pushed to mariadb (master). "For compatibility with upstream
RPMs, create mysqld symlink in sbin"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-01-31 23:36:24 UTC
From e586e888039d4c4152f4a45f0ebc507efd3c85fa Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak(a)redhat.com>
Date: Jan 29 2021 08:36:04 +0000
Subject: For compatibility with upstream RPMs, create mysqld symlink in sbin
---
diff --git a/mariadb.spec b/mariadb.spec
index 8d00285..9ac2158 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -154,7 +154,7 @@
Name: mariadb
Version: 10.5.8
-Release: 3%{?with_debug:.debug}%{?dist}
+Release: 4%{?with_debug:.debug}%{?dist}
Epoch: 3
Summary: A very fast and robust SQL database server
@@ -1017,6 +1017,11 @@ mkdir -p %{buildroot}%{logrotateddir}
mv %{buildroot}%{_datadir}/%{pkg_name}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name}
chmod 644 %{buildroot}%{logrotateddir}/%{daemon_name}
+# for compatibility with upstream RPMs, create mysqld symlink in sbin
+mkdir -p %{buildroot}%{_sbindir}
+ln -s %{_libexecdir}/mysqld %{buildroot}%{_sbindir}/mysqld
+ln -s %{_libexecdir}/mariadbd %{buildroot}%{_sbindir}/mariadbd
+
# copy additional docs into build tree so %%doc will find them
install -p -m 0644 %{SOURCE5} %{basename:%{SOURCE5}}
install -p -m 0644 %{SOURCE6} %{basename:%{SOURCE6}}
@@ -1397,6 +1402,8 @@ fi
%config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
%config(noreplace) %{_sysconfdir}/my.cnf.d/spider.cnf
+%{_sbindir}/mysqld
+%{_sbindir}/mariadbd
%{_libexecdir}/{mysqld,mariadbd}
%{_libdir}/%{pkg_name}/INFO_SRC
@@ -1622,6 +1629,9 @@ fi
%endif
%changelog
+* Thu Jan 28 2021 Honza Horak <hhorak(a)redhat.com> - 3:10.5.8-4
+- For compatibility with upstream RPMs, create mysqld symlink in sbin
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3:10.5.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
https://src.fedoraproject.org/rpms/mariadb/c/e586e888039d4c4152f4a45f0ebc...
3Â years, 1Â month
packagerbot pushed to dummy-test-package-rubino (master). "Bump
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-01-31 22:45:31 UTC
From 2f38b297bae9595a4ea2542aec89a2dd758d9e57 Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: Jan 31 2021 22:45:26 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-rubino.spec b/dummy-test-package-rubino.spec
index 222561c..517c293 100644
--- a/dummy-test-package-rubino.spec
+++ b/dummy-test-package-rubino.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-rubino
Version: 0
-Release: 2677
+Release: 2678
Summary: Dummy Test Package called Rubino
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -34,6 +34,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Sun Jan 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-2678
+- rebuilt
+
* Sun Jan 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-2677
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-rubino/c/2f38b297ba...
3Â years, 1Â month
packagerbot pushed to dummy-test-package-crested (master). "Bump
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-01-31 22:45:20 UTC
From 17b8dac60da24f9d772a717f25364e2e55b28ec4 Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: Jan 31 2021 22:45:15 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-crested.spec b/dummy-test-package-crested.spec
index be312e2..e6a4dc4 100644
--- a/dummy-test-package-crested.spec
+++ b/dummy-test-package-crested.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-crested
Version: 0
-Release: 2677
+Release: 2678
Summary: Dummy Test Package called Crested
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -32,6 +32,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Sun Jan 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-2678
+- rebuilt
+
* Sun Jan 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-2677
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-crested/c/17b8dac60...
3Â years, 1Â month
packagerbot pushed to dummy-test-package-gloster (master). "Bump
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-01-31 22:35:23 UTC
From f02533b21b3b3b60161e8ebb83332afa81bd9d91 Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: Jan 31 2021 22:35:18 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-gloster.spec b/dummy-test-package-gloster.spec
index 96ac9bf..64a095f 100644
--- a/dummy-test-package-gloster.spec
+++ b/dummy-test-package-gloster.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-gloster
Version: 0
-Release: 2568%{?dist}
+Release: 2569%{?dist}
Summary: Dummy Test Package called Gloster
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -32,6 +32,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Sun Jan 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-2569
+- rebuilt
+
* Sun Jan 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-2568
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-gloster/c/f02533b21...
3Â years, 1Â month
sergiomb pushed to dh-make (f33). "Fix build"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-01-31 22:10:16 UTC
From 9bfe4877e356df8bcb04448ab7e07f3b4b6e2508 Mon Sep 17 00:00:00 2001
From: Sérgio M. Basto <sergio(a)serjux.com>
Date: Jan 31 2021 22:08:04 +0000
Subject: Fix build
---
diff --git a/dh-make.spec b/dh-make.spec
index 6426681..bec3901 100644
--- a/dh-make.spec
+++ b/dh-make.spec
@@ -27,7 +27,8 @@ Debian packages.
%install
mkdir -p %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/debhelper/dh_make/
-install -m 755 dh_make %{buildroot}/%{_bindir}
+install -m 755 dh_make.py %{buildroot}/%{_bindir}/dh_make
+install -m 755 dh_makefont %{buildroot}/%{_bindir}
cp -a lib/* %{buildroot}/%{_datadir}/debhelper/dh_make/
# Fix permissions of rules files
@@ -45,6 +46,7 @@ install -m 644 -p dh_make.1 %{buildroot}/%{_mandir}/man1
%files
%doc debian/README.Debian
%{_bindir}/dh_make
+%{_bindir}/dh_makefont
%{_mandir}/man1/*.1*
%dir %{_datadir}/debhelper
%{_datadir}/debhelper/dh_make
https://src.fedoraproject.org/rpms/dh-make/c/9bfe4877e356df8bcb04448ab7e0...
3Â years, 1Â month