tagoh pushed to rpms/paps (rawhide). "New upstream release. (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 05:19:16 UTC
From 379760d3458c0566cc561d445720e576d24c9016 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira(a)tagoh.org>
Date: Mar 01 2023 05:19:08 +0000
Subject: New upstream release.
Resolves: rhbz#2168726
---
diff --git a/paps.spec b/paps.spec
index ce85a02..3896660 100644
--- a/paps.spec
+++ b/paps.spec
@@ -1,5 +1,5 @@
Name: paps
-Version: 0.7.9
+Version: 0.8.0
Release: 1%{?dist}
License: LGPL-2.0-or-later
@@ -137,6 +137,10 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p"
%changelog
+* Wed Mar 1 2023 Akira TAGOH <tagoh(a)redhat.com> - 0.8.0-1
+- New upstream release.
+ Resolves: rhbz#2168726
+
* Tue Feb 7 2023 Akira TAGOH <tagoh(a)redhat.com> - 0.7.9-1
- New upstream release.
Resolves: rhbz#2164212
diff --git a/sources b/sources
index 666a683..fcb89c4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (paps-0.6.8.tar.gz) = db657d90179e11fe42bbcdbebe09a84f1927c99d0b539c9e29b66b3cb8ffcf33ff500c9d81835ae5a0880382bf8f24801f04742517b76b8e005b125a139d8bba
-SHA512 (paps-0.7.9.tar.gz) = 78645535c6948dae9b021143419f4c5dfcdcfa18af5ae4bc8bf615aae4e1aac124c450359483bf027ae45e7b99b25732f62bce67bd575d26fb5e44610a65774b
+SHA512 (paps-0.8.0.tar.gz) = 33afad0e3dae9cef0fb3afb9994650bf1a7326e72782346e05ab91f7c84f092145247658cdf57868105df47a1bd08e1a961c1ef4c07a2a8fd01eaf8ecd9d948a
https://src.fedoraproject.org/rpms/paps/c/379760d3458c0566cc561d445720e57...
1Â year, 3Â months
jjames pushed to rpms/gap-pkg-francy (f38). "Version 2.0.1. Drop
upstreamed entity patch."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 04:41:56 UTC
From 0c2ae7328804121b318d52089d22ab7802f7ae2a Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry(a)gmail.com>
Date: Mar 01 2023 04:29:38 +0000
Subject: Version 2.0.1. Drop upstreamed entity patch.
---
diff --git a/0001-Fix-unknown-entity-warnings.patch b/0001-Fix-unknown-entity-warnings.patch
deleted file mode 100644
index 22f3fa6..0000000
--- a/0001-Fix-unknown-entity-warnings.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ee2f35bfe44daa06790b971195c95cd49438585a Mon Sep 17 00:00:00 2001
-From: Jerry James <loganjerry(a)gmail.com>
-Date: Thu, 23 Feb 2023 09:19:49 -0700
-Subject: [PATCH] Fix unknown entity warnings
-
-Fixes these warnings:
-#I Parsing XML document . . .
-#I #W WARNING: Entity with name `uuid' not known!
-#W (Specify in <!DOCTYPE ...> tag or in argument to parser!)
-#I #W WARNING: Entity with name `Juyter' not known!
-#W (Specify in <!DOCTYPE ...> tag or in argument to parser!)
-
----
- doc/intro.xml | 2 +-
- makedoc.g | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/doc/intro.xml b/doc/intro.xml
-index 2bf1124..b1802a3 100644
---- a/doc/intro.xml
-+++ b/doc/intro.xml
-@@ -33,7 +33,7 @@
-
- This package requires the &GAP; packages &JupyterKernel;, &json; and &uuid;, all of which are distributed with &GAP; by default.
- &Francy; requires &Jupyter; to be installed on your system. Please note that you need to run the installation commands from the same python version &Jupyter; is installed on.
-- Currently, &Francy; is supported only on &Juyter; Lab, if you want to use it on the old &Jupyter; Notebooks, please install the latest supported version: v1.2.4.
-+ Currently, &Francy; is supported only on &Jupyter; Lab, if you want to use it on the old &Jupyter; Notebooks, please install the latest supported version: v1.2.4.
- In order to install or update &Francy;, please run the following command to download the latest version available from <URL>https://pypi.org/</URL>:
- <Log>
- mcmartins@local:~$ pip install -U jupyterlab-francy
-diff --git a/makedoc.g b/makedoc.g
-index d02e1bc..5da4c93 100644
---- a/makedoc.g
-+++ b/makedoc.g
-@@ -14,6 +14,7 @@ AutoDoc(rec(autodoc := true,
- SubgroupLattice := "<URL Text=\"SubgroupLattice\">https://github.com/mcmartins/subgroup-lattice</URL>",
- FrancyMonoids := "<URL Text=\"FrancyMonoids\">https://github.com/gap-packages/FrancyMonoids</URL>",
- JupyterKernel := "<Package>JupyterKernel</Package>",
-- json := "<Package>json</Package>"))));
-+ json := "<Package>json</Package>",
-+ uuid := "<Package>uuid</Package>"))));
-
- QUIT;
---
-2.39.2
-
diff --git a/gap-pkg-francy.spec b/gap-pkg-francy.spec
index 934a794..4cb4855 100644
--- a/gap-pkg-francy.spec
+++ b/gap-pkg-francy.spec
@@ -1,7 +1,7 @@
%global pkgname francy
Name: gap-pkg-%{pkgname}
-Version: 2.0.0
+Version: 2.0.1
Release: 1%{?dist}
Summary: Framework for interactive discrete mathematics
@@ -10,9 +10,6 @@ BuildArch: noarch
ExclusiveArch: %{gap_arches} noarch
URL: https://gap-packages.github.io/francy/
Source0: https://github.com/gap-packages/francy/archive/v%{version}/%{pkgname}-%{v...
-# Fix unknown entity warnings
-# https://github.com/gap-packages/francy/pull/90
-Patch0: 0001-Fix-unknown-entity-warnings.patch
BuildRequires: elinks
BuildRequires: gap-devel
@@ -93,6 +90,10 @@ cp -p tst/{canvas,graph}.tst %{buildroot}%{gap_libdir}/pkg/francy/tst
%{gap_libdir}/pkg/%{pkgname}/notebooks/
%changelog
+* Tue Feb 28 2023 Jerry James <loganjerry(a)gmail.com> - 2.0.1-1
+- Version 2.0.1
+- Drop upstreamed entity patch
+
* Thu Feb 23 2023 Jerry James <loganjerry(a)gmail.com> - 2.0.0-1
- Version 2.0.0
- Add patch to fix unknown entity warnings
diff --git a/sources b/sources
index 1beb1f7..7368001 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (francy-2.0.0.tar.gz) = 4d0563acfb45e29aeba39bc2cede8f4b18c0727e190296848fbf79361cb608757186b86a6df86cc4d475ef55eeef4d1cbd677be1eaacf9bb7129ce97aa2f8e00
+SHA512 (francy-2.0.1.tar.gz) = c2277cb6c8de03042e6f7b173d33ba81c9cd90d6401fcf9f29f72c2a144f3bc70673ca165ab78c8c371d469d38117929e44a2414d1113373ebb536977319d2f5
https://src.fedoraproject.org/rpms/gap-pkg-francy/c/0c2ae7328804121b318d5...
1Â year, 3Â months
jjames pushed to rpms/gap-pkg-francy (rawhide). "Version 2.0.1.
Drop upstreamed entity patch."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 04:29:51 UTC
From 0c2ae7328804121b318d52089d22ab7802f7ae2a Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry(a)gmail.com>
Date: Mar 01 2023 04:29:38 +0000
Subject: Version 2.0.1. Drop upstreamed entity patch.
---
diff --git a/0001-Fix-unknown-entity-warnings.patch b/0001-Fix-unknown-entity-warnings.patch
deleted file mode 100644
index 22f3fa6..0000000
--- a/0001-Fix-unknown-entity-warnings.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ee2f35bfe44daa06790b971195c95cd49438585a Mon Sep 17 00:00:00 2001
-From: Jerry James <loganjerry(a)gmail.com>
-Date: Thu, 23 Feb 2023 09:19:49 -0700
-Subject: [PATCH] Fix unknown entity warnings
-
-Fixes these warnings:
-#I Parsing XML document . . .
-#I #W WARNING: Entity with name `uuid' not known!
-#W (Specify in <!DOCTYPE ...> tag or in argument to parser!)
-#I #W WARNING: Entity with name `Juyter' not known!
-#W (Specify in <!DOCTYPE ...> tag or in argument to parser!)
-
----
- doc/intro.xml | 2 +-
- makedoc.g | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/doc/intro.xml b/doc/intro.xml
-index 2bf1124..b1802a3 100644
---- a/doc/intro.xml
-+++ b/doc/intro.xml
-@@ -33,7 +33,7 @@
-
- This package requires the &GAP; packages &JupyterKernel;, &json; and &uuid;, all of which are distributed with &GAP; by default.
- &Francy; requires &Jupyter; to be installed on your system. Please note that you need to run the installation commands from the same python version &Jupyter; is installed on.
-- Currently, &Francy; is supported only on &Juyter; Lab, if you want to use it on the old &Jupyter; Notebooks, please install the latest supported version: v1.2.4.
-+ Currently, &Francy; is supported only on &Jupyter; Lab, if you want to use it on the old &Jupyter; Notebooks, please install the latest supported version: v1.2.4.
- In order to install or update &Francy;, please run the following command to download the latest version available from <URL>https://pypi.org/</URL>:
- <Log>
- mcmartins@local:~$ pip install -U jupyterlab-francy
-diff --git a/makedoc.g b/makedoc.g
-index d02e1bc..5da4c93 100644
---- a/makedoc.g
-+++ b/makedoc.g
-@@ -14,6 +14,7 @@ AutoDoc(rec(autodoc := true,
- SubgroupLattice := "<URL Text=\"SubgroupLattice\">https://github.com/mcmartins/subgroup-lattice</URL>",
- FrancyMonoids := "<URL Text=\"FrancyMonoids\">https://github.com/gap-packages/FrancyMonoids</URL>",
- JupyterKernel := "<Package>JupyterKernel</Package>",
-- json := "<Package>json</Package>"))));
-+ json := "<Package>json</Package>",
-+ uuid := "<Package>uuid</Package>"))));
-
- QUIT;
---
-2.39.2
-
diff --git a/gap-pkg-francy.spec b/gap-pkg-francy.spec
index 934a794..4cb4855 100644
--- a/gap-pkg-francy.spec
+++ b/gap-pkg-francy.spec
@@ -1,7 +1,7 @@
%global pkgname francy
Name: gap-pkg-%{pkgname}
-Version: 2.0.0
+Version: 2.0.1
Release: 1%{?dist}
Summary: Framework for interactive discrete mathematics
@@ -10,9 +10,6 @@ BuildArch: noarch
ExclusiveArch: %{gap_arches} noarch
URL: https://gap-packages.github.io/francy/
Source0: https://github.com/gap-packages/francy/archive/v%{version}/%{pkgname}-%{v...
-# Fix unknown entity warnings
-# https://github.com/gap-packages/francy/pull/90
-Patch0: 0001-Fix-unknown-entity-warnings.patch
BuildRequires: elinks
BuildRequires: gap-devel
@@ -93,6 +90,10 @@ cp -p tst/{canvas,graph}.tst %{buildroot}%{gap_libdir}/pkg/francy/tst
%{gap_libdir}/pkg/%{pkgname}/notebooks/
%changelog
+* Tue Feb 28 2023 Jerry James <loganjerry(a)gmail.com> - 2.0.1-1
+- Version 2.0.1
+- Drop upstreamed entity patch
+
* Thu Feb 23 2023 Jerry James <loganjerry(a)gmail.com> - 2.0.0-1
- Version 2.0.0
- Add patch to fix unknown entity warnings
diff --git a/sources b/sources
index 1beb1f7..7368001 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (francy-2.0.0.tar.gz) = 4d0563acfb45e29aeba39bc2cede8f4b18c0727e190296848fbf79361cb608757186b86a6df86cc4d475ef55eeef4d1cbd677be1eaacf9bb7129ce97aa2f8e00
+SHA512 (francy-2.0.1.tar.gz) = c2277cb6c8de03042e6f7b173d33ba81c9cd90d6401fcf9f29f72c2a144f3bc70673ca165ab78c8c371d469d38117929e44a2414d1113373ebb536977319d2f5
https://src.fedoraproject.org/rpms/gap-pkg-francy/c/0c2ae7328804121b318d5...
1Â year, 3Â months
fweimer pushed to rpms/redhat-rpm-config (private-f38-toolchain).
"Merge branch 'rawhide' into private-f38-toolchain"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 04:07:23 UTC
From 400fdc1ef89d3343c9c5f8d3f4277861303d3b36 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer(a)redhat.com>
Date: Mar 01 2023 04:07:02 +0000
Subject: Merge branch 'rawhide' into private-f38-toolchain
---
diff --git a/changelog b/changelog
index 35ff670..1bcb550 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,7 @@
+* Tue Feb 28 2023 Maxwell G <gotmax(a)e.email> - 253-1
+- Include RUSTFLAGS in %%set_build_flags
+- Fixes: rhbz#2167183
+
* Tue Feb 28 2023 Tom Stellard <tstellar(a)redhat.com> - 252-1
- Rename _pkg_extra_* macros to _distro_extra_*
diff --git a/macros b/macros
index 84b7d2c..cfb357b 100644
--- a/macros
+++ b/macros
@@ -148,6 +148,7 @@
FFLAGS="${FFLAGS:-%{build_fflags}}" ; export FFLAGS ; \
FCFLAGS="${FCFLAGS:-%{build_fflags}}" ; export FCFLAGS ; \
VALAFLAGS="${VALAFLAGS:-%{build_valaflags}}" ; export VALAFLAGS ; \
+ RUSTFLAGS="${RUSTFLAGS:-%{build_rustflags}}" ; export RUSTFLAGS ; \
LDFLAGS="${LDFLAGS:-%{build_ldflags}}" ; export LDFLAGS ; \
LT_SYS_LIBRARY_PATH="${LT_SYS_LIBRARY_PATH:-%_libdir:}" ; export LT_SYS_LIBRARY_PATH ; \
CC="${CC:-%{__cc}}" ; export CC ; \
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 86448e4..7f72777 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -4,7 +4,7 @@
# 2) When making changes, increment the version (in baserelease) by 1.
# rpmdev-bumpspec and other tools update the macro below, which is used
# in Version: to get the desired effect.
-%global baserelease 252
+%global baserelease 253
Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config
@@ -105,7 +105,8 @@ Requires: perl-srpm-macros
# ↓ Has Python BRPs originaly present in redhat-rpm-config
Requires: python-srpm-macros >= 3.11-7
Requires: qt5-srpm-macros
-Requires: rust-srpm-macros
+# rust-srpm-macros v24 contains %%build_rustflags defintion
+Requires: rust-srpm-macros >= 24
Requires: rpmautospec-rpm-macros
Requires: package-notes-srpm-macros
Requires: pyproject-srpm-macros
diff --git a/tests/rustflags/main.fmf b/tests/rustflags/main.fmf
new file mode 100644
index 0000000..02226e2
--- /dev/null
+++ b/tests/rustflags/main.fmf
@@ -0,0 +1,7 @@
+summary: Test that conditional support for RUSTFLAGS works
+
+require:
+ - redhat-rpm-config
+ - rpm
+ - rust-packaging
+test: ./runtest.sh
diff --git a/tests/rustflags/runtest.sh b/tests/rustflags/runtest.sh
new file mode 100755
index 0000000..b6a3be0
--- /dev/null
+++ b/tests/rustflags/runtest.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/bash
+set -e -u -o pipefail
+
+# Allow for local testing
+rargs=()
+if [ -n "${MACROS_PATH:-}" ]; then
+ default_macros_path="$(rpm --showrc | grep 'Macro path' | awk -F ': ' '{print $2}')"
+ rargs+=("--macros" "${default_macros_path}:${MACROS_PATH}")
+fi
+
+build_rustflags="$(rpm -E '%{build_rustflags}')"
+# For good measure
+[ "${build_rustflags}" != "%{build_rustflags}" ]
+#
+flags="$(rpm "${rargs[@]}" -E '%set_build_flags')"
+
+echo 'Check that RUSTFLAGS is set after evaluating %set_build_flags'
+(
+ eval "${flags}"
+ # set -u will make this fail if $RUSTFLAGS isn't defined
+ [ "${RUSTFLAGS}" = "${build_rustflags}" ]
+)
https://src.fedoraproject.org/rpms/redhat-rpm-config/c/400fdc1ef89d3343c9...
1Â year, 3Â months